From bf91a8b4dd06c0a9148fee20d1b791ccca0352d7 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 6 Oct 2026 23:04:20 +0000 Subject: [PATCH] Canonicalize the self in ImplSelfWitness (#7898) We perform the same canonicalization as in LookupImplWitness, which makes the output of eval more consistent across witness types, and enables more straightforward constant comparisons between them when needed. --- toolchain/check/eval_inst.cpp | 9 ++++ toolchain/check/handle_impl.cpp | 4 +- ..._facet_value_to_narrowed_facet_type.carbon | 12 ++--- ...t_facet_value_value_to_blanket_impl.carbon | 12 ++--- ..._value_to_generic_facet_value_value.carbon | 12 ++--- .../generic/dot_self_symbolic_type.carbon | 8 +-- .../impl/generic_redeclaration.carbon | 54 +++++++++---------- .../testdata/impl/import_self_specific.carbon | 8 +-- ...pecialization_with_symbolic_rewrite.carbon | 12 ++--- .../check/testdata/interface/final.carbon | 8 +-- .../long_and_long_long.llp64.carbon | 4 +- .../long_and_long_long.lp64.carbon | 8 +-- toolchain/sem_ir/typed_insts.h | 2 +- 13 files changed, 81 insertions(+), 72 deletions(-) diff --git a/toolchain/check/eval_inst.cpp b/toolchain/check/eval_inst.cpp index 6595ccafe754..ac03d5d5307f 100644 --- a/toolchain/check/eval_inst.cpp +++ b/toolchain/check/eval_inst.cpp @@ -249,6 +249,15 @@ auto EvalConstantInst(Context& /*context*/, SemIR::FunctionDecl inst) .type_id = inst.type_id, .elements_id = SemIR::InstBlockId::Empty}); } +auto EvalConstantInst(Context& context, SemIR::ImplSelfWitness inst) + -> ConstantEvalResult { + // Canonicalize the self in the same way as LookupImplWitness. + inst.period_self = context.constant_values().GetInstId( + GetCanonicalQuerySelfForLookupImplWitness( + context, context.constant_values().Get(inst.period_self), nullptr)); + return ConstantEvalResult::NewSamePhase(inst); +} + auto EvalConstantInst(Context& context, SemIR::InstId inst_id, SemIR::LookupImplWitness inst) -> ConstantEvalResult { // Canonicalize the query self to reduce the number of unique witness diff --git a/toolchain/check/handle_impl.cpp b/toolchain/check/handle_impl.cpp index 40346097b79d..6252d1be6e67 100644 --- a/toolchain/check/handle_impl.cpp +++ b/toolchain/check/handle_impl.cpp @@ -268,8 +268,8 @@ static auto BuildImplDecl(Context& context, Parse::AnyImplDeclId node_id, // are applied to the impl. // // We can use ImplSelfWitness for this because it contains a - // SpecificInterfaceId operand, and it has a constant_kind of `Always` so it - // never evaluates to some other type of inst. + // SpecificInterfaceId operand, and it always evaluates an inst of the same + // kind so we don't lose the operand. // // TODO: We could avoid the extra indirection through a SpecificInterfaceId if // we introduced a new instruction with a SpecificId operand instead of diff --git a/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon b/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon index 36cbe296c5c2..a7f933697e89 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_to_narrowed_facet_type.carbon @@ -569,7 +569,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %A.patt: %pattern_type.333 = symbolic_binding_pattern A, 0 [symbolic] // CHECK:STDOUT: %A: %Animal.type = symbolic_binding A, 0 [symbolic] // CHECK:STDOUT: %A.as_type: type = facet_access_type %A [symbolic] -// CHECK:STDOUT: %.2b4: = impl_self_witness %A.as_type, @Eats [symbolic] +// CHECK:STDOUT: %.45f: = impl_self_witness %A, @Eats [symbolic] // CHECK:STDOUT: %Eats.impl_witness.a23: = impl_witness @A.as_type.as.Eats.impl.%Eats.impl_witness_table, @A.as_type.as.Eats.impl(%A) [symbolic] // CHECK:STDOUT: %Eats.facet: %Eats.type = facet_value %A.as_type, (%Eats.impl_witness.a23) [symbolic] // CHECK:STDOUT: %BitAndWith.type.a06: type = generic_interface_type @BitAndWith [concrete] @@ -609,7 +609,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %Eats.lookup_impl_witness: = lookup_impl_witness %W, @Eats [symbolic] // CHECK:STDOUT: %Animal.lookup_impl_witness: = lookup_impl_witness %W, @Animal [symbolic] // CHECK:STDOUT: %Animal.facet: %Animal.type = facet_value %W.as_type, (%Animal.lookup_impl_witness) [symbolic] -// CHECK:STDOUT: %.2a6: = impl_self_witness %W.as_type, @Eats [symbolic] +// CHECK:STDOUT: %.c97: = impl_self_witness %W, @Eats [symbolic] // CHECK:STDOUT: %Eats.impl_witness.881: = impl_witness @A.as_type.as.Eats.impl.%Eats.impl_witness_table, @A.as_type.as.Eats.impl(%Animal.facet) [symbolic] // CHECK:STDOUT: %.86f: require_specific_def_type = require_specific_def @A.as_type.as.Eats.impl(%Animal.facet) [symbolic] // CHECK:STDOUT: %Tame.lookup_impl_witness: = lookup_impl_witness %W, @Tame [symbolic] @@ -656,7 +656,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: } // CHECK:STDOUT: %A.loc7_15.1: %Animal.type = symbolic_binding A, 0 [symbolic = %A.loc7_15.2 (constants.%A)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc7: = impl_self_witness @A.as_type.as.Eats.impl.%.loc7_25, @Eats [symbolic = @A.as_type.as.Eats.impl.%.loc7_35 (constants.%.2b4)] +// CHECK:STDOUT: %.loc7: = impl_self_witness @A.as_type.as.Eats.impl.%.loc7_25, @Eats [symbolic = @A.as_type.as.Eats.impl.%.loc7_35 (constants.%.45f)] // CHECK:STDOUT: %FeedTame2.decl: %FeedTame2.type = fn_decl @FeedTame2 [concrete = constants.%FeedTame2] { // CHECK:STDOUT: %V.patt.loc9_15.1: %pattern_type.fbb = symbolic_binding_pattern V, 0 [symbolic = %V.patt.loc9_15.2 (constants.%V.patt)] // CHECK:STDOUT: %v.param_patt.loc9_38.1: @FeedTame2.%pattern_type (%pattern_type.7b2) = value_param_pattern [symbolic = %v.param_patt.loc9_38.2 (constants.%v.param_patt.bb4)] @@ -744,7 +744,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %A.patt.loc7_15.2: %pattern_type.333 = symbolic_binding_pattern A, 0 [symbolic = %A.patt.loc7_15.2 (constants.%A.patt)] // CHECK:STDOUT: %A.loc7_15.2: %Animal.type = symbolic_binding A, 0 [symbolic = %A.loc7_15.2 (constants.%A)] // CHECK:STDOUT: %A.as_type.loc7_25.2: type = facet_access_type %A.loc7_15.2 [symbolic = %A.as_type.loc7_25.2 (constants.%A.as_type)] -// CHECK:STDOUT: %.loc7_35: = impl_self_witness %A.as_type.loc7_25.2, @Eats [symbolic = %.loc7_35 (constants.%.2b4)] +// CHECK:STDOUT: %.loc7_35: = impl_self_witness %A.loc7_15.2, @Eats [symbolic = %.loc7_35 (constants.%.45f)] // CHECK:STDOUT: %Eats.impl_witness.loc7_35.2: = impl_witness %Eats.impl_witness_table, @A.as_type.as.Eats.impl(%A.loc7_15.2) [symbolic = %Eats.impl_witness.loc7_35.2 (constants.%Eats.impl_witness.a23)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -820,7 +820,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %A.patt.loc7_15.2 => constants.%A.patt // CHECK:STDOUT: %A.loc7_15.2 => constants.%A // CHECK:STDOUT: %A.as_type.loc7_25.2 => constants.%A.as_type -// CHECK:STDOUT: %.loc7_35 => constants.%.2b4 +// CHECK:STDOUT: %.loc7_35 => constants.%.45f // CHECK:STDOUT: %Eats.impl_witness.loc7_35.2 => constants.%Eats.impl_witness.a23 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -850,7 +850,7 @@ fn CallsWithTypeExplicit(generic U: type) { // CHECK:STDOUT: %A.patt.loc7_15.2 => constants.%A.patt // CHECK:STDOUT: %A.loc7_15.2 => constants.%Animal.facet // CHECK:STDOUT: %A.as_type.loc7_25.2 => constants.%W.as_type -// CHECK:STDOUT: %.loc7_35 => constants.%.2a6 +// CHECK:STDOUT: %.loc7_35 => constants.%.c97 // CHECK:STDOUT: %Eats.impl_witness.loc7_35.2 => constants.%Eats.impl_witness.881 // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon b/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon index 5a3477cc18e0..b0cc20decda9 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_value_to_blanket_impl.carbon @@ -34,7 +34,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: %A.patt: %pattern_type.333 = symbolic_binding_pattern A, 0 [symbolic] // CHECK:STDOUT: %A: %Animal.type = symbolic_binding A, 0 [symbolic] // CHECK:STDOUT: %A.as_type: type = facet_access_type %A [symbolic] -// CHECK:STDOUT: %.2b411f.1: = impl_self_witness %A.as_type, @Eats [symbolic] +// CHECK:STDOUT: %.45f396.1: = impl_self_witness %A, @Eats [symbolic] // CHECK:STDOUT: %Eats.impl_witness.a23593.1: = impl_witness @A.as_type.as.Eats.impl.%Eats.impl_witness_table, @A.as_type.as.Eats.impl(%A) [symbolic] // CHECK:STDOUT: %Eats.facet.f5f: %Eats.type = facet_value %A.as_type, (%Eats.impl_witness.a23593.1) [symbolic] // CHECK:STDOUT: %pattern_type.880: type = pattern_type %Eats.type [concrete] @@ -58,7 +58,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: %HandleAnimal: %HandleAnimal.type = struct_value () [concrete] // CHECK:STDOUT: %require_complete.db4: = require_complete_type %T.as_type.01d [symbolic] // CHECK:STDOUT: %Eats.lookup_impl_witness: = lookup_impl_witness %T.443, @Eats [symbolic] -// CHECK:STDOUT: %.2b411f.2: = impl_self_witness %T.as_type.01d, @Eats [symbolic] +// CHECK:STDOUT: %.45f396.2: = impl_self_witness %T.443, @Eats [symbolic] // CHECK:STDOUT: %Eats.impl_witness.a23593.2: = impl_witness @A.as_type.as.Eats.impl.%Eats.impl_witness_table, @A.as_type.as.Eats.impl(%T.443) [symbolic] // CHECK:STDOUT: %.2fe: require_specific_def_type = require_specific_def @A.as_type.as.Eats.impl(%T.443) [symbolic] // CHECK:STDOUT: %Eats.facet.934: %Eats.type = facet_value %T.as_type.01d, (%Eats.lookup_impl_witness) [symbolic] @@ -98,7 +98,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: } // CHECK:STDOUT: %A.loc18_15.1: %Animal.type = symbolic_binding A, 0 [symbolic = %A.loc18_15.2 (constants.%A)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc18: = impl_self_witness @A.as_type.as.Eats.impl.%.loc18_25, @Eats [symbolic = @A.as_type.as.Eats.impl.%.loc18_35 (constants.%.2b411f.1)] +// CHECK:STDOUT: %.loc18: = impl_self_witness @A.as_type.as.Eats.impl.%.loc18_25, @Eats [symbolic = @A.as_type.as.Eats.impl.%.loc18_35 (constants.%.45f396.1)] // CHECK:STDOUT: %Feed.decl: %Feed.type = fn_decl @Feed [concrete = constants.%Feed] { // CHECK:STDOUT: %T.patt.loc20_10.1: %pattern_type.880 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc20_10.2 (constants.%T.patt.9e8)] // CHECK:STDOUT: %e.param_patt.loc20_26.1: @Feed.%pattern_type (%pattern_type.aed) = value_param_pattern [symbolic = %e.param_patt.loc20_26.2 (constants.%e.param_patt.0be)] @@ -163,7 +163,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: %A.patt.loc18_15.2: %pattern_type.333 = symbolic_binding_pattern A, 0 [symbolic = %A.patt.loc18_15.2 (constants.%A.patt)] // CHECK:STDOUT: %A.loc18_15.2: %Animal.type = symbolic_binding A, 0 [symbolic = %A.loc18_15.2 (constants.%A)] // CHECK:STDOUT: %A.as_type.loc18_25.2: type = facet_access_type %A.loc18_15.2 [symbolic = %A.as_type.loc18_25.2 (constants.%A.as_type)] -// CHECK:STDOUT: %.loc18_35: = impl_self_witness %A.as_type.loc18_25.2, @Eats [symbolic = %.loc18_35 (constants.%.2b411f.1)] +// CHECK:STDOUT: %.loc18_35: = impl_self_witness %A.loc18_15.2, @Eats [symbolic = %.loc18_35 (constants.%.45f396.1)] // CHECK:STDOUT: %Eats.impl_witness.loc18_35.2: = impl_witness %Eats.impl_witness_table, @A.as_type.as.Eats.impl(%A.loc18_15.2) [symbolic = %Eats.impl_witness.loc18_35.2 (constants.%Eats.impl_witness.a23593.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -234,7 +234,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: %A.patt.loc18_15.2 => constants.%A.patt // CHECK:STDOUT: %A.loc18_15.2 => constants.%A // CHECK:STDOUT: %A.as_type.loc18_25.2 => constants.%A.as_type -// CHECK:STDOUT: %.loc18_35 => constants.%.2b411f.1 +// CHECK:STDOUT: %.loc18_35 => constants.%.45f396.1 // CHECK:STDOUT: %Eats.impl_witness.loc18_35.2 => constants.%Eats.impl_witness.a23593.1 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -264,7 +264,7 @@ fn HandleAnimal[T: Animal](a: T) { Feed(a); } // CHECK:STDOUT: %A.patt.loc18_15.2 => constants.%A.patt // CHECK:STDOUT: %A.loc18_15.2 => constants.%T.443 // CHECK:STDOUT: %A.as_type.loc18_25.2 => constants.%T.as_type.01d -// CHECK:STDOUT: %.loc18_35 => constants.%.2b411f.2 +// CHECK:STDOUT: %.loc18_35 => constants.%.45f396.2 // CHECK:STDOUT: %Eats.impl_witness.loc18_35.2 => constants.%Eats.impl_witness.a23593.2 // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon b/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon index 7c55601f9ebe..10dc253344b2 100644 --- a/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon +++ b/toolchain/check/testdata/facet/convert_facet_value_value_to_generic_facet_value_value.carbon @@ -67,7 +67,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.01d: type = facet_access_type %T.443 [symbolic] // CHECK:STDOUT: %U.as_type: type = facet_access_type %U [symbolic] // CHECK:STDOUT: %Eats.type.ceea62.1: type = facet_type <@Eats, @Eats(%U.as_type)> [symbolic] -// CHECK:STDOUT: %.23c3b4.1: = impl_self_witness %T.as_type.01d, @Eats, @Eats(%U.as_type) [symbolic] +// CHECK:STDOUT: %.bff53f.1: = impl_self_witness %T.443, @Eats, @Eats(%U.as_type) [symbolic] // CHECK:STDOUT: %Eats.impl_witness.eb80b1.1: = impl_witness @T.as_type.as.Eats.impl.%Eats.impl_witness_table, @T.as_type.as.Eats.impl(%T.443, %U) [symbolic] // CHECK:STDOUT: %Self.e18: %Eats.type.ceea62.1 = symbolic_binding Self, 1 [symbolic] // CHECK:STDOUT: %require_complete.54fb7e.1: = require_complete_type %Eats.type.ceea62.1 [symbolic] @@ -112,7 +112,7 @@ fn F() { // CHECK:STDOUT: %require_complete.3cc: = require_complete_type %Food.as_type.24e [symbolic] // CHECK:STDOUT: %Eats.type.ceea62.2: type = facet_type <@Eats, @Eats(%Food.as_type.24e)> [symbolic] // CHECK:STDOUT: %Eats.lookup_impl_witness: = lookup_impl_witness %A, @Eats, @Eats(%Food.as_type.24e) [symbolic] -// CHECK:STDOUT: %.23c3b4.2: = impl_self_witness %A.as_type, @Eats, @Eats(%Food.as_type.24e) [symbolic] +// CHECK:STDOUT: %.bff53f.2: = impl_self_witness %A, @Eats, @Eats(%Food.as_type.24e) [symbolic] // CHECK:STDOUT: %Eats.impl_witness.eb80b1.2: = impl_witness @T.as_type.as.Eats.impl.%Eats.impl_witness_table, @T.as_type.as.Eats.impl(%A, %Food.5f8) [symbolic] // CHECK:STDOUT: %require_complete.54fb7e.2: = require_complete_type %Eats.type.ceea62.2 [symbolic] // CHECK:STDOUT: %.86d: require_specific_def_type = require_specific_def @T.as_type.as.Eats.impl(%A, %Food.5f8) [symbolic] @@ -285,7 +285,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %U.loc26_26.1: %Edible.type = symbolic_binding U, 1 [symbolic = %U.loc26_26.2 (constants.%U)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc26: = impl_self_witness @T.as_type.as.Eats.impl.%.loc26_36, @Eats, @Eats(constants.%U.as_type) [symbolic = @T.as_type.as.Eats.impl.%.loc26_49 (constants.%.23c3b4.1)] +// CHECK:STDOUT: %.loc26: = impl_self_witness @T.as_type.as.Eats.impl.%.loc26_36, @Eats, @Eats(constants.%U.as_type) [symbolic = @T.as_type.as.Eats.impl.%.loc26_49 (constants.%.bff53f.1)] // CHECK:STDOUT: %Goat.decl: type = class_decl @Goat [concrete = constants.%Goat] {} {} // CHECK:STDOUT: impl_decl @Goat.as.Animal.impl [concrete] {} { // CHECK:STDOUT: %Goat.ref: type = name_ref Goat, file.%Goat.decl [concrete = constants.%Goat] @@ -424,7 +424,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc26_36.2: type = facet_access_type %T.loc26_15.2 [symbolic = %T.as_type.loc26_36.2 (constants.%T.as_type.01d)] // CHECK:STDOUT: %U.as_type.loc26_47.2: type = facet_access_type %U.loc26_26.2 [symbolic = %U.as_type.loc26_47.2 (constants.%U.as_type)] // CHECK:STDOUT: %Eats.type.loc26_47.2: type = facet_type <@Eats, @Eats(%U.as_type.loc26_47.2)> [symbolic = %Eats.type.loc26_47.2 (constants.%Eats.type.ceea62.1)] -// CHECK:STDOUT: %.loc26_49: = impl_self_witness %T.as_type.loc26_36.2, @Eats, @Eats(%U.as_type.loc26_47.2) [symbolic = %.loc26_49 (constants.%.23c3b4.1)] +// CHECK:STDOUT: %.loc26_49: = impl_self_witness %T.loc26_15.2, @Eats, @Eats(%U.as_type.loc26_47.2) [symbolic = %.loc26_49 (constants.%.bff53f.1)] // CHECK:STDOUT: %Eats.impl_witness.loc26_49.2: = impl_witness %Eats.impl_witness_table, @T.as_type.as.Eats.impl(%T.loc26_15.2, %U.loc26_26.2) [symbolic = %Eats.impl_witness.loc26_49.2 (constants.%Eats.impl_witness.eb80b1.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -630,7 +630,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc26_36.2 => constants.%T.as_type.01d // CHECK:STDOUT: %U.as_type.loc26_47.2 => constants.%U.as_type // CHECK:STDOUT: %Eats.type.loc26_47.2 => constants.%Eats.type.ceea62.1 -// CHECK:STDOUT: %.loc26_49 => constants.%.23c3b4.1 +// CHECK:STDOUT: %.loc26_49 => constants.%.bff53f.1 // CHECK:STDOUT: %Eats.impl_witness.loc26_49.2 => constants.%Eats.impl_witness.eb80b1.1 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -696,7 +696,7 @@ fn F() { // CHECK:STDOUT: %T.as_type.loc26_36.2 => constants.%A.as_type // CHECK:STDOUT: %U.as_type.loc26_47.2 => constants.%Food.as_type.24e // CHECK:STDOUT: %Eats.type.loc26_47.2 => constants.%Eats.type.ceea62.2 -// CHECK:STDOUT: %.loc26_49 => constants.%.23c3b4.2 +// CHECK:STDOUT: %.loc26_49 => constants.%.bff53f.2 // CHECK:STDOUT: %Eats.impl_witness.loc26_49.2 => constants.%Eats.impl_witness.eb80b1.2 // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon b/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon index a922584d771e..fe29f31d89ba 100644 --- a/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon +++ b/toolchain/check/testdata/generic/dot_self_symbolic_type.carbon @@ -350,7 +350,7 @@ fn H(generic T: type) { // CHECK:STDOUT: %BB.as_type: type = facet_access_type %BB.6ca [symbolic] // CHECK:STDOUT: %ptr.e8f8f9.1: type = ptr_type %AA [symbolic] // CHECK:STDOUT: %B.type.4a0be4.1: type = facet_type <@B, @B(%ptr.e8f8f9.1)> [symbolic] -// CHECK:STDOUT: %.a32: = impl_self_witness %BB.as_type, @B, @B(%ptr.e8f8f9.1) [symbolic] +// CHECK:STDOUT: %.d12: = impl_self_witness %BB.6ca, @B, @B(%ptr.e8f8f9.1) [symbolic] // CHECK:STDOUT: %B.impl_witness.1f1: = impl_witness @BB.as_type.as.B.impl.%B.impl_witness_table, @BB.as_type.as.B.impl(%AA, %BB.6ca) [symbolic] // CHECK:STDOUT: %require_complete.a5dc9d.1: = require_complete_type %B.type.4a0be4.1 [symbolic] // CHECK:STDOUT: %DD.patt: %pattern_type.9a5 = symbolic_binding_pattern DD, 0 [symbolic] @@ -418,7 +418,7 @@ fn H(generic T: type) { // CHECK:STDOUT: } // CHECK:STDOUT: %BB.loc9_26.1: @BB.as_type.as.B.impl.%A_where.type (%A_where.type.ce6fa0.1) = symbolic_binding BB, 1 [symbolic = %BB.loc9_26.2 (constants.%BB.6ca)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc9: = impl_self_witness @BB.as_type.as.B.impl.%.loc9_49, @B, @B(constants.%ptr.e8f8f9.1) [symbolic = @BB.as_type.as.B.impl.%.loc9_62 (constants.%.a32)] +// CHECK:STDOUT: %.loc9: = impl_self_witness @BB.as_type.as.B.impl.%.loc9_49, @B, @B(constants.%ptr.e8f8f9.1) [symbolic = @BB.as_type.as.B.impl.%.loc9_62 (constants.%.d12)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic impl @BB.as_type.as.B.impl(%AA.loc9_16.1: type, %BB.loc9_26.1: @BB.as_type.as.B.impl.%A_where.type (%A_where.type.ce6fa0.1)) { @@ -442,7 +442,7 @@ fn H(generic T: type) { // CHECK:STDOUT: %BB.as_type.loc9_49.2: type = facet_access_type %BB.loc9_26.2 [symbolic = %BB.as_type.loc9_49.2 (constants.%BB.as_type)] // CHECK:STDOUT: %ptr.loc9_59.2: type = ptr_type %AA.loc9_16.2 [symbolic = %ptr.loc9_59.2 (constants.%ptr.e8f8f9.1)] // CHECK:STDOUT: %B.type.loc9_60.2: type = facet_type <@B, @B(%ptr.loc9_59.2)> [symbolic = %B.type.loc9_60.2 (constants.%B.type.4a0be4.1)] -// CHECK:STDOUT: %.loc9_62: = impl_self_witness %BB.as_type.loc9_49.2, @B, @B(%ptr.loc9_59.2) [symbolic = %.loc9_62 (constants.%.a32)] +// CHECK:STDOUT: %.loc9_62: = impl_self_witness %BB.loc9_26.2, @B, @B(%ptr.loc9_59.2) [symbolic = %.loc9_62 (constants.%.d12)] // CHECK:STDOUT: %B.impl_witness.loc9_62.2: = impl_witness %B.impl_witness_table, @BB.as_type.as.B.impl(%AA.loc9_16.2, %BB.loc9_26.2) [symbolic = %B.impl_witness.loc9_62.2 (constants.%B.impl_witness.1f1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -521,7 +521,7 @@ fn H(generic T: type) { // CHECK:STDOUT: %BB.as_type.loc9_49.2 => constants.%BB.as_type // CHECK:STDOUT: %ptr.loc9_59.2 => constants.%ptr.e8f8f9.1 // CHECK:STDOUT: %B.type.loc9_60.2 => constants.%B.type.4a0be4.1 -// CHECK:STDOUT: %.loc9_62 => constants.%.a32 +// CHECK:STDOUT: %.loc9_62 => constants.%.d12 // CHECK:STDOUT: %B.impl_witness.loc9_62.2 => constants.%B.impl_witness.1f1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/generic_redeclaration.carbon b/toolchain/check/testdata/impl/generic_redeclaration.carbon index f27ce8f9295f..ccd723daf472 100644 --- a/toolchain/check/testdata/impl/generic_redeclaration.carbon +++ b/toolchain/check/testdata/impl/generic_redeclaration.carbon @@ -117,25 +117,25 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.1df: %pattern_type.6cb = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T.dda: %I.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type.b38: type = facet_access_type %T.dda [symbolic] -// CHECK:STDOUT: %.915: = impl_self_witness %T.as_type.b38, @Interface [symbolic] +// CHECK:STDOUT: %.096: = impl_self_witness %T.dda, @Interface [symbolic] // CHECK:STDOUT: %Interface.impl_witness.740: = impl_witness @T.as_type.as.Interface.impl.72f.%Interface.impl_witness_table, @T.as_type.as.Interface.impl.72f(%T.dda) [symbolic] // CHECK:STDOUT: %pattern_type.2c5: type = pattern_type %J.type [concrete] // CHECK:STDOUT: %T.patt.ac1: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T.e40: %J.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type.d90: type = facet_access_type %T.e40 [symbolic] -// CHECK:STDOUT: %.eab: = impl_self_witness %T.as_type.d90, @Interface [symbolic] +// CHECK:STDOUT: %.837: = impl_self_witness %T.e40, @Interface [symbolic] // CHECK:STDOUT: %Interface.impl_witness.cb9: = impl_witness @T.as_type.as.Interface.impl.24e.%Interface.impl_witness_table, @T.as_type.as.Interface.impl.24e(%T.e40) [symbolic] // CHECK:STDOUT: %pattern_type.b64: type = pattern_type %K.type [concrete] // CHECK:STDOUT: %T.patt.0ef: %pattern_type.b64 = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T.062: %K.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type.1ea: type = facet_access_type %T.062 [symbolic] -// CHECK:STDOUT: %.2ae: = impl_self_witness %T.as_type.1ea, @Interface [symbolic] +// CHECK:STDOUT: %.6db: = impl_self_witness %T.062, @Interface [symbolic] // CHECK:STDOUT: %Interface.impl_witness.e2e: = impl_witness @T.as_type.as.Interface.impl.b21.%Interface.impl_witness_table, @T.as_type.as.Interface.impl.b21(%T.062) [symbolic] // CHECK:STDOUT: %pattern_type.25e: type = pattern_type %L.type [concrete] // CHECK:STDOUT: %T.patt.b11: %pattern_type.25e = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T.709: %L.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type.56f: type = facet_access_type %T.709 [symbolic] -// CHECK:STDOUT: %.30d: = impl_self_witness %T.as_type.56f, @Interface [symbolic] +// CHECK:STDOUT: %.82c: = impl_self_witness %T.709, @Interface [symbolic] // CHECK:STDOUT: %Interface.impl_witness.3f0: = impl_witness @T.as_type.as.Interface.impl.2b4.%Interface.impl_witness_table, @T.as_type.as.Interface.impl.2b4(%T.709) [symbolic] // CHECK:STDOUT: %Interface.facet.6a0: %Interface.type = facet_value %T.as_type.b38, (%Interface.impl_witness.740) [symbolic] // CHECK:STDOUT: %Interface.facet.316: %Interface.type = facet_value %T.as_type.d90, (%Interface.impl_witness.cb9) [symbolic] @@ -179,7 +179,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc12_15.1: %I.type = symbolic_binding T, 0 [symbolic = %T.loc12_15.2 (constants.%T.dda)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12: = impl_self_witness @T.as_type.as.Interface.impl.72f.%.loc12_20, @Interface [symbolic = @T.as_type.as.Interface.impl.72f.%.loc12_34 (constants.%.915)] +// CHECK:STDOUT: %.loc12: = impl_self_witness @T.as_type.as.Interface.impl.72f.%.loc12_20, @Interface [symbolic = @T.as_type.as.Interface.impl.72f.%.loc12_34 (constants.%.096)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.24e [concrete] { // CHECK:STDOUT: %T.patt.loc13_15.1: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc13_15.2 (constants.%T.patt.ac1)] // CHECK:STDOUT: } { @@ -193,7 +193,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc13_15.1: %J.type = symbolic_binding T, 0 [symbolic = %T.loc13_15.2 (constants.%T.e40)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc13: = impl_self_witness @T.as_type.as.Interface.impl.24e.%.loc13_20, @Interface [symbolic = @T.as_type.as.Interface.impl.24e.%.loc13_34 (constants.%.eab)] +// CHECK:STDOUT: %.loc13: = impl_self_witness @T.as_type.as.Interface.impl.24e.%.loc13_20, @Interface [symbolic = @T.as_type.as.Interface.impl.24e.%.loc13_34 (constants.%.837)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.b21 [concrete] { // CHECK:STDOUT: %T.patt.loc14_15.1: %pattern_type.b64 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc14_15.2 (constants.%T.patt.0ef)] // CHECK:STDOUT: } { @@ -207,7 +207,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc14_15.1: %K.type = symbolic_binding T, 0 [symbolic = %T.loc14_15.2 (constants.%T.062)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc14: = impl_self_witness @T.as_type.as.Interface.impl.b21.%.loc14_20, @Interface [symbolic = @T.as_type.as.Interface.impl.b21.%.loc14_34 (constants.%.2ae)] +// CHECK:STDOUT: %.loc14: = impl_self_witness @T.as_type.as.Interface.impl.b21.%.loc14_20, @Interface [symbolic = @T.as_type.as.Interface.impl.b21.%.loc14_34 (constants.%.6db)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.2b4 [concrete] { // CHECK:STDOUT: %T.patt.loc15_15.1: %pattern_type.25e = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc15_15.2 (constants.%T.patt.b11)] // CHECK:STDOUT: } { @@ -221,7 +221,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc15_15.1: %L.type = symbolic_binding T, 0 [symbolic = %T.loc15_15.2 (constants.%T.709)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = impl_self_witness @T.as_type.as.Interface.impl.2b4.%.loc15_20, @Interface [symbolic = @T.as_type.as.Interface.impl.2b4.%.loc15_34 (constants.%.30d)] +// CHECK:STDOUT: %.loc15: = impl_self_witness @T.as_type.as.Interface.impl.2b4.%.loc15_20, @Interface [symbolic = @T.as_type.as.Interface.impl.2b4.%.loc15_34 (constants.%.82c)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.72f [concrete] { // CHECK:STDOUT: %T.patt.loc12_15.1: %pattern_type.6cb = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc12_15.2 (constants.%T.patt.1df)] // CHECK:STDOUT: } { @@ -235,7 +235,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc20: %I.type = symbolic_binding T, 0 [symbolic = %T.loc12_15.2 (constants.%T.dda)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc20: = impl_self_witness @T.as_type.as.Interface.impl.72f.%.loc20_20, @Interface [symbolic = @T.as_type.as.Interface.impl.72f.%.loc12_34 (constants.%.915)] +// CHECK:STDOUT: %.loc20: = impl_self_witness @T.as_type.as.Interface.impl.72f.%.loc20_20, @Interface [symbolic = @T.as_type.as.Interface.impl.72f.%.loc12_34 (constants.%.096)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.24e [concrete] { // CHECK:STDOUT: %T.patt.loc13_15.1: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc13_15.2 (constants.%T.patt.ac1)] // CHECK:STDOUT: } { @@ -249,7 +249,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc21: %J.type = symbolic_binding T, 0 [symbolic = %T.loc13_15.2 (constants.%T.e40)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc21: = impl_self_witness @T.as_type.as.Interface.impl.24e.%.loc21_20, @Interface [symbolic = @T.as_type.as.Interface.impl.24e.%.loc13_34 (constants.%.eab)] +// CHECK:STDOUT: %.loc21: = impl_self_witness @T.as_type.as.Interface.impl.24e.%.loc21_20, @Interface [symbolic = @T.as_type.as.Interface.impl.24e.%.loc13_34 (constants.%.837)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.b21 [concrete] { // CHECK:STDOUT: %T.patt.loc14_15.1: %pattern_type.b64 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc14_15.2 (constants.%T.patt.0ef)] // CHECK:STDOUT: } { @@ -263,7 +263,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc22: %K.type = symbolic_binding T, 0 [symbolic = %T.loc14_15.2 (constants.%T.062)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc22: = impl_self_witness @T.as_type.as.Interface.impl.b21.%.loc22_20, @Interface [symbolic = @T.as_type.as.Interface.impl.b21.%.loc14_34 (constants.%.2ae)] +// CHECK:STDOUT: %.loc22: = impl_self_witness @T.as_type.as.Interface.impl.b21.%.loc22_20, @Interface [symbolic = @T.as_type.as.Interface.impl.b21.%.loc14_34 (constants.%.6db)] // CHECK:STDOUT: impl_decl @T.as_type.as.Interface.impl.2b4 [concrete] { // CHECK:STDOUT: %T.patt.loc15_15.1: %pattern_type.25e = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc15_15.2 (constants.%T.patt.b11)] // CHECK:STDOUT: } { @@ -277,7 +277,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc23: %L.type = symbolic_binding T, 0 [symbolic = %T.loc15_15.2 (constants.%T.709)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc23: = impl_self_witness @T.as_type.as.Interface.impl.2b4.%.loc23_20, @Interface [symbolic = @T.as_type.as.Interface.impl.2b4.%.loc15_34 (constants.%.30d)] +// CHECK:STDOUT: %.loc23: = impl_self_witness @T.as_type.as.Interface.impl.2b4.%.loc23_20, @Interface [symbolic = @T.as_type.as.Interface.impl.2b4.%.loc15_34 (constants.%.82c)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { @@ -339,7 +339,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc12_15.2: %pattern_type.6cb = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc12_15.2 (constants.%T.patt.1df)] // CHECK:STDOUT: %T.loc12_15.2: %I.type = symbolic_binding T, 0 [symbolic = %T.loc12_15.2 (constants.%T.dda)] // CHECK:STDOUT: %T.as_type.loc12_20.2: type = facet_access_type %T.loc12_15.2 [symbolic = %T.as_type.loc12_20.2 (constants.%T.as_type.b38)] -// CHECK:STDOUT: %.loc12_34: = impl_self_witness %T.as_type.loc12_20.2, @Interface [symbolic = %.loc12_34 (constants.%.915)] +// CHECK:STDOUT: %.loc12_34: = impl_self_witness %T.loc12_15.2, @Interface [symbolic = %.loc12_34 (constants.%.096)] // CHECK:STDOUT: %Interface.impl_witness.loc12_34.2: = impl_witness %Interface.impl_witness_table, @T.as_type.as.Interface.impl.72f(%T.loc12_15.2) [symbolic = %Interface.impl_witness.loc12_34.2 (constants.%Interface.impl_witness.740)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -359,7 +359,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc13_15.2: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc13_15.2 (constants.%T.patt.ac1)] // CHECK:STDOUT: %T.loc13_15.2: %J.type = symbolic_binding T, 0 [symbolic = %T.loc13_15.2 (constants.%T.e40)] // CHECK:STDOUT: %T.as_type.loc13_20.2: type = facet_access_type %T.loc13_15.2 [symbolic = %T.as_type.loc13_20.2 (constants.%T.as_type.d90)] -// CHECK:STDOUT: %.loc13_34: = impl_self_witness %T.as_type.loc13_20.2, @Interface [symbolic = %.loc13_34 (constants.%.eab)] +// CHECK:STDOUT: %.loc13_34: = impl_self_witness %T.loc13_15.2, @Interface [symbolic = %.loc13_34 (constants.%.837)] // CHECK:STDOUT: %Interface.impl_witness.loc13_34.2: = impl_witness %Interface.impl_witness_table, @T.as_type.as.Interface.impl.24e(%T.loc13_15.2) [symbolic = %Interface.impl_witness.loc13_34.2 (constants.%Interface.impl_witness.cb9)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -379,7 +379,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc14_15.2: %pattern_type.b64 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc14_15.2 (constants.%T.patt.0ef)] // CHECK:STDOUT: %T.loc14_15.2: %K.type = symbolic_binding T, 0 [symbolic = %T.loc14_15.2 (constants.%T.062)] // CHECK:STDOUT: %T.as_type.loc14_20.2: type = facet_access_type %T.loc14_15.2 [symbolic = %T.as_type.loc14_20.2 (constants.%T.as_type.1ea)] -// CHECK:STDOUT: %.loc14_34: = impl_self_witness %T.as_type.loc14_20.2, @Interface [symbolic = %.loc14_34 (constants.%.2ae)] +// CHECK:STDOUT: %.loc14_34: = impl_self_witness %T.loc14_15.2, @Interface [symbolic = %.loc14_34 (constants.%.6db)] // CHECK:STDOUT: %Interface.impl_witness.loc14_34.2: = impl_witness %Interface.impl_witness_table, @T.as_type.as.Interface.impl.b21(%T.loc14_15.2) [symbolic = %Interface.impl_witness.loc14_34.2 (constants.%Interface.impl_witness.e2e)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -399,7 +399,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc15_15.2: %pattern_type.25e = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc15_15.2 (constants.%T.patt.b11)] // CHECK:STDOUT: %T.loc15_15.2: %L.type = symbolic_binding T, 0 [symbolic = %T.loc15_15.2 (constants.%T.709)] // CHECK:STDOUT: %T.as_type.loc15_20.2: type = facet_access_type %T.loc15_15.2 [symbolic = %T.as_type.loc15_20.2 (constants.%T.as_type.56f)] -// CHECK:STDOUT: %.loc15_34: = impl_self_witness %T.as_type.loc15_20.2, @Interface [symbolic = %.loc15_34 (constants.%.30d)] +// CHECK:STDOUT: %.loc15_34: = impl_self_witness %T.loc15_15.2, @Interface [symbolic = %.loc15_34 (constants.%.82c)] // CHECK:STDOUT: %Interface.impl_witness.loc15_34.2: = impl_witness %Interface.impl_witness_table, @T.as_type.as.Interface.impl.2b4(%T.loc15_15.2) [symbolic = %Interface.impl_witness.loc15_34.2 (constants.%Interface.impl_witness.3f0)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -431,7 +431,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc12_15.2 => constants.%T.patt.1df // CHECK:STDOUT: %T.loc12_15.2 => constants.%T.dda // CHECK:STDOUT: %T.as_type.loc12_20.2 => constants.%T.as_type.b38 -// CHECK:STDOUT: %.loc12_34 => constants.%.915 +// CHECK:STDOUT: %.loc12_34 => constants.%.096 // CHECK:STDOUT: %Interface.impl_witness.loc12_34.2 => constants.%Interface.impl_witness.740 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -439,7 +439,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc13_15.2 => constants.%T.patt.ac1 // CHECK:STDOUT: %T.loc13_15.2 => constants.%T.e40 // CHECK:STDOUT: %T.as_type.loc13_20.2 => constants.%T.as_type.d90 -// CHECK:STDOUT: %.loc13_34 => constants.%.eab +// CHECK:STDOUT: %.loc13_34 => constants.%.837 // CHECK:STDOUT: %Interface.impl_witness.loc13_34.2 => constants.%Interface.impl_witness.cb9 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -447,7 +447,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc14_15.2 => constants.%T.patt.0ef // CHECK:STDOUT: %T.loc14_15.2 => constants.%T.062 // CHECK:STDOUT: %T.as_type.loc14_20.2 => constants.%T.as_type.1ea -// CHECK:STDOUT: %.loc14_34 => constants.%.2ae +// CHECK:STDOUT: %.loc14_34 => constants.%.6db // CHECK:STDOUT: %Interface.impl_witness.loc14_34.2 => constants.%Interface.impl_witness.e2e // CHECK:STDOUT: } // CHECK:STDOUT: @@ -455,7 +455,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc15_15.2 => constants.%T.patt.b11 // CHECK:STDOUT: %T.loc15_15.2 => constants.%T.709 // CHECK:STDOUT: %T.as_type.loc15_20.2 => constants.%T.as_type.56f -// CHECK:STDOUT: %.loc15_34 => constants.%.30d +// CHECK:STDOUT: %.loc15_34 => constants.%.82c // CHECK:STDOUT: %Interface.impl_witness.loc15_34.2 => constants.%Interface.impl_witness.3f0 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -488,7 +488,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt: %pattern_type = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T: %I.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type: type = facet_access_type %T [symbolic] -// CHECK:STDOUT: %.989: = impl_self_witness %T.as_type, @J [symbolic] +// CHECK:STDOUT: %.d10: = impl_self_witness %T, @J [symbolic] // CHECK:STDOUT: %J.impl_witness: = impl_witness @T.as_type.as.J.impl.377648.1.%J.impl_witness_table, @T.as_type.as.J.impl.377648.1(%T) [symbolic] // CHECK:STDOUT: %J.facet: %J.type = facet_value %T.as_type, (%J.impl_witness) [symbolic] // CHECK:STDOUT: } @@ -522,7 +522,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc7_15.1: %I.type = symbolic_binding T, 0 [symbolic = %T.loc7_15.2 (constants.%T)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc7: = impl_self_witness @T.as_type.as.J.impl.377648.1.%.loc7_20, @J [symbolic = @T.as_type.as.J.impl.377648.1.%.loc7_27 (constants.%.989)] +// CHECK:STDOUT: %.loc7: = impl_self_witness @T.as_type.as.J.impl.377648.1.%.loc7_20, @J [symbolic = @T.as_type.as.J.impl.377648.1.%.loc7_27 (constants.%.d10)] // CHECK:STDOUT: impl_decl @T.as_type.as.J.impl.377648.2 [concrete] { // CHECK:STDOUT: %T.patt.loc15_15.1: %pattern_type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc15_15.2 (constants.%T.patt)] // CHECK:STDOUT: } { @@ -536,7 +536,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc15_15.1: %I.type = symbolic_binding T, 0 [symbolic = %T.loc15_15.2 (constants.%T)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = impl_self_witness @T.as_type.as.J.impl.377648.2.%.loc15_20, @J [symbolic = @T.as_type.as.J.impl.377648.2.%.loc15_27 (constants.%.989)] +// CHECK:STDOUT: %.loc15: = impl_self_witness @T.as_type.as.J.impl.377648.2.%.loc15_20, @J [symbolic = @T.as_type.as.J.impl.377648.2.%.loc15_27 (constants.%.d10)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I { @@ -565,7 +565,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc7_15.2: %pattern_type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc7_15.2 (constants.%T.patt)] // CHECK:STDOUT: %T.loc7_15.2: %I.type = symbolic_binding T, 0 [symbolic = %T.loc7_15.2 (constants.%T)] // CHECK:STDOUT: %T.as_type.loc7_20.2: type = facet_access_type %T.loc7_15.2 [symbolic = %T.as_type.loc7_20.2 (constants.%T.as_type)] -// CHECK:STDOUT: %.loc7_27: = impl_self_witness %T.as_type.loc7_20.2, @J [symbolic = %.loc7_27 (constants.%.989)] +// CHECK:STDOUT: %.loc7_27: = impl_self_witness %T.loc7_15.2, @J [symbolic = %.loc7_27 (constants.%.d10)] // CHECK:STDOUT: %J.impl_witness.loc7_27.2: = impl_witness %J.impl_witness_table, @T.as_type.as.J.impl.377648.1(%T.loc7_15.2) [symbolic = %J.impl_witness.loc7_27.2 (constants.%J.impl_witness)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -584,7 +584,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc15_15.2: %pattern_type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc15_15.2 (constants.%T.patt)] // CHECK:STDOUT: %T.loc15_15.2: %I.type = symbolic_binding T, 0 [symbolic = %T.loc15_15.2 (constants.%T)] // CHECK:STDOUT: %T.as_type.loc15_20.2: type = facet_access_type %T.loc15_15.2 [symbolic = %T.as_type.loc15_20.2 (constants.%T.as_type)] -// CHECK:STDOUT: %.loc15_27: = impl_self_witness %T.as_type.loc15_20.2, @J [symbolic = %.loc15_27 (constants.%.989)] +// CHECK:STDOUT: %.loc15_27: = impl_self_witness %T.loc15_15.2, @J [symbolic = %.loc15_27 (constants.%.d10)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -605,7 +605,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc7_15.2 => constants.%T.patt // CHECK:STDOUT: %T.loc7_15.2 => constants.%T // CHECK:STDOUT: %T.as_type.loc7_20.2 => constants.%T.as_type -// CHECK:STDOUT: %.loc7_27 => constants.%.989 +// CHECK:STDOUT: %.loc7_27 => constants.%.d10 // CHECK:STDOUT: %J.impl_witness.loc7_27.2 => constants.%J.impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: @@ -617,7 +617,7 @@ impl forall [T: type] T as I { // CHECK:STDOUT: %T.patt.loc15_15.2 => constants.%T.patt // CHECK:STDOUT: %T.loc15_15.2 => constants.%T // CHECK:STDOUT: %T.as_type.loc15_20.2 => constants.%T.as_type -// CHECK:STDOUT: %.loc15_27 => constants.%.989 +// CHECK:STDOUT: %.loc15_27 => constants.%.d10 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_same_type_different_spelling.carbon diff --git a/toolchain/check/testdata/impl/import_self_specific.carbon b/toolchain/check/testdata/impl/import_self_specific.carbon index 2001d4640026..88948d1fe138 100644 --- a/toolchain/check/testdata/impl/import_self_specific.carbon +++ b/toolchain/check/testdata/impl/import_self_specific.carbon @@ -99,7 +99,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { // CHECK:STDOUT: %impl.elem0: %Y.type = impl_witness_access %I.lookup_impl_witness, element0 [symbolic] // CHECK:STDOUT: %as_type: type = facet_access_type %impl.elem0 [symbolic] // CHECK:STDOUT: %Z.lookup_impl_witness: = lookup_impl_witness %impl.elem0, @Z [symbolic] -// CHECK:STDOUT: %.516: = impl_self_witness %as_type, @Z [symbolic] +// CHECK:STDOUT: %.85e: = impl_self_witness %impl.elem0, @Z [symbolic] // CHECK:STDOUT: %Z.impl_witness.95f: = impl_witness @U.as.Z.impl.%Z.impl_witness_table, @U.as.Z.impl(%as_type) [symbolic] // CHECK:STDOUT: %.5b1: require_specific_def_type = require_specific_def @U.as.Z.impl(%as_type) [symbolic] // CHECK:STDOUT: %Z.facet.4d3: %Z.type = facet_value %as_type, (%Z.lookup_impl_witness) [symbolic] @@ -328,7 +328,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { // CHECK:STDOUT: specific @U.as.Z.impl(constants.%as_type) { // CHECK:STDOUT: %U.patt.loc9_15.2 => constants.%U.patt // CHECK:STDOUT: %U.loc9_15.2 => constants.%as_type -// CHECK:STDOUT: %.loc9_30 => constants.%.516 +// CHECK:STDOUT: %.loc9_30 => constants.%.85e // CHECK:STDOUT: %Z.impl_witness.loc9_30.2 => constants.%Z.impl_witness.95f // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -398,7 +398,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { // CHECK:STDOUT: %U.patt: %pattern_type.9a5 = symbolic_binding_pattern U, 0 [symbolic] // CHECK:STDOUT: %.68b: require_specific_def_type = require_specific_def @U.as.Z.impl(%as_type) [symbolic] // CHECK:STDOUT: %Z.impl_witness.65d: = impl_witness imports.%Z.impl_witness_table, @U.as.Z.impl(%as_type) [symbolic] -// CHECK:STDOUT: %.7e3: = impl_self_witness %as_type, @Z [symbolic] +// CHECK:STDOUT: %.b71: = impl_self_witness %impl.elem0.67e, @Z [symbolic] // CHECK:STDOUT: %.Self.frozen.3a0: %I.type = symbolic_binding .Self [symbolic_self] // CHECK:STDOUT: %I.WithSelf.F.type.183: type = fn_type @I.WithSelf.F, @I.WithSelf(%.Self.frozen.3a0) [symbolic_self] // CHECK:STDOUT: %I.WithSelf.F.b1e: %I.WithSelf.F.type.183 = struct_value () [symbolic_self] @@ -714,7 +714,7 @@ impl forall [N: E] D(N) as I where .Assoc = () { // CHECK:STDOUT: specific @U.as.Z.impl(constants.%as_type) { // CHECK:STDOUT: %U.patt => constants.%U.patt // CHECK:STDOUT: %U => constants.%as_type -// CHECK:STDOUT: %.1 => constants.%.7e3 +// CHECK:STDOUT: %.1 => constants.%.b71 // CHECK:STDOUT: %Z.impl_witness => constants.%Z.impl_witness.65d // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon b/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon index fe91f6a0e291..51917909f30e 100644 --- a/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon +++ b/toolchain/check/testdata/impl/lookup/specialization_with_symbolic_rewrite.carbon @@ -158,7 +158,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %F: %F.type = struct_value () [concrete] // CHECK:STDOUT: %require_complete.df7: = require_complete_type %T.as_type [symbolic] // CHECK:STDOUT: %Z_where.type.147: type = facet_type <@Z, @Z(%C) where %impl.elem0.f68 = %T.as_type> [symbolic] -// CHECK:STDOUT: %.eef: = impl_self_witness %T.as_type, @Z, @Z(%C) [symbolic] +// CHECK:STDOUT: %.052: = impl_self_witness %T.4b3, @Z, @Z(%C) [symbolic] // CHECK:STDOUT: %Z.impl_witness.4cd: = impl_witness @T.as.Z.impl.dc2.%Z.impl_witness_table, @T.as.Z.impl.dc2(%T.as_type) [symbolic] // CHECK:STDOUT: %.ac3: require_specific_def_type = require_specific_def @T.as.Z.impl.dc2(%T.as_type) [symbolic] // CHECK:STDOUT: %a.patt: %pattern_type.d37 = value_binding_pattern a [symbolic] @@ -513,7 +513,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %T.patt.loc11_21.2 => constants.%T.patt.3a0 // CHECK:STDOUT: %T.loc11_21.2 => constants.%T.as_type // CHECK:STDOUT: %Z_where.type => constants.%Z_where.type.147 -// CHECK:STDOUT: %.loc11_52 => constants.%.eef +// CHECK:STDOUT: %.loc11_52 => constants.%.052 // CHECK:STDOUT: %Z.impl_witness.loc11_52.2 => constants.%Z.impl_witness.4cd // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -1270,7 +1270,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %t.param_patt: %pattern_type.756 = var_param_pattern %t.patt [symbolic] // CHECK:STDOUT: %ptr.ac4: type = ptr_type %T.as_type.468 [symbolic] // CHECK:STDOUT: %Ptr_where.type.c27: type = facet_type <@Ptr where %impl.elem0.406 = %ptr.ac4> [symbolic] -// CHECK:STDOUT: %.47c: = impl_self_witness %T.as_type.468, @Ptr [symbolic] +// CHECK:STDOUT: %.d24: = impl_self_witness %T.76f, @Ptr [symbolic] // CHECK:STDOUT: %Ptr.impl_witness.8bb: = impl_witness @U.as.Ptr.impl.%Ptr.impl_witness_table, @U.as.Ptr.impl(%T.as_type.468) [symbolic] // CHECK:STDOUT: %.166: require_specific_def_type = require_specific_def @U.as.Ptr.impl(%T.as_type.468) [symbolic] // CHECK:STDOUT: %.e16: Core.Form = init_form %ptr.ac4 [symbolic] @@ -1476,7 +1476,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %U.loc7_21.2 => constants.%T.as_type.468 // CHECK:STDOUT: %ptr.loc7_53.2 => constants.%ptr.ac4 // CHECK:STDOUT: %Ptr_where.type => constants.%Ptr_where.type.c27 -// CHECK:STDOUT: %.loc7_55 => constants.%.47c +// CHECK:STDOUT: %.loc7_55 => constants.%.d24 // CHECK:STDOUT: %Ptr.impl_witness.loc7_55.2 => constants.%Ptr.impl_witness.8bb // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -1530,7 +1530,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %t.param_patt: %pattern_type.756 = var_param_pattern %t.patt [symbolic] // CHECK:STDOUT: %ptr.ac4: type = ptr_type %T.as_type.468 [symbolic] // CHECK:STDOUT: %Ptr_where.type.c27: type = facet_type <@Ptr where %impl.elem0.406 = %ptr.ac4> [symbolic] -// CHECK:STDOUT: %.47c: = impl_self_witness %T.as_type.468, @Ptr [symbolic] +// CHECK:STDOUT: %.d24: = impl_self_witness %T.76f, @Ptr [symbolic] // CHECK:STDOUT: %Ptr.impl_witness.8bb: = impl_witness @U.as.Ptr.impl.%Ptr.impl_witness_table, @U.as.Ptr.impl(%T.as_type.468) [symbolic] // CHECK:STDOUT: %.166: require_specific_def_type = require_specific_def @U.as.Ptr.impl(%T.as_type.468) [symbolic] // CHECK:STDOUT: %.e16: Core.Form = init_form %ptr.ac4 [symbolic] @@ -1731,7 +1731,7 @@ fn F[T: Ptr](var t: T) -> T.(Ptr.Type) { // CHECK:STDOUT: %U.loc7_21.2 => constants.%T.as_type.468 // CHECK:STDOUT: %ptr.loc7_53.2 => constants.%ptr.ac4 // CHECK:STDOUT: %Ptr_where.type => constants.%Ptr_where.type.c27 -// CHECK:STDOUT: %.loc7_55 => constants.%.47c +// CHECK:STDOUT: %.loc7_55 => constants.%.d24 // CHECK:STDOUT: %Ptr.impl_witness.loc7_55.2 => constants.%Ptr.impl_witness.8bb // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/interface/final.carbon b/toolchain/check/testdata/interface/final.carbon index d280dd19337c..5d33a4ef2221 100644 --- a/toolchain/check/testdata/interface/final.carbon +++ b/toolchain/check/testdata/interface/final.carbon @@ -46,7 +46,7 @@ fn Use() { UseJ(C); } // CHECK:STDOUT: %T.patt.ac1: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic] // CHECK:STDOUT: %T.e40: %J.type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %T.as_type.d90: type = facet_access_type %T.e40 [symbolic] -// CHECK:STDOUT: %.d3d: = impl_self_witness %T.as_type.d90, @I [symbolic] +// CHECK:STDOUT: %.6ac: = impl_self_witness %T.e40, @I [symbolic] // CHECK:STDOUT: %I.impl_witness.b7c: = impl_witness @T.as_type.as.I.impl.%I.impl_witness_table, @T.as_type.as.I.impl(%T.e40) [symbolic] // CHECK:STDOUT: %T.as_type.as.I.impl.F.type.f53: type = fn_type @T.as_type.as.I.impl.F, @T.as_type.as.I.impl(%T.e40) [symbolic] // CHECK:STDOUT: %T.as_type.as.I.impl.F.305: %T.as_type.as.I.impl.F.type.f53 = struct_value () [symbolic] @@ -125,7 +125,7 @@ fn Use() { UseJ(C); } // CHECK:STDOUT: } // CHECK:STDOUT: %T.loc7_21.2: %J.type = symbolic_binding T, 0 [symbolic = %T.loc7_21.1 (constants.%T.e40)] // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc7: = impl_self_witness @T.as_type.as.I.impl.%.loc7_26, @I [symbolic = @T.as_type.as.I.impl.%.loc7_33 (constants.%.d3d)] +// CHECK:STDOUT: %.loc7: = impl_self_witness @T.as_type.as.I.impl.%.loc7_26, @I [symbolic = @T.as_type.as.I.impl.%.loc7_33 (constants.%.6ac)] // CHECK:STDOUT: %UseI.decl: %UseI.type = fn_decl @UseI [concrete = constants.%UseI] { // CHECK:STDOUT: %T.patt.loc11_18.1: %pattern_type.6cb = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc11_18.2 (constants.%T.patt.1df)] // CHECK:STDOUT: } { @@ -184,7 +184,7 @@ fn Use() { UseJ(C); } // CHECK:STDOUT: %T.patt.loc7_21.2: %pattern_type.2c5 = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc7_21.2 (constants.%T.patt.ac1)] // CHECK:STDOUT: %T.loc7_21.1: %J.type = symbolic_binding T, 0 [symbolic = %T.loc7_21.1 (constants.%T.e40)] // CHECK:STDOUT: %T.as_type.loc7_26.1: type = facet_access_type %T.loc7_21.1 [symbolic = %T.as_type.loc7_26.1 (constants.%T.as_type.d90)] -// CHECK:STDOUT: %.loc7_33: = impl_self_witness %T.as_type.loc7_26.1, @I [symbolic = %.loc7_33 (constants.%.d3d)] +// CHECK:STDOUT: %.loc7_33: = impl_self_witness %T.loc7_21.1, @I [symbolic = %.loc7_33 (constants.%.6ac)] // CHECK:STDOUT: %I.impl_witness.loc7_33.2: = impl_witness %I.impl_witness_table, @T.as_type.as.I.impl(%T.loc7_21.1) [symbolic = %I.impl_witness.loc7_33.2 (constants.%I.impl_witness.b7c)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -310,7 +310,7 @@ fn Use() { UseJ(C); } // CHECK:STDOUT: %T.patt.loc7_21.2 => constants.%T.patt.ac1 // CHECK:STDOUT: %T.loc7_21.1 => constants.%T.e40 // CHECK:STDOUT: %T.as_type.loc7_26.1 => constants.%T.as_type.d90 -// CHECK:STDOUT: %.loc7_33 => constants.%.d3d +// CHECK:STDOUT: %.loc7_33 => constants.%.6ac // CHECK:STDOUT: %I.impl_witness.loc7_33.2 => constants.%I.impl_witness.b7c // CHECK:STDOUT: // CHECK:STDOUT: !definition: diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon index 8a0682cffe30..310be39670ff 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon @@ -964,7 +964,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.990: %Core.IntLiteral.as.As.impl.Convert.type.49f = struct_value () [concrete] // CHECK:STDOUT: %As.facet: %As.type.72f = facet_value Core.IntLiteral, (%As.impl_witness.5477) [concrete] // CHECK:STDOUT: %As.WithSelf.Convert.type.e94: type = fn_type @As.WithSelf.Convert, @As.WithSelf(%u64, %As.facet) [concrete] -// CHECK:STDOUT: %.b3c: type = fn_type_with_self_type %As.WithSelf.Convert.type.e94, %As.facet [concrete] +// CHECK:STDOUT: %.b3c9: type = fn_type_with_self_type %As.WithSelf.Convert.type.e94, %As.facet [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.bound: = bound_method %int_1.5b8, %Core.IntLiteral.as.As.impl.Convert.990 [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.specific_fn: = specific_function %Core.IntLiteral.as.As.impl.Convert.990, @Core.IntLiteral.as.As.impl.Convert(%int_64) [concrete] // CHECK:STDOUT: %bound_method.318: = bound_method %int_1.5b8, %Core.IntLiteral.as.As.impl.Convert.specific_fn [concrete] @@ -1109,7 +1109,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %int_1.loc11: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long_long.ref.loc11: type = name_ref unsigned_long_long, %u64.2 [concrete = constants.%u64] -// CHECK:STDOUT: %impl.elem0.loc11_30.1: %.b3c = impl_witness_access constants.%As.impl_witness.5477, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.990] +// CHECK:STDOUT: %impl.elem0.loc11_30.1: %.b3c9 = impl_witness_access constants.%As.impl_witness.5477, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.990] // CHECK:STDOUT: %bound_method.loc11_30.1: = bound_method %int_1.loc11, %impl.elem0.loc11_30.1 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.bound] // CHECK:STDOUT: %specific_fn.loc11_30.1: = specific_function %impl.elem0.loc11_30.1, @Core.IntLiteral.as.As.impl.Convert(constants.%int_64) [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.specific_fn] // CHECK:STDOUT: %bound_method.loc11_30.2: = bound_method %int_1.loc11, %specific_fn.loc11_30.1 [concrete = constants.%bound_method.318] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon index 908d89d63f59..76afb1b8a51b 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon @@ -912,7 +912,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.990: %Core.IntLiteral.as.As.impl.Convert.type.49f = struct_value () [concrete] // CHECK:STDOUT: %As.facet: %As.type.72f = facet_value Core.IntLiteral, (%As.impl_witness.5477) [concrete] // CHECK:STDOUT: %As.WithSelf.Convert.type.e94: type = fn_type @As.WithSelf.Convert, @As.WithSelf(%u64, %As.facet) [concrete] -// CHECK:STDOUT: %.b3c: type = fn_type_with_self_type %As.WithSelf.Convert.type.e94, %As.facet [concrete] +// CHECK:STDOUT: %.b3c9: type = fn_type_with_self_type %As.WithSelf.Convert.type.e94, %As.facet [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.bound: = bound_method %int_1.5b8, %Core.IntLiteral.as.As.impl.Convert.990 [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.specific_fn: = specific_function %Core.IntLiteral.as.As.impl.Convert.990, @Core.IntLiteral.as.As.impl.Convert(%int_64) [concrete] // CHECK:STDOUT: %bound_method.318: = bound_method %int_1.5b8, %Core.IntLiteral.as.As.impl.Convert.specific_fn [concrete] @@ -1057,7 +1057,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %int_1.loc11: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %Cpp.ref.loc11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long.ref.loc11: type = name_ref unsigned_long, %u64.2 [concrete = constants.%u64] -// CHECK:STDOUT: %impl.elem0.loc11_30.1: %.b3c = impl_witness_access constants.%As.impl_witness.5477, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.990] +// CHECK:STDOUT: %impl.elem0.loc11_30.1: %.b3c9 = impl_witness_access constants.%As.impl_witness.5477, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.990] // CHECK:STDOUT: %bound_method.loc11_30.1: = bound_method %int_1.loc11, %impl.elem0.loc11_30.1 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.bound] // CHECK:STDOUT: %specific_fn.loc11_30.1: = specific_function %impl.elem0.loc11_30.1, @Core.IntLiteral.as.As.impl.Convert(constants.%int_64) [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.specific_fn] // CHECK:STDOUT: %bound_method.loc11_30.2: = bound_method %int_1.loc11, %specific_fn.loc11_30.1 [concrete = constants.%bound_method.318] @@ -4358,7 +4358,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %As.impl_witness.0db: = impl_witness imports.%As.impl_witness_table.701 [concrete] // CHECK:STDOUT: %As.facet: %As.type.7f6 = facet_value Core.IntLiteral, (%As.impl_witness.0db) [concrete] // CHECK:STDOUT: %As.WithSelf.Convert.type.381: type = fn_type @As.WithSelf.Convert, @As.WithSelf(%Cpp.unsigned_long_long, %As.facet) [concrete] -// CHECK:STDOUT: %.94e: type = fn_type_with_self_type %As.WithSelf.Convert.type.381, %As.facet [concrete] +// CHECK:STDOUT: %.94e3: type = fn_type_with_self_type %As.WithSelf.Convert.type.381, %As.facet [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.type: type = fn_type @Core.IntLiteral.as.As.impl.Convert [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert: %Core.IntLiteral.as.As.impl.Convert.type = struct_value () [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.bound: = bound_method %int_1.5b8, %Core.IntLiteral.as.As.impl.Convert [concrete] @@ -4651,7 +4651,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %int_1.loc24: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %Cpp.ref.loc24: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %unsigned_long_long.ref.loc24: type = name_ref unsigned_long_long, constants.%Cpp.unsigned_long_long [concrete = constants.%Cpp.unsigned_long_long] -// CHECK:STDOUT: %impl.elem0.loc24_30.1: %.94e = impl_witness_access constants.%As.impl_witness.0db, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert] +// CHECK:STDOUT: %impl.elem0.loc24_30.1: %.94e3 = impl_witness_access constants.%As.impl_witness.0db, element0 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert] // CHECK:STDOUT: %bound_method.loc24_30.1: = bound_method %int_1.loc24, %impl.elem0.loc24_30.1 [concrete = constants.%Core.IntLiteral.as.As.impl.Convert.bound] // CHECK:STDOUT: %Core.IntLiteral.as.As.impl.Convert.call: init %Cpp.unsigned_long_long = call %bound_method.loc24_30.1(%int_1.loc24) [concrete = constants.%int_1.877] // CHECK:STDOUT: %.loc24_30.1: %Cpp.unsigned_long_long = value_of_initializer %Core.IntLiteral.as.As.impl.Convert.call [concrete = constants.%int_1.877] diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 0110b8b9b999..e25fce238838 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -1088,7 +1088,7 @@ struct ImplDecl { struct ImplSelfWitness { static constexpr auto Kind = InstKind::ImplSelfWitness.Define( {.ir_name = "impl_self_witness", - .constant_kind = InstConstantKind::Always, + .constant_kind = InstConstantKind::Conditional, .is_lowered = false}); // Always the type of the builtin `WitnessType` singleton instruction. TypeId type_id;