carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Always form a ConstType instruction for const. (#6341)

Browse Source 
Do this even if the operand is a `ConstType` instruction. This better
preserves the source form of the type, and avoids a special case.
Repeated `const`s are already flattened in constant evaluation, and this
special case also didn't prevent forming a `ConstType` whose operand is
`const` in general, only cases where the operand happens to literally be
a `ConstType` instruction.

This reverts commit eed21f6439.
This commit is contained in:
Richard Smith
2025-11-09 18:17:09 +00:00
committed by GitHub
parent dfd9946dc2
commit 1ece5000aa
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interface/syntactic_merge.carbon
Vendored
+3 -2
View File
@@ -1160,10 +1160,11 @@ interface Foo(a:! const (const C)) {}
// CHECK:STDOUT: %Foo.decl.loc18: %Foo.type.5380b8.2 = interface_decl @Foo.loc18 [concrete = constants.%Foo.generic.ec3175.2] {
// CHECK:STDOUT: %a.patt: %pattern_type = symbolic_binding_pattern a, 0 [concrete]
// CHECK:STDOUT: } {
// CHECK:STDOUT: %.loc18: type = splice_block %const [concrete = constants.%const] {
// CHECK:STDOUT: %.loc18: type = splice_block %const.loc18_19 [concrete = constants.%const] {
// CHECK:STDOUT: %.Self: %type = symbolic_binding .Self [symbolic_self = constants.%.Self]
// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [concrete = constants.%C]
// CHECK:STDOUT: %const: type = const_type %C.ref [concrete = constants.%const]
// CHECK:STDOUT: %const.loc18_26: type = const_type %C.ref [concrete = constants.%const]
// CHECK:STDOUT: %const.loc18_19: type = const_type %const.loc18_26 [concrete = constants.%const]
// CHECK:STDOUT: }
// CHECK:STDOUT: %a.loc18_15.2: %const = symbolic_binding a, 0 [symbolic = %a.loc18_15.1 (constants.%a)]
// CHECK:STDOUT: }