Skip to content

Commit 16999a7

Browse files
bricknerbbricknerb
authored
Fix a crash caused by a bug introduced in C++ overloads support in GetScopeIdOffset() (carbon-language#6151)
After this change, we correctly increment the offset by the next switch case type. Before this change, we accidentally incremented the offset by `functions()` size instead of `cpp_overload_sets()` size and vice versa. Also sorted the switch cases according to the order of the enum, for consistency. This might help prevent a future similar incident. This fix prevents crashing in the newly introduced test `multiple_too_few_args_calls`. This also has the side effect of showing `null name` for `cpp_overload_set_type` and `cpp_overload_set_value`, instead of having an arbitrary name. Examples that demonstrate the old name is arbitrary can easily be seen in tests like `cpp_namespace.carbon` and `decayed_param.carbon`, but careful review would show that all old names are arbitrary, though often luckily almost make sense. We might want to have a proper name for these, but it's beyond the scope of this crash fixing change. See carbon-language#6156. Part of carbon-language#5915.
1 parent a16102b commit 16999a7

33 files changed

+673
-602
lines changed

‎toolchain/check/testdata/interop/cpp/builtins.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@ fn F() {
549549
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
550550
// CHECK:STDOUT: %u32: type = class_type @UInt, @UInt(%int_32) [concrete]
551551
// CHECK:STDOUT: %pattern_type.4a9: type = pattern_type %u32 [concrete]
552-
// CHECK:STDOUT: %.15a: type = cpp_overload_set_type @unsigned_int.foo [concrete]
553-
// CHECK:STDOUT: %.afb: %.15a = cpp_overload_set_value @unsigned_int.foo [concrete]
552+
// CHECK:STDOUT: %.15a: type = cpp_overload_set_type @<null name> [concrete]
553+
// CHECK:STDOUT: %.afb: %.15a = cpp_overload_set_value @<null name> [concrete]
554554
// CHECK:STDOUT: %ptr.d47: type = ptr_type %unsigned_int [concrete]
555555
// CHECK:STDOUT: %unsigned_int.foo.type: type = fn_type @unsigned_int.foo [concrete]
556556
// CHECK:STDOUT: %unsigned_int.foo: %unsigned_int.foo.type = struct_value () [concrete]
@@ -566,7 +566,7 @@ fn F() {
566566
// CHECK:STDOUT: import Cpp//...
567567
// CHECK:STDOUT: }
568568
// CHECK:STDOUT: %unsigned_int.decl: type = class_decl @unsigned_int [concrete = constants.%unsigned_int] {} {}
569-
// CHECK:STDOUT: %.afb: %.15a = cpp_overload_set_value @unsigned_int.foo [concrete = constants.%.afb]
569+
// CHECK:STDOUT: %.afb: %.15a = cpp_overload_set_value @<null name> [concrete = constants.%.afb]
570570
// CHECK:STDOUT: %unsigned_int.foo.decl: %unsigned_int.foo.type = fn_decl @unsigned_int.foo [concrete = constants.%unsigned_int.foo] {
571571
// CHECK:STDOUT: <elided>
572572
// CHECK:STDOUT: } {

‎toolchain/check/testdata/interop/cpp/class/access.carbon‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,14 +492,14 @@ fn F() {
492492
// CHECK:STDOUT: %S: type = class_type @S [concrete]
493493
// CHECK:STDOUT: %ptr.5c7: type = ptr_type %S [concrete]
494494
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
495-
// CHECK:STDOUT: %.177: type = cpp_overload_set_type @S.foo [concrete]
496-
// CHECK:STDOUT: %.dcb: %.177 = cpp_overload_set_value @S.foo [concrete]
495+
// CHECK:STDOUT: %.177: type = cpp_overload_set_type @<null name> [concrete]
496+
// CHECK:STDOUT: %.dcb: %.177 = cpp_overload_set_value @<null name> [concrete]
497497
// CHECK:STDOUT: %S.foo.type: type = fn_type @S.foo [concrete]
498498
// CHECK:STDOUT: %S.foo: %S.foo.type = struct_value () [concrete]
499499
// CHECK:STDOUT: }
500500
// CHECK:STDOUT:
501501
// CHECK:STDOUT: imports {
502-
// CHECK:STDOUT: %.dcb: %.177 = cpp_overload_set_value @S.foo [concrete = constants.%.dcb]
502+
// CHECK:STDOUT: %.dcb: %.177 = cpp_overload_set_value @<null name> [concrete = constants.%.dcb]
503503
// CHECK:STDOUT: %S.foo.decl: %S.foo.type = fn_decl @S.foo [concrete = constants.%S.foo] {
504504
// CHECK:STDOUT: <elided>
505505
// CHECK:STDOUT: } {
@@ -523,13 +523,13 @@ fn F() {
523523
// CHECK:STDOUT: constants {
524524
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
525525
// CHECK:STDOUT: %C: type = class_type @C [concrete]
526-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C__carbon_thunk [concrete]
527-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C__carbon_thunk [concrete]
526+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
527+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
528528
// CHECK:STDOUT: %ptr.d9e: type = ptr_type %C [concrete]
529529
// CHECK:STDOUT: %C__carbon_thunk.type: type = fn_type @C__carbon_thunk [concrete]
530530
// CHECK:STDOUT: %C__carbon_thunk: %C__carbon_thunk.type = struct_value () [concrete]
531-
// CHECK:STDOUT: %.cd1: type = cpp_overload_set_type @C.foo [concrete]
532-
// CHECK:STDOUT: %.e4a: %.cd1 = cpp_overload_set_value @C.foo [concrete]
531+
// CHECK:STDOUT: %.cd1: type = cpp_overload_set_type @<null name> [concrete]
532+
// CHECK:STDOUT: %.e4a: %.cd1 = cpp_overload_set_value @<null name> [concrete]
533533
// CHECK:STDOUT: %C.foo.type: type = fn_type @C.foo [concrete]
534534
// CHECK:STDOUT: %C.foo: %C.foo.type = struct_value () [concrete]
535535
// CHECK:STDOUT: %type_where: type = facet_type <type where .Self impls <CanDestroy>> [concrete]
@@ -544,13 +544,13 @@ fn F() {
544544
// CHECK:STDOUT: import Cpp//...
545545
// CHECK:STDOUT: }
546546
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
547-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C__carbon_thunk [concrete = constants.%.40b]
547+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
548548
// CHECK:STDOUT: %C__carbon_thunk.decl: %C__carbon_thunk.type = fn_decl @C__carbon_thunk [concrete = constants.%C__carbon_thunk] {
549549
// CHECK:STDOUT: <elided>
550550
// CHECK:STDOUT: } {
551551
// CHECK:STDOUT: <elided>
552552
// CHECK:STDOUT: }
553-
// CHECK:STDOUT: %.e4a: %.cd1 = cpp_overload_set_value @C.foo [concrete = constants.%.e4a]
553+
// CHECK:STDOUT: %.e4a: %.cd1 = cpp_overload_set_value @<null name> [concrete = constants.%.e4a]
554554
// CHECK:STDOUT: %C.foo.decl: %C.foo.type = fn_decl @C.foo [concrete = constants.%C.foo] {} {}
555555
// CHECK:STDOUT: }
556556
// CHECK:STDOUT:
@@ -583,8 +583,8 @@ fn F() {
583583
// CHECK:STDOUT: constants {
584584
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
585585
// CHECK:STDOUT: %DerivedPublic: type = class_type @DerivedPublic [concrete]
586-
// CHECK:STDOUT: %.5a6: type = cpp_overload_set_type @Base.foo [concrete]
587-
// CHECK:STDOUT: %.607: %.5a6 = cpp_overload_set_value @Base.foo [concrete]
586+
// CHECK:STDOUT: %.5a6: type = cpp_overload_set_type @<null name> [concrete]
587+
// CHECK:STDOUT: %.607: %.5a6 = cpp_overload_set_value @<null name> [concrete]
588588
// CHECK:STDOUT: %Base.foo.type: type = fn_type @Base.foo [concrete]
589589
// CHECK:STDOUT: %Base.foo: %Base.foo.type = struct_value () [concrete]
590590
// CHECK:STDOUT: }
@@ -595,7 +595,7 @@ fn F() {
595595
// CHECK:STDOUT: import Cpp//...
596596
// CHECK:STDOUT: }
597597
// CHECK:STDOUT: %DerivedPublic.decl: type = class_decl @DerivedPublic [concrete = constants.%DerivedPublic] {} {}
598-
// CHECK:STDOUT: %.607: %.5a6 = cpp_overload_set_value @Base.foo [concrete = constants.%.607]
598+
// CHECK:STDOUT: %.607: %.5a6 = cpp_overload_set_value @<null name> [concrete = constants.%.607]
599599
// CHECK:STDOUT: %Base.foo.decl: %Base.foo.type = fn_decl @Base.foo [concrete = constants.%Base.foo] {} {}
600600
// CHECK:STDOUT: }
601601
// CHECK:STDOUT:

‎toolchain/check/testdata/interop/cpp/class/base.carbon‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,15 +582,15 @@ class V {
582582
// CHECK:STDOUT: %Derived: type = class_type @Derived [concrete]
583583
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
584584
// CHECK:STDOUT: %Base: type = class_type @Base [concrete]
585-
// CHECK:STDOUT: %.5b0: type = cpp_overload_set_type @f__carbon_thunk [concrete]
586-
// CHECK:STDOUT: %.e54: %.5b0 = cpp_overload_set_value @f__carbon_thunk [concrete]
585+
// CHECK:STDOUT: %.5b0: type = cpp_overload_set_type @<null name> [concrete]
586+
// CHECK:STDOUT: %.e54: %.5b0 = cpp_overload_set_value @<null name> [concrete]
587587
// CHECK:STDOUT: %const: type = const_type %Base [concrete]
588588
// CHECK:STDOUT: %ptr.a97: type = ptr_type %const [concrete]
589589
// CHECK:STDOUT: %f__carbon_thunk.type: type = fn_type @f__carbon_thunk [concrete]
590590
// CHECK:STDOUT: %f__carbon_thunk: %f__carbon_thunk.type = struct_value () [concrete]
591591
// CHECK:STDOUT: %ptr.fb2: type = ptr_type %Base [concrete]
592-
// CHECK:STDOUT: %.7c6: type = cpp_overload_set_type @CallQualified [concrete]
593-
// CHECK:STDOUT: %.362: %.7c6 = cpp_overload_set_value @CallQualified [concrete]
592+
// CHECK:STDOUT: %.7c6: type = cpp_overload_set_type @<null name> [concrete]
593+
// CHECK:STDOUT: %.362: %.7c6 = cpp_overload_set_value @<null name> [concrete]
594594
// CHECK:STDOUT: %g__carbon_thunk.type: type = fn_type @g__carbon_thunk [concrete]
595595
// CHECK:STDOUT: %g__carbon_thunk: %g__carbon_thunk.type = struct_value () [concrete]
596596
// CHECK:STDOUT: }
@@ -603,13 +603,13 @@ class V {
603603
// CHECK:STDOUT: }
604604
// CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [concrete = constants.%Derived] {} {}
605605
// CHECK:STDOUT: %Base.decl: type = class_decl @Base [concrete = constants.%Base] {} {}
606-
// CHECK:STDOUT: %.e54: %.5b0 = cpp_overload_set_value @f__carbon_thunk [concrete = constants.%.e54]
606+
// CHECK:STDOUT: %.e54: %.5b0 = cpp_overload_set_value @<null name> [concrete = constants.%.e54]
607607
// CHECK:STDOUT: %f__carbon_thunk.decl: %f__carbon_thunk.type = fn_decl @f__carbon_thunk [concrete = constants.%f__carbon_thunk] {
608608
// CHECK:STDOUT: <elided>
609609
// CHECK:STDOUT: } {
610610
// CHECK:STDOUT: <elided>
611611
// CHECK:STDOUT: }
612-
// CHECK:STDOUT: %.362: %.7c6 = cpp_overload_set_value @CallQualified [concrete = constants.%.362]
612+
// CHECK:STDOUT: %.362: %.7c6 = cpp_overload_set_value @<null name> [concrete = constants.%.362]
613613
// CHECK:STDOUT: %g__carbon_thunk.decl: %g__carbon_thunk.type = fn_decl @g__carbon_thunk [concrete = constants.%g__carbon_thunk] {
614614
// CHECK:STDOUT: <elided>
615615
// CHECK:STDOUT: } {

‎toolchain/check/testdata/interop/cpp/class/class.carbon‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ fn MyF(bar: Cpp.Bar*);
337337
// CHECK:STDOUT: constants {
338338
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
339339
// CHECK:STDOUT: %Bar: type = class_type @Bar [concrete]
340-
// CHECK:STDOUT: %.c07: type = cpp_overload_set_type @Bar.foo [concrete]
341-
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @Bar.foo [concrete]
340+
// CHECK:STDOUT: %.c07: type = cpp_overload_set_type @<null name> [concrete]
341+
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @<null name> [concrete]
342342
// CHECK:STDOUT: %Bar.foo.type: type = fn_type @Bar.foo [concrete]
343343
// CHECK:STDOUT: %Bar.foo: %Bar.foo.type = struct_value () [concrete]
344344
// CHECK:STDOUT: }
@@ -349,7 +349,7 @@ fn MyF(bar: Cpp.Bar*);
349349
// CHECK:STDOUT: import Cpp//...
350350
// CHECK:STDOUT: }
351351
// CHECK:STDOUT: %Bar.decl: type = class_decl @Bar [concrete = constants.%Bar] {} {}
352-
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @Bar.foo [concrete = constants.%.617]
352+
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @<null name> [concrete = constants.%.617]
353353
// CHECK:STDOUT: %Bar.foo.decl: %Bar.foo.type = fn_decl @Bar.foo [concrete = constants.%Bar.foo] {} {}
354354
// CHECK:STDOUT: }
355355
// CHECK:STDOUT:
@@ -496,8 +496,8 @@ fn MyF(bar: Cpp.Bar*);
496496
// CHECK:STDOUT: %complete_type.fff: <witness> = complete_type_witness %struct_type.base.36d [concrete]
497497
// CHECK:STDOUT: %MyF.type: type = fn_type @MyF [concrete]
498498
// CHECK:STDOUT: %MyF: %MyF.type = struct_value () [concrete]
499-
// CHECK:STDOUT: %.c07: type = cpp_overload_set_type @Bar.foo [concrete]
500-
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @Bar.foo [concrete]
499+
// CHECK:STDOUT: %.c07: type = cpp_overload_set_type @<null name> [concrete]
500+
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @<null name> [concrete]
501501
// CHECK:STDOUT: %Bar.foo.type: type = fn_type @Bar.foo [concrete]
502502
// CHECK:STDOUT: %Bar.foo: %Bar.foo.type = struct_value () [concrete]
503503
// CHECK:STDOUT: }
@@ -508,7 +508,7 @@ fn MyF(bar: Cpp.Bar*);
508508
// CHECK:STDOUT: import Cpp//...
509509
// CHECK:STDOUT: }
510510
// CHECK:STDOUT: %Bar.decl: type = class_decl @Bar [concrete = constants.%Bar] {} {}
511-
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @Bar.foo [concrete = constants.%.617]
511+
// CHECK:STDOUT: %.617: %.c07 = cpp_overload_set_value @<null name> [concrete = constants.%.617]
512512
// CHECK:STDOUT: %Bar.foo.decl: %Bar.foo.type = fn_decl @Bar.foo [concrete = constants.%Bar.foo] {} {}
513513
// CHECK:STDOUT: }
514514
// CHECK:STDOUT:

‎toolchain/check/testdata/interop/cpp/class/constructor.carbon‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ fn F() {
275275
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
276276
// CHECK:STDOUT: %C: type = class_type @C [concrete]
277277
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
278-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C [concrete]
279-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete]
278+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
279+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
280280
// CHECK:STDOUT: %ptr.d9e: type = ptr_type %C [concrete]
281281
// CHECK:STDOUT: %C__carbon_thunk.type: type = fn_type @C__carbon_thunk [concrete]
282282
// CHECK:STDOUT: %C__carbon_thunk: %C__carbon_thunk.type = struct_value () [concrete]
@@ -292,7 +292,7 @@ fn F() {
292292
// CHECK:STDOUT: import Cpp//...
293293
// CHECK:STDOUT: }
294294
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
295-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete = constants.%.40b]
295+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
296296
// CHECK:STDOUT: %C__carbon_thunk.decl: %C__carbon_thunk.type = fn_decl @C__carbon_thunk [concrete = constants.%C__carbon_thunk] {
297297
// CHECK:STDOUT: <elided>
298298
// CHECK:STDOUT: } {
@@ -335,8 +335,8 @@ fn F() {
335335
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
336336
// CHECK:STDOUT: %C: type = class_type @C [concrete]
337337
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
338-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C [concrete]
339-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete]
338+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
339+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
340340
// CHECK:STDOUT: %int_123.fff: Core.IntLiteral = int_value 123 [concrete]
341341
// CHECK:STDOUT: %int_456.010: Core.IntLiteral = int_value 456 [concrete]
342342
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
@@ -373,7 +373,7 @@ fn F() {
373373
// CHECK:STDOUT: import Cpp//...
374374
// CHECK:STDOUT: }
375375
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
376-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete = constants.%.40b]
376+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
377377
// CHECK:STDOUT: %C__carbon_thunk.decl: %C__carbon_thunk.type = fn_decl @C__carbon_thunk [concrete = constants.%C__carbon_thunk] {
378378
// CHECK:STDOUT: <elided>
379379
// CHECK:STDOUT: } {
@@ -434,8 +434,8 @@ fn F() {
434434
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
435435
// CHECK:STDOUT: %C: type = class_type @C [concrete]
436436
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
437-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C.1 [concrete]
438-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete]
437+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
438+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
439439
// CHECK:STDOUT: %ptr.d9e: type = ptr_type %C [concrete]
440440
// CHECK:STDOUT: %C__carbon_thunk.type.65f120.1: type = fn_type @C__carbon_thunk.1 [concrete]
441441
// CHECK:STDOUT: %C__carbon_thunk.d98342.1: %C__carbon_thunk.type.65f120.1 = struct_value () [concrete]
@@ -474,7 +474,7 @@ fn F() {
474474
// CHECK:STDOUT: import Cpp//...
475475
// CHECK:STDOUT: }
476476
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
477-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete = constants.%.40b]
477+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
478478
// CHECK:STDOUT: %C__carbon_thunk.decl.8acdfe.1: %C__carbon_thunk.type.65f120.1 = fn_decl @C__carbon_thunk.1 [concrete = constants.%C__carbon_thunk.d98342.1] {
479479
// CHECK:STDOUT: <elided>
480480
// CHECK:STDOUT: } {
@@ -564,8 +564,8 @@ fn F() {
564564
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
565565
// CHECK:STDOUT: %C: type = class_type @C [concrete]
566566
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
567-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C.1 [concrete]
568-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete]
567+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
568+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
569569
// CHECK:STDOUT: %int_8.b85: Core.IntLiteral = int_value 8 [concrete]
570570
// CHECK:STDOUT: %int_9.988: Core.IntLiteral = int_value 9 [concrete]
571571
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
@@ -604,7 +604,7 @@ fn F() {
604604
// CHECK:STDOUT: import Cpp//...
605605
// CHECK:STDOUT: }
606606
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
607-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete = constants.%.40b]
607+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
608608
// CHECK:STDOUT: %C__carbon_thunk.decl.8acdfe.1: %C__carbon_thunk.type.65f120.1 = fn_decl @C__carbon_thunk.1 [concrete = constants.%C__carbon_thunk.d98342.1] {
609609
// CHECK:STDOUT: <elided>
610610
// CHECK:STDOUT: } {
@@ -702,8 +702,8 @@ fn F() {
702702
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
703703
// CHECK:STDOUT: %C: type = class_type @C [concrete]
704704
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
705-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C.1 [concrete]
706-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete]
705+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
706+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
707707
// CHECK:STDOUT: %int_123.fff: Core.IntLiteral = int_value 123 [concrete]
708708
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
709709
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete]
@@ -753,7 +753,7 @@ fn F() {
753753
// CHECK:STDOUT: import Cpp//...
754754
// CHECK:STDOUT: }
755755
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
756-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete = constants.%.40b]
756+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
757757
// CHECK:STDOUT: %C__carbon_thunk.decl.8acdfe.1: %C__carbon_thunk.type.65f120.1 = fn_decl @C__carbon_thunk.1 [concrete = constants.%C__carbon_thunk.d98342.1] {
758758
// CHECK:STDOUT: <elided>
759759
// CHECK:STDOUT: } {
@@ -885,8 +885,8 @@ fn F() {
885885
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
886886
// CHECK:STDOUT: %C: type = class_type @C [concrete]
887887
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
888-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C [concrete]
889-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete]
888+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
889+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
890890
// CHECK:STDOUT: %int_8.b85: Core.IntLiteral = int_value 8 [concrete]
891891
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
892892
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete]
@@ -931,7 +931,7 @@ fn F() {
931931
// CHECK:STDOUT: import Cpp//...
932932
// CHECK:STDOUT: }
933933
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
934-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C [concrete = constants.%.40b]
934+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
935935
// CHECK:STDOUT: %C__carbon_thunk.decl: %C__carbon_thunk.type = fn_decl @C__carbon_thunk [concrete = constants.%C__carbon_thunk] {
936936
// CHECK:STDOUT: <elided>
937937
// CHECK:STDOUT: } {
@@ -1005,8 +1005,8 @@ fn F() {
10051005
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
10061006
// CHECK:STDOUT: %C: type = class_type @C [concrete]
10071007
// CHECK:STDOUT: %pattern_type.217: type = pattern_type %C [concrete]
1008-
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @C.C.1 [concrete]
1009-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete]
1008+
// CHECK:STDOUT: %.d40: type = cpp_overload_set_type @<null name> [concrete]
1009+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete]
10101010
// CHECK:STDOUT: %int_8.b85: Core.IntLiteral = int_value 8 [concrete]
10111011
// CHECK:STDOUT: %int_9.988: Core.IntLiteral = int_value 9 [concrete]
10121012
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
@@ -1057,7 +1057,7 @@ fn F() {
10571057
// CHECK:STDOUT: import Cpp//...
10581058
// CHECK:STDOUT: }
10591059
// CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {}
1060-
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @C.C.1 [concrete = constants.%.40b]
1060+
// CHECK:STDOUT: %.40b: %.d40 = cpp_overload_set_value @<null name> [concrete = constants.%.40b]
10611061
// CHECK:STDOUT: %C__carbon_thunk.decl.8acdfe.1: %C__carbon_thunk.type.65f120.1 = fn_decl @C__carbon_thunk.1 [concrete = constants.%C__carbon_thunk.d98342.1] {
10621062
// CHECK:STDOUT: <elided>
10631063
// CHECK:STDOUT: } {

0 commit comments

Comments
 (0)