Skip to content

Commit f272198

Browse files
authored
Don't elide Self when dumping the interface/constraint (#6297)
We give `Self` in an interface/constraint a location so it's not elided when trying to dump the interface/constraint. We use the location of the start of the definition, which is the scope for which the `Self` is constructed and is available in.
1 parent 6561505 commit f272198

File tree

54 files changed

+481
-478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+481
-478
lines changed

toolchain/check/handle_interface.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ auto HandleParseNode(Context& context,
138138
// `require` declarations.
139139
SemIR::TypeId self_type_id =
140140
GetInterfaceType(context, interface_id, self_specific_id);
141-
interface_info.self_param_id = AddSelfGenericParameter(
142-
context, self_type_id, interface_info.scope_id, /*is_template=*/false);
141+
interface_info.self_param_id =
142+
AddSelfGenericParameter(context, node_id, self_type_id,
143+
interface_info.scope_id, /*is_template=*/false);
143144

144145
// Enter the interface scope.
145146
context.scope_stack().PushForEntity(decl_inst_id, interface_info.scope_id,

toolchain/check/handle_named_constraint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ auto HandleParseNode(Context& context,
137137
SemIR::TypeId self_type_id =
138138
GetNamedConstraintType(context, named_constraint_id, self_specific_id);
139139
constraint_info.self_param_id = AddSelfGenericParameter(
140-
context, self_type_id, constraint_info.scope_id, is_template);
140+
context, node_id, self_type_id, constraint_info.scope_id, is_template);
141141

142142
// Enter the constraint scope.
143143
context.scope_stack().PushForEntity(decl_inst_id, constraint_info.scope_id,

toolchain/check/interface.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,19 @@ auto GetTypeForSpecificAssociatedEntity(Context& context, SemIR::LocId loc_id,
223223
CARBON_FATAL("Unexpected kind for associated constant {0}", decl);
224224
}
225225

226-
auto AddSelfGenericParameter(Context& context, SemIR::TypeId type_id,
227-
SemIR::NameScopeId scope_id, bool is_template)
228-
-> SemIR::InstId {
226+
auto AddSelfGenericParameter(Context& context, SemIR::LocId definition_loc_id,
227+
SemIR::TypeId type_id, SemIR::NameScopeId scope_id,
228+
bool is_template) -> SemIR::InstId {
229229
auto entity_name_id = context.entity_names().AddSymbolicBindingName(
230230
SemIR::NameId::SelfType, scope_id,
231231
context.scope_stack().AddCompileTimeBinding(), is_template);
232232
// Because there is no equivalent non-symbolic value, we use `None` as
233233
// the `value_id` on the `SymbolicBinding`.
234234
auto self_param_inst_id =
235-
AddInst(context, SemIR::LocIdAndInst::NoLoc<SemIR::SymbolicBinding>(
236-
{.type_id = type_id,
237-
.entity_name_id = entity_name_id,
238-
.value_id = SemIR::InstId::None}));
235+
AddInst<SemIR::SymbolicBinding>(context, definition_loc_id,
236+
{.type_id = type_id,
237+
.entity_name_id = entity_name_id,
238+
.value_id = SemIR::InstId::None});
239239
context.scope_stack().PushCompileTimeBinding(self_param_inst_id);
240240
context.name_scopes().AddRequiredName(scope_id, SemIR::NameId::SelfType,
241241
self_param_inst_id);

toolchain/check/interface.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ auto GetTypeForSpecificAssociatedEntity(Context& context, SemIR::LocId loc_id,
4646
// `scope_id`, and add the name `Self` for the compile time binding.
4747
//
4848
// Returns the symbolic binding instruction.
49-
auto AddSelfGenericParameter(Context& context, SemIR::TypeId type_id,
50-
SemIR::NameScopeId scope_id, bool is_template)
51-
-> SemIR::InstId;
49+
auto AddSelfGenericParameter(Context& context, SemIR::LocId definition_loc_id,
50+
SemIR::TypeId type_id, SemIR::NameScopeId scope_id,
51+
bool is_template) -> SemIR::InstId;
5252

5353
// Given a search result `lookup_result` for `name`, returns the previous valid
5454
// declaration of `name` if there is one. The `entity` is a new decl of the same

toolchain/check/testdata/basics/include_in_dumps.carbon

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ fn F(c: C) { c.(I.Op)(); }
135135
// CHECK:STDOUT: }
136136
// CHECK:STDOUT:
137137
// CHECK:STDOUT: interface @I {
138-
// CHECK:STDOUT: <elided>
138+
// CHECK:STDOUT: %Self: %I.type = symbolic_binding Self, 0 [symbolic = constants.%Self]
139139
// CHECK:STDOUT: %I.Op.decl: %I.Op.type = fn_decl @I.Op [concrete = constants.%I.Op] {
140140
// CHECK:STDOUT: %self.patt: @I.Op.%pattern_type (%pattern_type.89c) = value_binding_pattern self [concrete]
141141
// CHECK:STDOUT: %self.param_patt: @I.Op.%pattern_type (%pattern_type.89c) = value_param_pattern %self.patt, call_param0 [concrete]
@@ -210,11 +210,11 @@ fn F(c: C) { c.(I.Op)(); }
210210
// CHECK:STDOUT: }
211211
// CHECK:STDOUT: %Main.import_ref.8f2: <witness> = import_ref Main//included_with_range, loc16_1, loaded [concrete = constants.%complete_type]
212212
// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//included_with_range, inst{{[0-9A-F]+}} [no loc], unloaded
213-
// CHECK:STDOUT: %Main.import_ref.8df = import_ref Main//included_with_range, inst{{[0-9A-F]+}} [no loc], unloaded
213+
// CHECK:STDOUT: %Main.import_ref.8df = import_ref Main//included_with_range, loc7_13, unloaded
214214
// CHECK:STDOUT: %Main.import_ref.9cd: %I.assoc_type = import_ref Main//included_with_range, loc8_22, loaded [concrete = constants.%assoc0]
215215
// CHECK:STDOUT: %Main.Op = import_ref Main//included_with_range, Op, unloaded
216216
// CHECK:STDOUT: %Main.import_ref.7d9: %I.Op.type = import_ref Main//included_with_range, loc8_22, loaded [concrete = constants.%I.Op]
217-
// CHECK:STDOUT: %Main.import_ref.e33: %I.type = import_ref Main//included_with_range, inst{{[0-9A-F]+}} [no loc], loaded [symbolic = constants.%Self]
217+
// CHECK:STDOUT: %Main.import_ref.e33: %I.type = import_ref Main//included_with_range, loc7_13, loaded [symbolic = constants.%Self]
218218
// CHECK:STDOUT: %Main.import_ref.3a9: <witness> = import_ref Main//included_with_range, loc13_15, loaded [concrete = constants.%I.impl_witness]
219219
// CHECK:STDOUT: %Main.import_ref.29a: type = import_ref Main//included_with_range, loc13_8, loaded [concrete = constants.%C]
220220
// CHECK:STDOUT: %Main.import_ref.301: type = import_ref Main//included_with_range, loc13_13, loaded [concrete = constants.%I.type]

toolchain/check/testdata/class/generic/member_type.carbon

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -529,14 +529,14 @@ fn Test() -> i32 {
529529
// CHECK:STDOUT: !definition:
530530
// CHECK:STDOUT: %T: type = symbolic_binding T, 0 [symbolic = %T (constants.%T)]
531531
// CHECK:STDOUT: %Inner.type: type = facet_type <@Inner, @Inner(%T)> [symbolic = %Inner.type (constants.%Inner.type.5f4)]
532-
// CHECK:STDOUT: %Self.2: @Inner.%Inner.type (%Inner.type.5f4) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.1ac)]
532+
// CHECK:STDOUT: %Self.loc5_19.2: @Inner.%Inner.type (%Inner.type.5f4) = symbolic_binding Self, 1 [symbolic = %Self.loc5_19.2 (constants.%Self.1ac)]
533533
// CHECK:STDOUT: %Inner.F.type: type = fn_type @Inner.F, @Inner(%T) [symbolic = %Inner.F.type (constants.%Inner.F.type.b25)]
534534
// CHECK:STDOUT: %Inner.F: @Inner.%Inner.F.type (%Inner.F.type.b25) = struct_value () [symbolic = %Inner.F (constants.%Inner.F.88e)]
535535
// CHECK:STDOUT: %Inner.assoc_type: type = assoc_entity_type @Inner, @Inner(%T) [symbolic = %Inner.assoc_type (constants.%Inner.assoc_type.b54)]
536536
// CHECK:STDOUT: %assoc0.loc6_28.2: @Inner.%Inner.assoc_type (%Inner.assoc_type.b54) = assoc_entity element0, %Inner.F.decl [symbolic = %assoc0.loc6_28.2 (constants.%assoc0.dc7)]
537537
// CHECK:STDOUT:
538538
// CHECK:STDOUT: interface {
539-
// CHECK:STDOUT: %Self.1: @Inner.%Inner.type (%Inner.type.5f4) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.1ac)]
539+
// CHECK:STDOUT: %Self.loc5_19.1: @Inner.%Inner.type (%Inner.type.5f4) = symbolic_binding Self, 1 [symbolic = %Self.loc5_19.2 (constants.%Self.1ac)]
540540
// CHECK:STDOUT: %Inner.F.decl: @Inner.%Inner.F.type (%Inner.F.type.b25) = fn_decl @Inner.F [symbolic = @Inner.%Inner.F (constants.%Inner.F.88e)] {
541541
// CHECK:STDOUT: %self.patt: @Inner.F.%pattern_type.loc6_10 (%pattern_type.0d2) = value_binding_pattern self [concrete]
542542
// CHECK:STDOUT: %self.param_patt: @Inner.F.%pattern_type.loc6_10 (%pattern_type.0d2) = value_param_pattern %self.patt, call_param0 [concrete]
@@ -546,7 +546,7 @@ fn Test() -> i32 {
546546
// CHECK:STDOUT: %T.ref: type = name_ref T, @Outer.%T.loc4_13.2 [symbolic = %T (constants.%T)]
547547
// CHECK:STDOUT: %self.param: @Inner.F.%Self.binding.as_type (%Self.binding.as_type.bfd) = value_param call_param0
548548
// CHECK:STDOUT: %.loc6_16.1: type = splice_block %.loc6_16.3 [symbolic = %Self.binding.as_type (constants.%Self.binding.as_type.bfd)] {
549-
// CHECK:STDOUT: %.loc6_16.2: @Inner.F.%Inner.type (%Inner.type.5f4) = specific_constant @Inner.%Self.1, @Inner(constants.%T) [symbolic = %Self (constants.%Self.1ac)]
549+
// CHECK:STDOUT: %.loc6_16.2: @Inner.F.%Inner.type (%Inner.type.5f4) = specific_constant @Inner.%Self.loc5_19.1, @Inner(constants.%T) [symbolic = %Self (constants.%Self.1ac)]
550550
// CHECK:STDOUT: %Self.ref: @Inner.F.%Inner.type (%Inner.type.5f4) = name_ref Self, %.loc6_16.2 [symbolic = %Self (constants.%Self.1ac)]
551551
// CHECK:STDOUT: %Self.as_type: type = facet_access_type %Self.ref [symbolic = %Self.binding.as_type (constants.%Self.binding.as_type.bfd)]
552552
// CHECK:STDOUT: %.loc6_16.3: type = converted %Self.ref, %Self.as_type [symbolic = %Self.binding.as_type (constants.%Self.binding.as_type.bfd)]
@@ -558,7 +558,7 @@ fn Test() -> i32 {
558558
// CHECK:STDOUT: %assoc0.loc6_28.1: @Inner.%Inner.assoc_type (%Inner.assoc_type.b54) = assoc_entity element0, %Inner.F.decl [symbolic = %assoc0.loc6_28.2 (constants.%assoc0.dc7)]
559559
// CHECK:STDOUT:
560560
// CHECK:STDOUT: !members:
561-
// CHECK:STDOUT: .Self = %Self.1
561+
// CHECK:STDOUT: .Self = %Self.loc5_19.1
562562
// CHECK:STDOUT: .T = <poisoned>
563563
// CHECK:STDOUT: .F = %assoc0.loc6_28.1
564564
// CHECK:STDOUT: witness = (%Inner.F.decl)
@@ -689,7 +689,7 @@ fn Test() -> i32 {
689689
// CHECK:STDOUT: .D = <poisoned>
690690
// CHECK:STDOUT: }
691691
// CHECK:STDOUT:
692-
// CHECK:STDOUT: generic fn @Inner.F(@Outer.%T.loc4_13.2: type, @Inner.%Self.1: @Inner.%Inner.type (%Inner.type.5f4)) {
692+
// CHECK:STDOUT: generic fn @Inner.F(@Outer.%T.loc4_13.2: type, @Inner.%Self.loc5_19.1: @Inner.%Inner.type (%Inner.type.5f4)) {
693693
// CHECK:STDOUT: %T: type = symbolic_binding T, 0 [symbolic = %T (constants.%T)]
694694
// CHECK:STDOUT: %Inner.type: type = facet_type <@Inner, @Inner(%T)> [symbolic = %Inner.type (constants.%Inner.type.5f4)]
695695
// CHECK:STDOUT: %Self: @Inner.F.%Inner.type (%Inner.type.5f4) = symbolic_binding Self, 1 [symbolic = %Self (constants.%Self.1ac)]
@@ -794,7 +794,7 @@ fn Test() -> i32 {
794794
// CHECK:STDOUT: !definition:
795795
// CHECK:STDOUT: %T => constants.%T
796796
// CHECK:STDOUT: %Inner.type => constants.%Inner.type.5f4
797-
// CHECK:STDOUT: %Self.2 => constants.%Self.1ac
797+
// CHECK:STDOUT: %Self.loc5_19.2 => constants.%Self.1ac
798798
// CHECK:STDOUT: %Inner.F.type => constants.%Inner.F.type.b25
799799
// CHECK:STDOUT: %Inner.F => constants.%Inner.F.88e
800800
// CHECK:STDOUT: %Inner.assoc_type => constants.%Inner.assoc_type.b54
@@ -863,7 +863,7 @@ fn Test() -> i32 {
863863
// CHECK:STDOUT: !definition:
864864
// CHECK:STDOUT: %T => constants.%i32
865865
// CHECK:STDOUT: %Inner.type => constants.%Inner.type.56c
866-
// CHECK:STDOUT: %Self.2 => constants.%Self.d26
866+
// CHECK:STDOUT: %Self.loc5_19.2 => constants.%Self.d26
867867
// CHECK:STDOUT: %Inner.F.type => constants.%Inner.F.type.86e
868868
// CHECK:STDOUT: %Inner.F => constants.%Inner.F.11d
869869
// CHECK:STDOUT: %Inner.assoc_type => constants.%Inner.assoc_type.215

toolchain/check/testdata/facet/convert_class_type_to_generic_facet_value.carbon

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,19 @@ fn G() {
187187
// CHECK:STDOUT:
188188
// CHECK:STDOUT: !definition:
189189
// CHECK:STDOUT: %Generic.type: type = facet_type <@Generic, @Generic(%Scalar.loc4_19.1)> [symbolic = %Generic.type (constants.%Generic.type.68bb8d.1)]
190-
// CHECK:STDOUT: %Self.2: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.fc1c73.1)]
190+
// CHECK:STDOUT: %Self.loc4_34.2: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.loc4_34.2 (constants.%Self.fc1c73.1)]
191191
// CHECK:STDOUT: %Generic.F.type: type = fn_type @Generic.F, @Generic(%Scalar.loc4_19.1) [symbolic = %Generic.F.type (constants.%Generic.F.type.fc1c8a.1)]
192192
// CHECK:STDOUT: %Generic.F: @Generic.%Generic.F.type (%Generic.F.type.fc1c8a.1) = struct_value () [symbolic = %Generic.F (constants.%Generic.F.d952d5.1)]
193193
// CHECK:STDOUT: %Generic.assoc_type: type = assoc_entity_type @Generic, @Generic(%Scalar.loc4_19.1) [symbolic = %Generic.assoc_type (constants.%Generic.assoc_type.414a90.1)]
194194
// CHECK:STDOUT: %assoc0.loc5_9.2: @Generic.%Generic.assoc_type (%Generic.assoc_type.414a90.1) = assoc_entity element0, %Generic.F.decl [symbolic = %assoc0.loc5_9.2 (constants.%assoc0.3122a2.1)]
195195
// CHECK:STDOUT:
196196
// CHECK:STDOUT: interface {
197-
// CHECK:STDOUT: %Self.1: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.fc1c73.1)]
197+
// CHECK:STDOUT: %Self.loc4_34.1: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.loc4_34.2 (constants.%Self.fc1c73.1)]
198198
// CHECK:STDOUT: %Generic.F.decl: @Generic.%Generic.F.type (%Generic.F.type.fc1c8a.1) = fn_decl @Generic.F [symbolic = @Generic.%Generic.F (constants.%Generic.F.d952d5.1)] {} {}
199199
// CHECK:STDOUT: %assoc0.loc5_9.1: @Generic.%Generic.assoc_type (%Generic.assoc_type.414a90.1) = assoc_entity element0, %Generic.F.decl [symbolic = %assoc0.loc5_9.2 (constants.%assoc0.3122a2.1)]
200200
// CHECK:STDOUT:
201201
// CHECK:STDOUT: !members:
202-
// CHECK:STDOUT: .Self = %Self.1
202+
// CHECK:STDOUT: .Self = %Self.loc4_34.1
203203
// CHECK:STDOUT: .F = %assoc0.loc5_9.1
204204
// CHECK:STDOUT: witness = (%Generic.F.decl)
205205
// CHECK:STDOUT: }
@@ -229,7 +229,7 @@ fn G() {
229229
// CHECK:STDOUT: .Self = constants.%ImplsGeneric
230230
// CHECK:STDOUT: }
231231
// CHECK:STDOUT:
232-
// CHECK:STDOUT: generic fn @Generic.F(@Generic.%Scalar.loc4_19.2: type, @Generic.%Self.1: @Generic.%Generic.type (%Generic.type.68bb8d.1)) {
232+
// CHECK:STDOUT: generic fn @Generic.F(@Generic.%Scalar.loc4_19.2: type, @Generic.%Self.loc4_34.1: @Generic.%Generic.type (%Generic.type.68bb8d.1)) {
233233
// CHECK:STDOUT: fn();
234234
// CHECK:STDOUT: }
235235
// CHECK:STDOUT:
@@ -307,7 +307,7 @@ fn G() {
307307
// CHECK:STDOUT:
308308
// CHECK:STDOUT: !definition:
309309
// CHECK:STDOUT: %Generic.type => constants.%Generic.type.621
310-
// CHECK:STDOUT: %Self.2 => constants.%Self.ae2
310+
// CHECK:STDOUT: %Self.loc4_34.2 => constants.%Self.ae2
311311
// CHECK:STDOUT: %Generic.F.type => constants.%Generic.F.type.4cf
312312
// CHECK:STDOUT: %Generic.F => constants.%Generic.F.118
313313
// CHECK:STDOUT: %Generic.assoc_type => constants.%Generic.assoc_type.713
@@ -321,7 +321,7 @@ fn G() {
321321
// CHECK:STDOUT:
322322
// CHECK:STDOUT: !definition:
323323
// CHECK:STDOUT: %Generic.type => constants.%Generic.type.68bb8d.2
324-
// CHECK:STDOUT: %Self.2 => constants.%Self.fc1c73.2
324+
// CHECK:STDOUT: %Self.loc4_34.2 => constants.%Self.fc1c73.2
325325
// CHECK:STDOUT: %Generic.F.type => constants.%Generic.F.type.fc1c8a.2
326326
// CHECK:STDOUT: %Generic.F => constants.%Generic.F.d952d5.2
327327
// CHECK:STDOUT: %Generic.assoc_type => constants.%Generic.assoc_type.414a90.2
@@ -478,19 +478,19 @@ fn G() {
478478
// CHECK:STDOUT:
479479
// CHECK:STDOUT: !definition:
480480
// CHECK:STDOUT: %Generic.type: type = facet_type <@Generic, @Generic(%Scalar.loc4_19.1)> [symbolic = %Generic.type (constants.%Generic.type.68bb8d.1)]
481-
// CHECK:STDOUT: %Self.2: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.fc1)]
481+
// CHECK:STDOUT: %Self.loc4_34.2: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.loc4_34.2 (constants.%Self.fc1)]
482482
// CHECK:STDOUT: %Generic.F.type: type = fn_type @Generic.F, @Generic(%Scalar.loc4_19.1) [symbolic = %Generic.F.type (constants.%Generic.F.type.fc1)]
483483
// CHECK:STDOUT: %Generic.F: @Generic.%Generic.F.type (%Generic.F.type.fc1) = struct_value () [symbolic = %Generic.F (constants.%Generic.F.d95)]
484484
// CHECK:STDOUT: %Generic.assoc_type: type = assoc_entity_type @Generic, @Generic(%Scalar.loc4_19.1) [symbolic = %Generic.assoc_type (constants.%Generic.assoc_type.414)]
485485
// CHECK:STDOUT: %assoc0.loc5_9.2: @Generic.%Generic.assoc_type (%Generic.assoc_type.414) = assoc_entity element0, %Generic.F.decl [symbolic = %assoc0.loc5_9.2 (constants.%assoc0.312)]
486486
// CHECK:STDOUT:
487487
// CHECK:STDOUT: interface {
488-
// CHECK:STDOUT: %Self.1: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.2 (constants.%Self.fc1)]
488+
// CHECK:STDOUT: %Self.loc4_34.1: @Generic.%Generic.type (%Generic.type.68bb8d.1) = symbolic_binding Self, 1 [symbolic = %Self.loc4_34.2 (constants.%Self.fc1)]
489489
// CHECK:STDOUT: %Generic.F.decl: @Generic.%Generic.F.type (%Generic.F.type.fc1) = fn_decl @Generic.F [symbolic = @Generic.%Generic.F (constants.%Generic.F.d95)] {} {}
490490
// CHECK:STDOUT: %assoc0.loc5_9.1: @Generic.%Generic.assoc_type (%Generic.assoc_type.414) = assoc_entity element0, %Generic.F.decl [symbolic = %assoc0.loc5_9.2 (constants.%assoc0.312)]
491491
// CHECK:STDOUT:
492492
// CHECK:STDOUT: !members:
493-
// CHECK:STDOUT: .Self = %Self.1
493+
// CHECK:STDOUT: .Self = %Self.loc4_34.1
494494
// CHECK:STDOUT: .F = %assoc0.loc5_9.1
495495
// CHECK:STDOUT: witness = (%Generic.F.decl)
496496
// CHECK:STDOUT: }
@@ -520,7 +520,7 @@ fn G() {
520520
// CHECK:STDOUT: .Self = constants.%ImplsGeneric
521521
// CHECK:STDOUT: }
522522
// CHECK:STDOUT:
523-
// CHECK:STDOUT: generic fn @Generic.F(@Generic.%Scalar.loc4_19.2: type, @Generic.%Self.1: @Generic.%Generic.type (%Generic.type.68bb8d.1)) {
523+
// CHECK:STDOUT: generic fn @Generic.F(@Generic.%Scalar.loc4_19.2: type, @Generic.%Self.loc4_34.1: @Generic.%Generic.type (%Generic.type.68bb8d.1)) {
524524
// CHECK:STDOUT: fn();
525525
// CHECK:STDOUT: }
526526
// CHECK:STDOUT:
@@ -579,7 +579,7 @@ fn G() {
579579
// CHECK:STDOUT:
580580
// CHECK:STDOUT: !definition:
581581
// CHECK:STDOUT: %Generic.type => constants.%Generic.type.621
582-
// CHECK:STDOUT: %Self.2 => constants.%Self.ae2
582+
// CHECK:STDOUT: %Self.loc4_34.2 => constants.%Self.ae2
583583
// CHECK:STDOUT: %Generic.F.type => constants.%Generic.F.type.4cf
584584
// CHECK:STDOUT: %Generic.F => constants.%Generic.F.118
585585
// CHECK:STDOUT: %Generic.assoc_type => constants.%Generic.assoc_type.713

0 commit comments

Comments
 (0)