From 986a2a064c875a90238dbe52d6857ac23833c57f Mon Sep 17 00:00:00 2001 From: Boaz Brickner Date: Fri, 14 Feb 2025 11:18:51 -0800 Subject: [PATCH] Add poisoned names to the format (#4961) Part of #4622. --- .../alias/no_prelude/export_name.carbon | 1 + .../no_prelude/fail_local_in_namespace.carbon | 4 ++- .../alias/no_prelude/import_access.carbon | 2 ++ .../alias/no_prelude/in_namespace.carbon | 1 + .../testdata/as/adapter_conversion.carbon | 10 +++++++ toolchain/check/testdata/as/overloaded.carbon | 2 ++ .../basics/no_prelude/fail_name_lookup.carbon | 1 + ...t_class_type_to_generic_facet_value.carbon | 1 + ...rt_class_value_to_facet_value_value.carbon | 1 + ..._value_to_generic_facet_value_value.carbon | 1 + .../convert_facet_value_to_itself.carbon | 1 + ...convert_facet_value_value_to_itself.carbon | 1 + ...t_class_type_to_generic_facet_value.carbon | 1 + ...t_value_shouldnt_know_concrete_type.carbon | 2 ++ ...convert_facet_value_to_missing_impl.carbon | 1 + ...l_convert_type_erased_type_to_facet.carbon | 2 ++ ...uction_uses_runtime_type_conversion.carbon | 2 ++ ..._convert_facet_value_to_facet_value.carbon | 1 + ..._facet_value_to_narrowed_facet_type.carbon | 2 ++ ...t_facet_value_value_to_blanket_impl.carbon | 1 + ..._value_to_generic_facet_value_value.carbon | 1 + .../check/testdata/class/adapter/adapt.carbon | 3 ++ .../testdata/class/adapter/adapt_copy.carbon | 2 ++ .../class/adapter/extend_adapt.carbon | 11 ++++++++ .../class/adapter/fail_adapt_bad_decl.carbon | 2 ++ .../class/adapter/fail_adapt_bad_type.carbon | 1 + .../class/adapter/fail_adapt_modifiers.carbon | 5 ++++ .../class/adapter/fail_adapt_with_base.carbon | 1 + .../adapter/fail_adapt_with_subobjects.carbon | 2 ++ .../testdata/class/adapter/init_adapt.carbon | 2 ++ toolchain/check/testdata/class/base.carbon | 2 ++ .../check/testdata/class/base_field.carbon | 2 ++ .../class/base_function_unqualified.carbon | 2 ++ .../check/testdata/class/base_method.carbon | 2 ++ .../class/base_method_qualified.carbon | 2 ++ .../testdata/class/base_method_shadow.carbon | 4 +++ .../class/complete_in_member_fn.carbon | 1 + .../testdata/class/compound_field.carbon | 1 + .../testdata/class/derived_to_base.carbon | 2 ++ .../check/testdata/class/fail_abstract.carbon | 5 ++++ .../testdata/class/fail_addr_not_self.carbon | 1 + .../testdata/class/fail_addr_self.carbon | 1 + .../testdata/class/fail_base_bad_type.carbon | 14 ++++++++++ .../class/fail_base_method_define.carbon | 1 + .../testdata/class/fail_base_misplaced.carbon | 1 + .../testdata/class/fail_base_modifiers.carbon | 4 +++ .../testdata/class/fail_base_no_extend.carbon | 1 + .../testdata/class/fail_base_repeated.carbon | 5 ++++ .../testdata/class/fail_base_unbound.carbon | 1 + .../class/fail_convert_to_invalid.carbon | 2 ++ .../class/fail_derived_to_base.carbon | 1 + .../testdata/class/fail_extend_cycle.carbon | 5 ++++ .../testdata/class/fail_generic_method.carbon | 2 ++ .../testdata/class/fail_incomplete.carbon | 2 ++ .../class/fail_memaccess_category.carbon | 2 ++ .../check/testdata/class/fail_method.carbon | 1 + .../check/testdata/class/fail_scope.carbon | 1 + .../check/testdata/class/fail_self.carbon | 1 + .../testdata/class/fail_unknown_member.carbon | 1 + .../check/testdata/class/generic/adapt.carbon | 9 ++++++ .../class/generic/base_is_generic.carbon | 12 ++++++++ .../check/testdata/class/generic/basic.carbon | 1 + .../check/testdata/class/generic/call.carbon | 6 ++++ .../generic/complete_in_conversion.carbon | 5 ++++ .../check/testdata/class/generic/field.carbon | 1 + .../testdata/class/generic/import.carbon | 3 ++ .../check/testdata/class/generic/init.carbon | 2 ++ .../class/generic/member_access.carbon | 3 ++ .../class/generic/member_inline.carbon | 1 + .../class/generic/member_lookup.carbon | 9 ++++++ .../class/generic/member_out_of_line.carbon | 3 ++ .../class/generic/method_deduce.carbon | 1 + .../check/testdata/class/generic/self.carbon | 2 ++ .../testdata/class/generic_method.carbon | 1 + .../check/testdata/class/import_base.carbon | 3 ++ .../testdata/class/import_member_cycle.carbon | 1 + .../testdata/class/import_struct_cyle.carbon | 1 + .../testdata/class/inheritance_access.carbon | 20 +++++++++++++ toolchain/check/testdata/class/init.carbon | 1 + .../check/testdata/class/init_nested.carbon | 1 + toolchain/check/testdata/class/nested.carbon | 3 ++ .../class/no_prelude/comp_time_field.carbon | 1 + .../class/no_prelude/import_access.carbon | 6 ++++ .../class/no_prelude/syntactic_merge.carbon | 1 + toolchain/check/testdata/class/reorder.carbon | 1 + .../testdata/class/reorder_qualified.carbon | 16 +++++++++++ .../testdata/class/self_conversion.carbon | 2 ++ .../testdata/class/virtual_modifiers.carbon | 20 +++++++++++++ .../builtin/no_prelude/adapted_type.carbon | 4 +++ .../no_prelude/call_from_operator.carbon | 3 ++ .../no_prelude/name_poisoning.carbon | 27 +++++++++++++++++- .../function/definition/import_access.carbon | 6 ++++ .../function/generic/return_slot.carbon | 1 + .../testdata/generic/complete_type.carbon | 1 + toolchain/check/testdata/generic/local.carbon | 1 + toolchain/check/testdata/if/fail_scope.carbon | 1 + .../testdata/impl/assoc_const_self.carbon | 2 ++ .../check/testdata/impl/extend_impl.carbon | 2 ++ .../testdata/impl/extend_impl_generic.carbon | 11 ++++++++ .../testdata/impl/fail_call_invalid.carbon | 2 ++ .../impl/fail_extend_impl_forall.carbon | 3 ++ .../impl/fail_extend_impl_type_as.carbon | 4 +++ ..._extend_partially_defined_interface.carbon | 2 ++ .../fail_extend_undefined_interface.carbon | 2 ++ .../impl/fail_impl_bad_assoc_fn.carbon | 24 ++++++++++++++++ .../impl/fail_self_type_mismatch.carbon | 2 ++ .../impl/fail_todo_use_assoc_const.carbon | 2 ++ toolchain/check/testdata/impl/impl_as.carbon | 3 ++ .../check/testdata/impl/lookup/alias.carbon | 1 + .../lookup/fail_alias_impl_not_found.carbon | 1 + .../lookup/fail_todo_undefined_impl.carbon | 2 ++ .../check/testdata/impl/lookup/generic.carbon | 1 + .../impl/lookup/instance_method.carbon | 2 ++ .../impl/lookup/no_prelude/impl_forall.carbon | 3 ++ .../testdata/impl/multiple_extend.carbon | 28 +++++++++++++++++++ .../impl/no_prelude/impl_assoc_const.carbon | 8 ++++++ .../no_prelude/import_builtin_call.carbon | 4 +++ .../impl/no_prelude/import_extend_impl.carbon | 2 ++ .../import_interface_assoc_const.carbon | 8 ++++++ .../impl/no_prelude/interface_args.carbon | 2 ++ .../impl/no_prelude/self_in_class.carbon | 2 ++ .../impl/no_prelude/self_in_signature.carbon | 2 ++ .../check/testdata/impl/redeclaration.carbon | 1 + .../testdata/index/fail_name_not_found.carbon | 1 + .../testdata/interface/member_lookup.carbon | 3 ++ .../interface/no_prelude/default_fn.carbon | 3 ++ .../fail_assoc_const_not_constant.carbon | 1 + .../no_prelude/fail_incomplete_type.carbon | 1 + .../no_prelude/fail_lookup_undefined.carbon | 2 ++ .../interface/no_prelude/generic.carbon | 6 ++++ .../interface/no_prelude/import_access.carbon | 7 +++++ .../let/no_prelude/import_access.carbon | 2 ++ .../check/testdata/namespace/nested.carbon | 2 ++ .../check/testdata/namespace/shadow.carbon | 1 + .../namespace/unqualified_lookup.carbon | 3 ++ .../builtin/fail_assignment_to_error.carbon | 2 ++ .../testdata/operators/overloaded/add.carbon | 2 ++ .../operators/overloaded/bit_and.carbon | 2 ++ .../overloaded/bit_complement.carbon | 1 + .../operators/overloaded/bit_or.carbon | 2 ++ .../operators/overloaded/bit_xor.carbon | 2 ++ .../testdata/operators/overloaded/dec.carbon | 1 + .../testdata/operators/overloaded/div.carbon | 2 ++ .../testdata/operators/overloaded/eq.carbon | 2 ++ .../overloaded/fail_assign_non_ref.carbon | 2 ++ .../overloaded/fail_error_recovery.carbon | 1 + .../overloaded/fail_no_impl_for_arg.carbon | 2 ++ .../operators/overloaded/implicit_as.carbon | 2 ++ .../testdata/operators/overloaded/inc.carbon | 1 + .../operators/overloaded/index.carbon | 4 +++ .../operators/overloaded/left_shift.carbon | 2 ++ .../testdata/operators/overloaded/mod.carbon | 2 ++ .../testdata/operators/overloaded/mul.carbon | 2 ++ .../operators/overloaded/negate.carbon | 1 + .../overloaded/no_prelude/index.carbon | 1 + .../operators/overloaded/ordered.carbon | 1 + .../operators/overloaded/right_shift.carbon | 2 ++ .../testdata/operators/overloaded/sub.carbon | 2 ++ .../package_expr/fail_not_found.carbon | 1 + .../packages/fail_import_type_error.carbon | 1 + .../fail_name_with_import_failure.carbon | 1 + .../no_prelude/cross_package_import.carbon | 1 + .../packages/no_prelude/export_import.carbon | 1 + .../packages/no_prelude/export_mixed.carbon | 1 + .../packages/no_prelude/export_name.carbon | 2 ++ .../no_prelude/missing_prelude.carbon | 1 + .../check/testdata/packages/raw_core.carbon | 2 ++ toolchain/check/testdata/pointer/arrow.carbon | 1 + .../pointer/fail_address_of_error.carbon | 1 + .../testdata/pointer/fail_deref_error.carbon | 1 + .../testdata/return/fail_error_in_type.carbon | 1 + .../no_prelude/import_convert_function.carbon | 17 +++++++++++ .../struct/fail_access_into_invalid.carbon | 1 + .../tuple/access/fail_access_error.carbon | 1 + .../fail_lookup_outside_scope.carbon | 1 + .../var/no_prelude/import_access.carbon | 2 ++ .../testdata/where_expr/constraints.carbon | 2 ++ .../testdata/where_expr/designator.carbon | 1 + .../testdata/where_expr/fail_not_facet.carbon | 2 ++ toolchain/sem_ir/formatter.cpp | 10 +++---- 180 files changed, 562 insertions(+), 7 deletions(-) diff --git a/toolchain/check/testdata/alias/no_prelude/export_name.carbon b/toolchain/check/testdata/alias/no_prelude/export_name.carbon index 7a0566434bbf..e448b8472c89 100644 --- a/toolchain/check/testdata/alias/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/alias/no_prelude/export_name.carbon @@ -216,6 +216,7 @@ var d: D* = &c; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .C = // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon b/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon index b4160e6c7bc2..37e12a7279b9 100644 --- a/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon +++ b/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon @@ -40,7 +40,9 @@ fn F() -> {} { // CHECK:STDOUT: .NS = %NS // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } -// CHECK:STDOUT: %NS: = namespace [concrete] {} +// CHECK:STDOUT: %NS: = namespace [concrete] { +// CHECK:STDOUT: .a = +// CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] { // CHECK:STDOUT: %return.patt: %empty_struct_type = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %empty_struct_type = out_param_pattern %return.patt, runtime_param0 diff --git a/toolchain/check/testdata/alias/no_prelude/import_access.carbon b/toolchain/check/testdata/alias/no_prelude/import_access.carbon index 735bc7c0bff6..c7d575fd7976 100644 --- a/toolchain/check/testdata/alias/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/alias/no_prelude/import_access.carbon @@ -141,6 +141,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .C = imports.%Test.C +// CHECK:STDOUT: .A = // CHECK:STDOUT: .inst = %inst // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -168,6 +169,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .A = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon b/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon index 36045a26288c..ee4da2acc3b3 100644 --- a/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon +++ b/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon @@ -42,6 +42,7 @@ fn F() -> NS.a { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %NS: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .a = %a // CHECK:STDOUT: } // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [concrete = constants.%C] diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index ee26406f70ff..6973b6ab118b 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -278,6 +278,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: .x = %.loc5_8 // CHECK:STDOUT: .y = %.loc6_8 +// CHECK:STDOUT: .A = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: } // CHECK:STDOUT: @@ -289,6 +290,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Make() -> %return.param_patt: %A { @@ -506,6 +508,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { @@ -516,6 +519,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D { @@ -526,6 +530,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -621,6 +626,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -738,6 +744,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -836,6 +843,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .Noncopyable = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.param_patt: %A) { @@ -923,6 +931,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .Noncopyable = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.param_patt: %A) { @@ -1019,6 +1028,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/as/overloaded.carbon b/toolchain/check/testdata/as/overloaded.carbon index 8638762397ba..b19d12245c13 100644 --- a/toolchain/check/testdata/as/overloaded.carbon +++ b/toolchain/check/testdata/as/overloaded.carbon @@ -124,6 +124,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .X = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc15 // CHECK:STDOUT: } @@ -145,6 +146,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .X = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc19 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/no_prelude/fail_name_lookup.carbon b/toolchain/check/testdata/basics/no_prelude/fail_name_lookup.carbon index 33d6acf5286c..40ebe05cd804 100644 --- a/toolchain/check/testdata/basics/no_prelude/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/no_prelude/fail_name_lookup.carbon @@ -26,6 +26,7 @@ fn Main() { // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Main = %Main.decl +// CHECK:STDOUT: .x = // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_type_to_generic_facet_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_type_to_generic_facet_value.carbon index 8db4551b48e9..206b5f19cd88 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_type_to_generic_facet_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_type_to_generic_facet_value.carbon @@ -135,6 +135,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_facet_value_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_facet_value_value.carbon index acddb0d336d0..c200da42dca7 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_facet_value_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_facet_value_value.carbon @@ -98,6 +98,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_generic_facet_value_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_generic_facet_value_value.carbon index 04f162876d33..5c72520dae22 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_generic_facet_value_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_class_value_to_generic_facet_value_value.carbon @@ -106,6 +106,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_to_itself.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_to_itself.carbon index bc75f0b5207a..645c8fc09d21 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_to_itself.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_to_itself.carbon @@ -100,6 +100,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_value_to_itself.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_value_to_itself.carbon index 58d701a09cec..e3efe0ff6956 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_value_to_itself.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/convert_facet_value_value_to_itself.carbon @@ -100,6 +100,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_class_type_to_generic_facet_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_class_type_to_generic_facet_value.carbon index bbcef45c771b..11259c547847 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_class_type_to_generic_facet_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_class_type_to_generic_facet_value.carbon @@ -113,6 +113,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_shouldnt_know_concrete_type.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_shouldnt_know_concrete_type.carbon index 61528b111543..839d0e6e61fe 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_shouldnt_know_concrete_type.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_shouldnt_know_concrete_type.carbon @@ -138,6 +138,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -179,6 +180,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc9_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_to_missing_impl.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_to_missing_impl.carbon index c2665c3927bc..da28940be572 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_to_missing_impl.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_facet_value_to_missing_impl.carbon @@ -111,6 +111,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_type_erased_type_to_facet.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_type_erased_type_to_facet.carbon index e2216ef97649..5a8be392b196 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_type_erased_type_to_facet.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_convert_type_erased_type_to_facet.carbon @@ -130,6 +130,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -171,6 +172,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc9_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_deduction_uses_runtime_type_conversion.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_deduction_uses_runtime_type_conversion.carbon index 37e8c58e7980..1240766c83e8 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_deduction_uses_runtime_type_conversion.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_deduction_uses_runtime_type_conversion.carbon @@ -114,6 +114,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, ))) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .Dest = // CHECK:STDOUT: .Convert = %assoc0.loc5_35.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -326,6 +327,7 @@ fn G(holds_to: HoldsType((RuntimeConvertTo, ))) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .RuntimeConvertTo = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_facet_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_facet_value.carbon index 98b825e57bb7..39095382cd00 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_facet_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_facet_value.carbon @@ -120,6 +120,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_narrowed_facet_type.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_narrowed_facet_type.carbon index df7ff9437f8a..86a17654876f 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_narrowed_facet_type.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_to_narrowed_facet_type.carbon @@ -98,6 +98,7 @@ fn HandleAnimal[T:! Animal & Eats](a: T) { Feed(a); } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -148,6 +149,7 @@ fn HandleAnimal[T:! Animal & Eats](a: T) { Feed(a); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { +// CHECK:STDOUT: .BitAnd = // CHECK:STDOUT: import Core//default // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_blanket_impl.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_blanket_impl.carbon index 7ea18d62383f..1452dd8451f7 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_blanket_impl.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_blanket_impl.carbon @@ -113,6 +113,7 @@ fn HandleAnimal[T:! Animal](a: T) { Feed(a); } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_generic_facet_value_value.carbon b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_generic_facet_value_value.carbon index 9610f5c34edc..d1d40559bd1e 100644 --- a/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_generic_facet_value_value.carbon +++ b/toolchain/check/testdata/builtin_conversions/no_prelude/fail_todo_convert_facet_value_value_to_generic_facet_value_value.carbon @@ -121,6 +121,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc5_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/adapt.carbon b/toolchain/check/testdata/class/adapter/adapt.carbon index f68c1331d6d6..dd7a2d18ebd5 100644 --- a/toolchain/check/testdata/class/adapter/adapt.carbon +++ b/toolchain/check/testdata/class/adapter/adapt.carbon @@ -126,6 +126,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SomeClassAdapter +// CHECK:STDOUT: .SomeClass = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @StructAdapter { @@ -200,6 +201,8 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptNotExtend +// CHECK:STDOUT: .Adapted = +// CHECK:STDOUT: .F = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F.1(); diff --git a/toolchain/check/testdata/class/adapter/adapt_copy.carbon b/toolchain/check/testdata/class/adapter/adapt_copy.carbon index f7e4261114b5..f991f8297435 100644 --- a/toolchain/check/testdata/class/adapter/adapt_copy.carbon +++ b/toolchain/check/testdata/class/adapter/adapt_copy.carbon @@ -505,6 +505,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptNoncopyable +// CHECK:STDOUT: .Noncopyable = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%a.param_patt: %AdaptNoncopyable) -> %return.param_patt: %AdaptNoncopyable { @@ -594,6 +595,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptNoncopyableIndirect +// CHECK:STDOUT: .Noncopyable = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @H(%a.param_patt: %AdaptNoncopyableIndirect) -> %return.param_patt: %AdaptNoncopyableIndirect { diff --git a/toolchain/check/testdata/class/adapter/extend_adapt.carbon b/toolchain/check/testdata/class/adapter/extend_adapt.carbon index 015103f4f629..d8a2354ca87b 100644 --- a/toolchain/check/testdata/class/adapter/extend_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/extend_adapt.carbon @@ -205,6 +205,9 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SomeClassAdapter +// CHECK:STDOUT: .SomeClass = +// CHECK:STDOUT: .StaticMemberFunction = +// CHECK:STDOUT: .AdapterMethod = // CHECK:STDOUT: extend %SomeClass.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -236,6 +239,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: .a = %.loc7_8 // CHECK:STDOUT: .b = %.loc8_8 // CHECK:STDOUT: .StaticMemberFunction = %StaticMemberFunction.decl +// CHECK:STDOUT: .SomeClassAdapter = // CHECK:STDOUT: .AdapterMethod = %AdapterMethod.decl // CHECK:STDOUT: } // CHECK:STDOUT: @@ -327,6 +331,8 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SomeClassAdapter +// CHECK:STDOUT: .SomeClass = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %SomeClass.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -419,6 +425,8 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SomeClassAdapter +// CHECK:STDOUT: .SomeClass = +// CHECK:STDOUT: .b = // CHECK:STDOUT: extend %SomeClass.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -487,6 +495,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%StructAdapter +// CHECK:STDOUT: .b = // CHECK:STDOUT: extend %struct_type.a.b // CHECK:STDOUT: } // CHECK:STDOUT: @@ -647,6 +656,8 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%IntAdapter +// CHECK:STDOUT: .MakeInt = +// CHECK:STDOUT: .foo = // CHECK:STDOUT: extend %.loc7_27.2 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon index 8799ca1fbdfe..aa7363cc6c98 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon @@ -147,6 +147,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Bad +// CHECK:STDOUT: .F = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Use(%b.param_patt: %Bad) { @@ -200,6 +201,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Bad +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_bad_type.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_bad_type.carbon index c797713c0a15..9f4a03c54b95 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_bad_type.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_bad_type.carbon @@ -60,5 +60,6 @@ class AdaptIncomplete { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptIncomplete +// CHECK:STDOUT: .Incomplete = // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_modifiers.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_modifiers.carbon index fcabd302d611..428c5c8bb4ea 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_modifiers.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_modifiers.carbon @@ -111,6 +111,7 @@ class C5 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C1 +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C2 { @@ -121,6 +122,7 @@ class C5 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C2 +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C3 { @@ -131,6 +133,7 @@ class C5 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C3 +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C4 { @@ -141,6 +144,7 @@ class C5 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C4 +// CHECK:STDOUT: .B = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -152,6 +156,7 @@ class C5 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C5 +// CHECK:STDOUT: .B = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_with_base.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_with_base.carbon index 89b0d6befa73..5352d64562d5 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_with_base.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_with_base.carbon @@ -66,6 +66,7 @@ base class AdaptWithVirtual { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptWithVirtual // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .Simple = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: virtual fn @F(); diff --git a/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon b/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon index ae401aade451..b18c45f57d6d 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon @@ -124,6 +124,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptWithBase +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc15 // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } @@ -257,6 +258,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptWithBaseAndFields +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc7 // CHECK:STDOUT: .n = %.loc8_8 // CHECK:STDOUT: extend %Base.ref diff --git a/toolchain/check/testdata/class/adapter/init_adapt.carbon b/toolchain/check/testdata/class/adapter/init_adapt.carbon index ee5840b85854..28d35cf8a7b1 100644 --- a/toolchain/check/testdata/class/adapter/init_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/init_adapt.carbon @@ -243,6 +243,7 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptC +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MakeC() -> %C; @@ -432,6 +433,7 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AdaptC +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MakeC() -> %C; diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 606fe570a08a..87ff6211577f 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -161,6 +161,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc8 // CHECK:STDOUT: .d = %.loc10_8 // CHECK:STDOUT: extend %Base.ref @@ -271,5 +272,6 @@ class Derived { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived // CHECK:STDOUT: .d = %.loc7_8 +// CHECK:STDOUT: .Base = // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 6aa5b19db875..4de0a3e299c7 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -127,9 +127,11 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc18 // CHECK:STDOUT: .d = %.loc20_8 // CHECK:STDOUT: .e = %.loc21_8 +// CHECK:STDOUT: .c = // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_function_unqualified.carbon b/toolchain/check/testdata/class/base_function_unqualified.carbon index 7ab2a4a1da5a..7960557cbfce 100644 --- a/toolchain/check/testdata/class/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/base_function_unqualified.carbon @@ -81,9 +81,11 @@ fn Derived.H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc16 // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .H = %H.decl +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index a2bc1321049d..871a4b3c8494 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -138,7 +138,9 @@ fn Call(p: Derived*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc22 +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_method_qualified.carbon b/toolchain/check/testdata/class/base_method_qualified.carbon index d30e21253ae5..7f7a65e9b3cb 100644 --- a/toolchain/check/testdata/class/base_method_qualified.carbon +++ b/toolchain/check/testdata/class/base_method_qualified.carbon @@ -179,6 +179,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc19 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl @@ -220,6 +221,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .Derived = // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index d186b346dd89..b5c9e93fd628 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -163,6 +163,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc16 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %A.ref @@ -188,6 +189,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc21 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %B.ref @@ -201,7 +203,9 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc26 +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/complete_in_member_fn.carbon b/toolchain/check/testdata/class/complete_in_member_fn.carbon index 3d0f42adf396..208179808fe3 100644 --- a/toolchain/check/testdata/class/complete_in_member_fn.carbon +++ b/toolchain/check/testdata/class/complete_in_member_fn.carbon @@ -69,6 +69,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .a = %.loc14_8 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/compound_field.carbon b/toolchain/check/testdata/class/compound_field.carbon index 290742bd2034..fc1e2571f7b2 100644 --- a/toolchain/check/testdata/class/compound_field.carbon +++ b/toolchain/check/testdata/class/compound_field.carbon @@ -194,6 +194,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc18 // CHECK:STDOUT: .d = %.loc20_8 // CHECK:STDOUT: .e = %.loc21_8 diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index 1cf59f3cfe7e..a4568913e90b 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -231,6 +231,7 @@ fn ConvertInit() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc16 // CHECK:STDOUT: .b = %.loc17_8 // CHECK:STDOUT: extend %A.ref @@ -249,6 +250,7 @@ fn ConvertInit() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc21 // CHECK:STDOUT: .c = %.loc22_8 // CHECK:STDOUT: extend %B.ref diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index bf877c746391..be52ba6e8462 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -235,6 +235,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Contains +// CHECK:STDOUT: .Abstract = // CHECK:STDOUT: .a = %.loc15_8 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -383,6 +384,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapter +// CHECK:STDOUT: .Abstract = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- define_and_call_abstract_param.carbon @@ -520,6 +522,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Abstract = // CHECK:STDOUT: .base = %.loc8 // CHECK:STDOUT: .d = %.loc10_8 // CHECK:STDOUT: extend %Abstract.ref @@ -605,6 +608,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Abstract = // CHECK:STDOUT: .base = %.loc8 // CHECK:STDOUT: .d = %.loc10_8 // CHECK:STDOUT: extend %Abstract.ref @@ -695,6 +699,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Abstract = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .d = %.loc11_8 // CHECK:STDOUT: extend %Abstract.ref diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index 6a9106df47b8..ed2f594c573e 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -81,6 +81,7 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index f26513e6c227..307817f47e40 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -110,6 +110,7 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index c377d643d642..272cd52e0b26 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -201,6 +201,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .DeriveFromError = %DeriveFromError.decl +// CHECK:STDOUT: .error = // CHECK:STDOUT: .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -232,7 +233,9 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromError +// CHECK:STDOUT: .error = // CHECK:STDOUT: .base = %.loc9 +// CHECK:STDOUT: .n = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -301,6 +304,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromNonType // CHECK:STDOUT: .base = %.loc12_18 +// CHECK:STDOUT: .n = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -393,6 +397,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromi32 // CHECK:STDOUT: .base = %.loc9 +// CHECK:STDOUT: .n = // CHECK:STDOUT: extend %i32 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -509,7 +514,9 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromTuple +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc11_23 +// CHECK:STDOUT: .n = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -614,6 +621,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromStruct // CHECK:STDOUT: .base = %.loc11 +// CHECK:STDOUT: .n = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -713,7 +721,9 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromIncomplete +// CHECK:STDOUT: .Incomplete = // CHECK:STDOUT: .base = %.loc18 +// CHECK:STDOUT: .n = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -840,6 +850,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Final // CHECK:STDOUT: .a = %.loc5_8 +// CHECK:STDOUT: .b = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @DeriveFromFinal { @@ -850,7 +861,10 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%DeriveFromFinal +// CHECK:STDOUT: .Final = // CHECK:STDOUT: .base = %.loc13 +// CHECK:STDOUT: .a = +// CHECK:STDOUT: .b = // CHECK:STDOUT: extend %Final.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_base_method_define.carbon b/toolchain/check/testdata/class/fail_base_method_define.carbon index ad82b54cb1ba..4835874a127b 100644 --- a/toolchain/check/testdata/class/fail_base_method_define.carbon +++ b/toolchain/check/testdata/class/fail_base_method_define.carbon @@ -103,6 +103,7 @@ fn D.C.F() {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc20 // CHECK:STDOUT: .F = file.%F.decl // CHECK:STDOUT: extend %B.ref diff --git a/toolchain/check/testdata/class/fail_base_misplaced.carbon b/toolchain/check/testdata/class/fail_base_misplaced.carbon index 08e3d3a8ad26..ac75cf2bd041 100644 --- a/toolchain/check/testdata/class/fail_base_misplaced.carbon +++ b/toolchain/check/testdata/class/fail_base_misplaced.carbon @@ -84,6 +84,7 @@ class C { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F.1() { diff --git a/toolchain/check/testdata/class/fail_base_modifiers.carbon b/toolchain/check/testdata/class/fail_base_modifiers.carbon index 0dcfe6561eae..059f78001c75 100644 --- a/toolchain/check/testdata/class/fail_base_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_base_modifiers.carbon @@ -110,6 +110,7 @@ class C4 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C1 +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc18 // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } @@ -122,6 +123,7 @@ class C4 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C2 +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc30 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -133,6 +135,7 @@ class C4 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C3 +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc41 // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } @@ -145,6 +148,7 @@ class C4 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C4 +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc52 // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_base_no_extend.carbon b/toolchain/check/testdata/class/fail_base_no_extend.carbon index ab66a035eb81..cd885f1578f1 100644 --- a/toolchain/check/testdata/class/fail_base_no_extend.carbon +++ b/toolchain/check/testdata/class/fail_base_no_extend.carbon @@ -64,6 +64,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc18 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index 77771d93e6b8..f3439553eba3 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -79,6 +79,8 @@ class D { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B1 +// CHECK:STDOUT: .B2 = +// CHECK:STDOUT: .B1 = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B2 { @@ -98,7 +100,9 @@ class D { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B1 = // CHECK:STDOUT: .base = %.loc15 +// CHECK:STDOUT: .B2 = // CHECK:STDOUT: extend %B1.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -111,6 +115,7 @@ class D { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .B1 = // CHECK:STDOUT: .base = %.loc28 // CHECK:STDOUT: extend %B1.ref.loc28 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index 81b22c978cff..d61a8c50f3ab 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -72,6 +72,7 @@ let b: B = C.base; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc14 // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon index 1a44c07f0207..d50c32dac603 100644 --- a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon +++ b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon @@ -41,6 +41,7 @@ fn Make() -> C { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: .NoSuchType = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -66,6 +67,7 @@ fn Make() -> C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .NoSuchType = // CHECK:STDOUT: .a = %.loc16_8 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 63818a12d696..190372a0d99c 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -169,6 +169,7 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B2 +// CHECK:STDOUT: .A2 = // CHECK:STDOUT: .base = %.loc20 // CHECK:STDOUT: .b = %.loc21_8 // CHECK:STDOUT: extend %A2.ref diff --git a/toolchain/check/testdata/class/fail_extend_cycle.carbon b/toolchain/check/testdata/class/fail_extend_cycle.carbon index f3e96eaada26..db0815c0d3e7 100644 --- a/toolchain/check/testdata/class/fail_extend_cycle.carbon +++ b/toolchain/check/testdata/class/fail_extend_cycle.carbon @@ -58,6 +58,7 @@ base class A { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .B = %B.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: type = class_decl @A [concrete = constants.%A] {} {} @@ -71,6 +72,7 @@ base class A { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { @@ -81,6 +83,7 @@ base class A { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc16 // CHECK:STDOUT: extend %A.ref // CHECK:STDOUT: } @@ -98,7 +101,9 @@ base class A { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%.a95 +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc27 +// CHECK:STDOUT: .C = // CHECK:STDOUT: .c = %.loc32_8 // CHECK:STDOUT: extend %A.ref // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_generic_method.carbon b/toolchain/check/testdata/class/fail_generic_method.carbon index b1c17dea73f4..76dbb80f285a 100644 --- a/toolchain/check/testdata/class/fail_generic_method.carbon +++ b/toolchain/check/testdata/class/fail_generic_method.carbon @@ -66,6 +66,7 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: .T = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [concrete = constants.%Class.generic] { @@ -136,6 +137,7 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .a = %.loc12_8 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index 8fb18a8f1d4c..34678aaa011d 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -381,6 +381,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%IncompleteAddrSelf +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: @@ -505,6 +506,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .C = // CHECK:STDOUT: .c = %.loc12_8 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index 622f33f9f939..78eafccd383f 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -110,6 +110,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .A = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: @@ -124,6 +125,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .a = %.loc16_8 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 2837052ff664..940a261b4787 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -107,6 +107,7 @@ fn F(c: Class) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .NoSelf = %NoSelf.decl +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .WithSelf = %WithSelf.decl // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index ccf7121d2275..9bb78681bb5a 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -61,6 +61,7 @@ fn G() -> i32 { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .G = %G.decl +// CHECK:STDOUT: .F = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [concrete = constants.%Class] {} {} diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index 66304c67e7a7..ad6246847961 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -158,6 +158,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%WrongSelf +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 09936f784b11..075cf9357a4d 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -78,6 +78,7 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .n = %.loc12_8 +// CHECK:STDOUT: .something = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%c.param_patt: %Class) -> %i32 { diff --git a/toolchain/check/testdata/class/generic/adapt.carbon b/toolchain/check/testdata/class/generic/adapt.carbon index 91ebd6e93240..5dca3de1d0eb 100644 --- a/toolchain/check/testdata/class/generic/adapt.carbon +++ b/toolchain/check/testdata/class/generic/adapt.carbon @@ -208,6 +208,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f2e +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -223,6 +224,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapter +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Access(%a.param_patt: %Adapter) -> %i32 { @@ -476,6 +478,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f2e +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -491,6 +494,8 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapter +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .x = // CHECK:STDOUT: extend %C // CHECK:STDOUT: } // CHECK:STDOUT: @@ -592,6 +597,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f2e +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc8_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -607,6 +613,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapter +// CHECK:STDOUT: .C = // CHECK:STDOUT: extend %C // CHECK:STDOUT: } // CHECK:STDOUT: @@ -700,6 +707,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = imports.%Main.import_ref.feb +// CHECK:STDOUT: .x = // CHECK:STDOUT: extend imports.%Main.import_ref.19d12e.2 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -830,6 +838,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapter.0e3 +// CHECK:STDOUT: .T = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/base_is_generic.carbon b/toolchain/check/testdata/class/generic/base_is_generic.carbon index d3c7d9034b0a..1b2b77daf843 100644 --- a/toolchain/check/testdata/class/generic/base_is_generic.carbon +++ b/toolchain/check/testdata/class/generic/base_is_generic.carbon @@ -179,6 +179,7 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base.370 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -207,7 +208,10 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = +// CHECK:STDOUT: .Param = // CHECK:STDOUT: .base = %.loc13 +// CHECK:STDOUT: .x = // CHECK:STDOUT: extend %Base // CHECK:STDOUT: } // CHECK:STDOUT: @@ -326,6 +330,7 @@ fn H() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = imports.%Main.import_ref.f6c // CHECK:STDOUT: .base = imports.%Main.import_ref.d24 +// CHECK:STDOUT: .x = // CHECK:STDOUT: extend imports.%Main.import_ref.77a301.2 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -449,7 +454,9 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f2e +// CHECK:STDOUT: .T = // CHECK:STDOUT: .base = %.loc9 +// CHECK:STDOUT: .G = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -588,6 +595,7 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X.75b6d8.1 +// CHECK:STDOUT: .U = // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -614,7 +622,10 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f2e +// CHECK:STDOUT: .X = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .base = %.loc9 +// CHECK:STDOUT: .G = // CHECK:STDOUT: extend %X.loc9_19.1 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -829,6 +840,7 @@ fn H() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 // CHECK:STDOUT: .base = imports.%Main.import_ref.65d +// CHECK:STDOUT: .G = // CHECK:STDOUT: extend imports.%Main.import_ref.561eb2.2 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/basic.carbon b/toolchain/check/testdata/class/generic/basic.carbon index d4f219bfa369..f0b801ab428e 100644 --- a/toolchain/check/testdata/class/generic/basic.carbon +++ b/toolchain/check/testdata/class/generic/basic.carbon @@ -139,6 +139,7 @@ class Declaration(T:! type); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .GetAddr = %GetAddr.decl // CHECK:STDOUT: .GetValue = %GetValue.decl // CHECK:STDOUT: .k = %.loc21_8 diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index b34f18ede90f..cbdebed1606a 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -588,6 +588,8 @@ class Outer(T:! type) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Outer.9d6 // CHECK:STDOUT: .Inner = %Inner.decl +// CHECK:STDOUT: .Outer = +// CHECK:STDOUT: .T = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -654,8 +656,12 @@ class Outer(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Inner.c71 +// CHECK:STDOUT: .Outer = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .A = %A.decl +// CHECK:STDOUT: .U = // CHECK:STDOUT: .B = %B.decl +// CHECK:STDOUT: .Inner = // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .D = %D.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon index ce709d2bfddd..f9b57ccc5f8d 100644 --- a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon +++ b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon @@ -157,6 +157,8 @@ fn F(a: A(0)*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .Int = +// CHECK:STDOUT: .N = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @A(%N.loc6_9.1: %i32) { @@ -188,7 +190,10 @@ fn F(a: A(0)*) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A.dd3 +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc7 +// CHECK:STDOUT: .Int = +// CHECK:STDOUT: .N = // CHECK:STDOUT: .n = %.loc12_8 // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/field.carbon b/toolchain/check/testdata/class/generic/field.carbon index 2bfa70fe1b95..455dc35d8a41 100644 --- a/toolchain/check/testdata/class/generic/field.carbon +++ b/toolchain/check/testdata/class/generic/field.carbon @@ -170,6 +170,7 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class.fe1b2d.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc12_8 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index 19a92168a3ac..8ac0d19bcb27 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -359,6 +359,7 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -805,6 +806,7 @@ class Class(U:! type) { // CHECK:STDOUT: .CompleteClass = imports.%Main.CompleteClass // CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core +// CHECK:STDOUT: .T = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -842,6 +844,7 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%.e41 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc17_8 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index 63b287e6558d..b5e0f4565d81 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -150,6 +150,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class.fe1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .k = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -352,6 +353,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Adapt.2e4 +// CHECK:STDOUT: .T = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/member_access.carbon b/toolchain/check/testdata/class/generic/member_access.carbon index e80a2c537545..1e1ca406d3f6 100644 --- a/toolchain/check/testdata/class/generic/member_access.carbon +++ b/toolchain/check/testdata/class/generic/member_access.carbon @@ -239,6 +239,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class.fe1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc3_8 // CHECK:STDOUT: .Get = %Get.decl // CHECK:STDOUT: .GetAddr = %GetAddr.decl @@ -482,6 +483,8 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .Class = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_inline.carbon b/toolchain/check/testdata/class/generic/member_inline.carbon index 194fbdcd065d..aa4af0c3e24f 100644 --- a/toolchain/check/testdata/class/generic/member_inline.carbon +++ b/toolchain/check/testdata/class/generic/member_inline.carbon @@ -135,6 +135,7 @@ class C(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .n = %.loc13_8 diff --git a/toolchain/check/testdata/class/generic/member_lookup.carbon b/toolchain/check/testdata/class/generic/member_lookup.carbon index f9d5e3e0bea4..c2b911d4a985 100644 --- a/toolchain/check/testdata/class/generic/member_lookup.carbon +++ b/toolchain/check/testdata/class/generic/member_lookup.carbon @@ -229,6 +229,7 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base.370 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .b = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -262,8 +263,11 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived.85c +// CHECK:STDOUT: .Base = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .d = %.loc10_8 +// CHECK:STDOUT: .b = // CHECK:STDOUT: extend %Base.loc9_22.1 // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -560,7 +564,9 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base.370 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .b = %.loc5_8 +// CHECK:STDOUT: .nonesuch = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -593,8 +599,11 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived.85c +// CHECK:STDOUT: .Base = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .d = %.loc10_8 +// CHECK:STDOUT: .nonesuch = // CHECK:STDOUT: extend %Base.loc9_22.1 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_out_of_line.carbon b/toolchain/check/testdata/class/generic/member_out_of_line.carbon index 95579c072737..089a313bc1a4 100644 --- a/toolchain/check/testdata/class/generic/member_out_of_line.carbon +++ b/toolchain/check/testdata/class/generic/member_out_of_line.carbon @@ -235,6 +235,7 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .n = %.loc7_8 @@ -388,6 +389,7 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .T = // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -423,6 +425,7 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/method_deduce.carbon b/toolchain/check/testdata/class/generic/method_deduce.carbon index cb3148816c5f..4f0ce766bdc1 100644 --- a/toolchain/check/testdata/class/generic/method_deduce.carbon +++ b/toolchain/check/testdata/class/generic/method_deduce.carbon @@ -200,6 +200,7 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class.fe1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Get = %Get.decl // CHECK:STDOUT: .GetNoDeduce = %GetNoDeduce.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/self.carbon b/toolchain/check/testdata/class/generic/self.carbon index 12cc49849f8c..d7724f980f79 100644 --- a/toolchain/check/testdata/class/generic/self.carbon +++ b/toolchain/check/testdata/class/generic/self.carbon @@ -102,6 +102,8 @@ class Class(T:! type) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .MakeSelf = %MakeSelf.decl +// CHECK:STDOUT: .Class = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .MakeClass = %MakeClass.decl // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic_method.carbon b/toolchain/check/testdata/class/generic_method.carbon index d6f089d726f5..6db872674ae7 100644 --- a/toolchain/check/testdata/class/generic_method.carbon +++ b/toolchain/check/testdata/class/generic_method.carbon @@ -112,6 +112,7 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class +// CHECK:STDOUT: .T = // CHECK:STDOUT: .a = %.loc12_8 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/import_base.carbon b/toolchain/check/testdata/class/import_base.carbon index 353e8cbf0e39..a6cc24e7a39b 100644 --- a/toolchain/check/testdata/class/import_base.carbon +++ b/toolchain/check/testdata/class/import_base.carbon @@ -120,6 +120,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Child +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc13 // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } @@ -208,6 +209,8 @@ fn Run() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = imports.%Main.import_ref.9a9 // CHECK:STDOUT: .base = imports.%Main.import_ref.7e5 +// CHECK:STDOUT: .x = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend imports.%Main.import_ref.a21640.2 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index 1c6997fb8081..890e296f1fd3 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -63,6 +63,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Cycle +// CHECK:STDOUT: .Cycle = // CHECK:STDOUT: .a = %.loc5_8 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/import_struct_cyle.carbon b/toolchain/check/testdata/class/import_struct_cyle.carbon index 30d338e9b36c..54da7e7c980f 100644 --- a/toolchain/check/testdata/class/import_struct_cyle.carbon +++ b/toolchain/check/testdata/class/import_struct_cyle.carbon @@ -82,6 +82,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Cycle +// CHECK:STDOUT: .Cycle = // CHECK:STDOUT: .c = %.loc10_8 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/inheritance_access.carbon b/toolchain/check/testdata/class/inheritance_access.carbon index c5b9efdd1b1f..62ac2382c6b9 100644 --- a/toolchain/check/testdata/class/inheritance_access.carbon +++ b/toolchain/check/testdata/class/inheritance_access.carbon @@ -311,8 +311,11 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Circle +// CHECK:STDOUT: .Shape = // CHECK:STDOUT: .base = %.loc10 // CHECK:STDOUT: .GetPosition = %GetPosition.decl +// CHECK:STDOUT: .x = +// CHECK:STDOUT: .y = // CHECK:STDOUT: extend %Shape.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -414,6 +417,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F [private] = %F.decl // CHECK:STDOUT: extend %A.ref @@ -441,8 +445,10 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc14 // CHECK:STDOUT: .G = %G.decl +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -545,6 +551,7 @@ class B { // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: .SOME_CONSTANT [protected] = %SOME_CONSTANT // CHECK:STDOUT: .SomeProtectedFunction [protected] = %SomeProtectedFunction.decl +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { @@ -573,6 +580,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc12 // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .H = %H.decl @@ -680,8 +688,10 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Square +// CHECK:STDOUT: .Shape = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .GetPosition = %GetPosition.decl +// CHECK:STDOUT: .y = // CHECK:STDOUT: extend %Shape.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -853,8 +863,10 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .G = %G.decl +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -924,8 +936,10 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .G = %G.decl +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1092,9 +1106,11 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .Internal = // CHECK:STDOUT: .internal [private] = %.loc14_23 // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .SomeFunc = %SomeFunc.decl +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %i32 { @@ -1164,6 +1180,7 @@ class B { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: .x [private] = %.loc5_16 +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { @@ -1182,6 +1199,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %A.ref @@ -1243,6 +1261,7 @@ class B { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A // CHECK:STDOUT: .x [protected] = %.loc5_18 +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { @@ -1261,6 +1280,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %A.ref diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index aebb942a7342..457636bf436b 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -123,6 +123,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .n = %.loc12_8 +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .next = %.loc13_11 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 416e8145b02c..cc1976138ffa 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -116,6 +116,7 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Outer +// CHECK:STDOUT: .Inner = // CHECK:STDOUT: .c = %.loc19_8 // CHECK:STDOUT: .d = %.loc20_8 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 03511f88f379..76a90a08b534 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -128,6 +128,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: .Self = constants.%Outer // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .Inner = %Inner.decl +// CHECK:STDOUT: .Outer = // CHECK:STDOUT: .H = %H.decl // CHECK:STDOUT: .po = %.loc36_9 // CHECK:STDOUT: .qo = %.loc37_9 @@ -157,7 +158,9 @@ fn F(a: Outer*) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Inner // CHECK:STDOUT: .pi = %.loc19_11 +// CHECK:STDOUT: .Outer = // CHECK:STDOUT: .po = %.loc20_11 +// CHECK:STDOUT: .Inner = // CHECK:STDOUT: .qi = %.loc21_11 // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/no_prelude/comp_time_field.carbon b/toolchain/check/testdata/class/no_prelude/comp_time_field.carbon index c48f44e2a2e2..7217e18d15d1 100644 --- a/toolchain/check/testdata/class/no_prelude/comp_time_field.carbon +++ b/toolchain/check/testdata/class/no_prelude/comp_time_field.carbon @@ -82,6 +82,7 @@ var x: Class = {}; // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .Class = // CHECK:STDOUT: .B = %B // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/no_prelude/import_access.carbon b/toolchain/check/testdata/class/no_prelude/import_access.carbon index 0b61683596af..0881d3b02f89 100644 --- a/toolchain/check/testdata/class/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/class/no_prelude/import_access.carbon @@ -253,6 +253,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .Def = // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -280,6 +281,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .Def = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -364,6 +366,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -391,6 +394,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: import Test//forward_with_def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -478,6 +482,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -508,6 +513,7 @@ private class Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: import Test//forward // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon index 1f3ad1b8b44c..d662fb02b167 100644 --- a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon @@ -1180,6 +1180,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%Base // CHECK:STDOUT: .a = %.loc5_8 // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .Base = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F[addr %self.param_patt: %ptr.11f](); diff --git a/toolchain/check/testdata/class/reorder.carbon b/toolchain/check/testdata/class/reorder.carbon index a8feb5f0b7fe..c3cf47d2f7b6 100644 --- a/toolchain/check/testdata/class/reorder.carbon +++ b/toolchain/check/testdata/class/reorder.carbon @@ -87,6 +87,7 @@ class Class { // CHECK:STDOUT: .Self = constants.%Class // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .Class = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %i32 { diff --git a/toolchain/check/testdata/class/reorder_qualified.carbon b/toolchain/check/testdata/class/reorder_qualified.carbon index c228aced9231..b18877408ae6 100644 --- a/toolchain/check/testdata/class/reorder_qualified.carbon +++ b/toolchain/check/testdata/class/reorder_qualified.carbon @@ -146,6 +146,7 @@ class A { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .AF = %AF.decl // CHECK:STDOUT: .a = %.loc46_8 +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { @@ -164,6 +165,9 @@ class A { // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .BF = %BF.decl // CHECK:STDOUT: .b = %.loc16_10 +// CHECK:STDOUT: .A = +// CHECK:STDOUT: .B = +// CHECK:STDOUT: .AF = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { @@ -183,6 +187,11 @@ class A { // CHECK:STDOUT: .D = %D.decl // CHECK:STDOUT: .CF = %CF.decl // CHECK:STDOUT: .c = %.loc42_10 +// CHECK:STDOUT: .A = +// CHECK:STDOUT: .B = +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .AF = +// CHECK:STDOUT: .BF = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D { @@ -201,6 +210,13 @@ class A { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .DF = %DF.decl // CHECK:STDOUT: .d = %.loc24_12 +// CHECK:STDOUT: .A = +// CHECK:STDOUT: .B = +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .D = +// CHECK:STDOUT: .AF = +// CHECK:STDOUT: .BF = +// CHECK:STDOUT: .CF = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @BF(); diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index 8f3e928d35f5..e43c5f3e86db 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -143,6 +143,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base // CHECK:STDOUT: .a = %.loc12_8 +// CHECK:STDOUT: .Base = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Derived { @@ -179,6 +180,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc16 // CHECK:STDOUT: .SelfBase = %SelfBase.decl // CHECK:STDOUT: .AddrSelfBase = %AddrSelfBase.decl diff --git a/toolchain/check/testdata/class/virtual_modifiers.carbon b/toolchain/check/testdata/class/virtual_modifiers.carbon index f8b24cf95a1d..dcbb624bb3ec 100644 --- a/toolchain/check/testdata/class/virtual_modifiers.carbon +++ b/toolchain/check/testdata/class/virtual_modifiers.carbon @@ -358,6 +358,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Modifiers = // CHECK:STDOUT: .base = %.loc7 // CHECK:STDOUT: .H = %H.decl // CHECK:STDOUT: extend %Base.ref @@ -431,6 +432,7 @@ class Derived { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .Modifiers = // CHECK:STDOUT: .base = %.loc8 // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } @@ -573,6 +575,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A2 +// CHECK:STDOUT: .A1 = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %A1.ref @@ -649,6 +652,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B2 +// CHECK:STDOUT: .B1 = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %B1.ref @@ -664,6 +668,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .B2 = // CHECK:STDOUT: .base = %.loc14 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %B2.ref @@ -935,6 +940,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc8 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %Base.ref @@ -1005,6 +1011,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AbstractIntermediate +// CHECK:STDOUT: .AbstractBase = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: extend %AbstractBase.ref // CHECK:STDOUT: } @@ -1019,6 +1026,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .AbstractIntermediate = // CHECK:STDOUT: .base = %.loc13 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %AbstractIntermediate.ref @@ -1091,6 +1099,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%VirtualIntermediate +// CHECK:STDOUT: .VirtualBase = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: extend %VirtualBase.ref // CHECK:STDOUT: } @@ -1105,6 +1114,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .VirtualIntermediate = // CHECK:STDOUT: .base = %.loc13 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %VirtualIntermediate.ref @@ -1185,6 +1195,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc9 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %Base.ref @@ -1272,6 +1283,7 @@ class Derived { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .T1 = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } @@ -1307,7 +1319,9 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base +// CHECK:STDOUT: .T1 = // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .T2 = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Derived { @@ -1327,7 +1341,9 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc21 +// CHECK:STDOUT: .T2 = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: } @@ -1432,7 +1448,9 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base.370 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .T1 = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1455,6 +1473,8 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived +// CHECK:STDOUT: .Base = +// CHECK:STDOUT: .T1 = // CHECK:STDOUT: .base = %.loc12 // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: extend %Base diff --git a/toolchain/check/testdata/function/builtin/no_prelude/adapted_type.carbon b/toolchain/check/testdata/function/builtin/no_prelude/adapted_type.carbon index d264af764130..0a5a07607f9c 100644 --- a/toolchain/check/testdata/function/builtin/no_prelude/adapted_type.carbon +++ b/toolchain/check/testdata/function/builtin/no_prelude/adapted_type.carbon @@ -154,6 +154,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%MyIntLiteral +// CHECK:STDOUT: .IntLiteral = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @MyInt32 { @@ -184,6 +185,9 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%MyInt32 +// CHECK:STDOUT: .Int = +// CHECK:STDOUT: .MyIntLiteral = +// CHECK:STDOUT: .MyInt32 = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/builtin/no_prelude/call_from_operator.carbon b/toolchain/check/testdata/function/builtin/no_prelude/call_from_operator.carbon index ab437d5c1ca4..733f727156a7 100644 --- a/toolchain/check/testdata/function/builtin/no_prelude/call_from_operator.carbon +++ b/toolchain/check/testdata/function/builtin/no_prelude/call_from_operator.carbon @@ -288,6 +288,7 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc12_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -329,6 +330,7 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc16_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -424,6 +426,7 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .IntLiteral = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc31 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon b/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon index ea5463812d7a..a0759c9f53a2 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon @@ -393,6 +393,7 @@ fn F() { // CHECK:STDOUT: .C = %C.decl.loc8 // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: .F2 = %F2.decl +// CHECK:STDOUT: .N = // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc8: type = class_decl @C.2 [concrete = constants.%C.9f4] {} {} // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -457,6 +458,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -497,6 +499,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc4: type = class_decl @C.1 [concrete = constants.%C.f79] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -546,6 +549,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %I.decl.loc4: type = interface_decl @I.1 [concrete = constants.%I.type.733] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .I = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -594,6 +598,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -669,6 +674,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .C1 = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: .C2 = %C2.decl // CHECK:STDOUT: } @@ -702,6 +708,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc4: type = class_decl @C.2 [concrete = constants.%C.f79] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -746,7 +753,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl +// CHECK:STDOUT: .N = // CHECK:STDOUT: .F2 = %F2.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { @@ -801,8 +810,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc4: type = class_decl @C.1 [concrete = constants.%C.f79] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: .F2 = %F2.decl +// CHECK:STDOUT: .N = // CHECK:STDOUT: } // CHECK:STDOUT: %F1.decl: %F1.type = fn_decl @F1 [concrete = constants.%F1] { // CHECK:STDOUT: %x.patt: %C.f79 = binding_pattern x @@ -882,12 +893,15 @@ fn F() { // CHECK:STDOUT: %C.decl.loc4: type = class_decl @C.1 [concrete = constants.%C.f79] {} {} // CHECK:STDOUT: %N1: = namespace [concrete] { // CHECK:STDOUT: .N2 = %N2 +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: %N2: = namespace [concrete] { // CHECK:STDOUT: .N3 = %N3 +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: %N3: = namespace [concrete] { // CHECK:STDOUT: .D1 = %D1.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: %D1.decl: type = class_decl @D1 [concrete = constants.%D1] {} {} // CHECK:STDOUT: %C.decl.loc59: type = class_decl @C.5 [concrete = constants.%C.0b8] {} {} @@ -903,6 +917,7 @@ fn F() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .D3 = %D3.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: @@ -931,6 +946,7 @@ fn F() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D1 // CHECK:STDOUT: .D2 = %D2.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @D3(@D2.%Self: %D2.type) { @@ -954,6 +970,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D3.68e +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -1034,7 +1051,9 @@ fn F() { // CHECK:STDOUT: .N = %N // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} -// CHECK:STDOUT: %N: = namespace [concrete] {} +// CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = +// CHECK:STDOUT: } // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: %C: type = bind_alias C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: } @@ -1136,6 +1155,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = interface_decl @C [concrete = constants.%C.type] {} {} // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F1 = %F1.decl // CHECK:STDOUT: .X = %X.decl // CHECK:STDOUT: } @@ -1174,6 +1194,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X +// CHECK:STDOUT: .C = // CHECK:STDOUT: extend @impl.%C.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1211,6 +1232,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X +// CHECK:STDOUT: .A = // CHECK:STDOUT: extend .inst27.loc8_18 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1236,8 +1258,10 @@ fn F() { // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .N = %N +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: %N: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] { @@ -1312,6 +1336,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B +// CHECK:STDOUT: .A = // CHECK:STDOUT: .v = %.loc11_10 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/import_access.carbon b/toolchain/check/testdata/function/definition/import_access.carbon index cd87a8556c78..fd9ded7bb48c 100644 --- a/toolchain/check/testdata/function/definition/import_access.carbon +++ b/toolchain/check/testdata/function/definition/import_access.carbon @@ -282,6 +282,7 @@ private fn Redecl() {} // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f +// CHECK:STDOUT: .Def = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import @@ -316,6 +317,7 @@ private fn Redecl() {} // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .Def = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -412,6 +414,7 @@ private fn Redecl() {} // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import @@ -446,6 +449,7 @@ private fn Redecl() {} // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: import Test//forward_with_def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -546,6 +550,7 @@ private fn Redecl() {} // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import @@ -580,6 +585,7 @@ private fn Redecl() {} // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: import Test//forward // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index e3adccbebba2..9059b60b0d1e 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -111,6 +111,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Wrap.af6 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/complete_type.carbon b/toolchain/check/testdata/generic/complete_type.carbon index 3a3ce18b3862..0cd27c543722 100644 --- a/toolchain/check/testdata/generic/complete_type.carbon +++ b/toolchain/check/testdata/generic/complete_type.carbon @@ -167,6 +167,7 @@ fn G() { F(B); } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A.130 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .v = %.loc13_8 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/local.carbon b/toolchain/check/testdata/generic/local.carbon index fb25589ee1c7..2d8b25a79092 100644 --- a/toolchain/check/testdata/generic/local.carbon +++ b/toolchain/check/testdata/generic/local.carbon @@ -120,6 +120,7 @@ class C(C:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.f06 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .x = %.loc6_10 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 40c87577a609..c1b8500456e0 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -56,6 +56,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .VarScope = %VarScope.decl +// CHECK:STDOUT: .n = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %VarScope.decl: %VarScope.type = fn_decl @VarScope [concrete = constants.%VarScope] { diff --git a/toolchain/check/testdata/impl/assoc_const_self.carbon b/toolchain/check/testdata/impl/assoc_const_self.carbon index 4f6e6e6efbee..3e9e5011869e 100644 --- a/toolchain/check/testdata/impl/assoc_const_self.carbon +++ b/toolchain/check/testdata/impl/assoc_const_self.carbon @@ -484,6 +484,7 @@ fn CallF() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc10 // CHECK:STDOUT: } @@ -639,6 +640,7 @@ fn CallF() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .N = // CHECK:STDOUT: .V = @V.%assoc0 // CHECK:STDOUT: witness = (%V) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/extend_impl.carbon b/toolchain/check/testdata/impl/extend_impl.carbon index 4aaa5c55e70c..359e5c512669 100644 --- a/toolchain/check/testdata/impl/extend_impl.carbon +++ b/toolchain/check/testdata/impl/extend_impl.carbon @@ -102,6 +102,8 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .HasF = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend @impl.%HasF.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/extend_impl_generic.carbon b/toolchain/check/testdata/impl/extend_impl_generic.carbon index 9f2a383c5583..186da0bcaba2 100644 --- a/toolchain/check/testdata/impl/extend_impl_generic.carbon +++ b/toolchain/check/testdata/impl/extend_impl_generic.carbon @@ -159,7 +159,9 @@ class X(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %assoc0.loc5_14.1 +// CHECK:STDOUT: .Param = // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -175,6 +177,7 @@ class X(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .Param = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = @C.%impl_witness // CHECK:STDOUT: } @@ -206,6 +209,9 @@ class X(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .HasF = +// CHECK:STDOUT: .Param = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend @impl.1.%HasF.type // CHECK:STDOUT: } // CHECK:STDOUT: @@ -403,7 +409,9 @@ class X(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %assoc0.loc5_25.1 +// CHECK:STDOUT: .U = // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -438,6 +446,7 @@ class X(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .U = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = @X.%impl_witness // CHECK:STDOUT: } @@ -464,6 +473,8 @@ class X(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .U = // CHECK:STDOUT: extend %.loc9 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_call_invalid.carbon b/toolchain/check/testdata/impl/fail_call_invalid.carbon index 00637c687407..640482b37b56 100644 --- a/toolchain/check/testdata/impl/fail_call_invalid.carbon +++ b/toolchain/check/testdata/impl/fail_call_invalid.carbon @@ -57,6 +57,7 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Simple = %Simple.decl +// CHECK:STDOUT: .Undeclared = // CHECK:STDOUT: .InstanceCall = %InstanceCall.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -113,6 +114,7 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .Undeclared = // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon index 5a6774fa0027..b94c4dfa6f3e 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -95,6 +95,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %assoc0.loc12_13.1 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } @@ -122,6 +123,7 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = // CHECK:STDOUT: } @@ -146,6 +148,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .GenericInterface = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon index b8672206a0bd..f666e9630350 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -114,6 +114,7 @@ class E { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: @@ -128,6 +129,8 @@ class E { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .D = +// CHECK:STDOUT: .I = // CHECK:STDOUT: extend @impl.2.%I.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -142,6 +145,7 @@ class E { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%E +// CHECK:STDOUT: .I = // CHECK:STDOUT: extend @impl.3.%I.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon index f1d491e949f5..4a57b51018ea 100644 --- a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon @@ -59,6 +59,7 @@ interface I { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: .I = // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: @@ -83,6 +84,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C.6b4 +// CHECK:STDOUT: .I = // CHECK:STDOUT: extend %.loc24 // CHECK:STDOUT: has_error // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon index 2f7cd082d04b..d489b94fb2b4 100644 --- a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon @@ -102,6 +102,8 @@ fn F(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend @impl.%I.ref // CHECK:STDOUT: has_error // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon index 6ba0794f13ef..d2141c819e10 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon @@ -474,6 +474,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: %Self.ref as %I.ref { // CHECK:STDOUT: !members: +// CHECK:STDOUT: .F = // CHECK:STDOUT: witness = @NoF.%impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: @@ -490,6 +491,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %F: %PossiblyF.type = bind_alias F, file.%PossiblyF.decl [concrete = constants.%PossiblyF] // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .PossiblyF = // CHECK:STDOUT: .F = %F // CHECK:STDOUT: witness = @FAlias.%impl_witness // CHECK:STDOUT: } @@ -783,6 +785,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .SelfNestedBadParam = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = @SelfNestedBadParam.%impl_witness // CHECK:STDOUT: } @@ -814,6 +817,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .SelfNestedBadReturnType = +// CHECK:STDOUT: .SelfNestedBadParam = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = @SelfNestedBadReturnType.%impl_witness // CHECK:STDOUT: } @@ -829,6 +834,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%NoF +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FNotFunction { @@ -842,6 +848,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FNotFunction +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @F.16; @@ -857,6 +864,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FAlias +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .PossiblyF = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FExtraParam { @@ -870,6 +879,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FExtraParam +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FExtraImplicitParam { @@ -883,6 +893,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FExtraImplicitParam +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FExtraReturnType { @@ -896,6 +907,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FExtraReturnType +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FMissingParam { @@ -909,6 +921,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FMissingParam +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FMissingImplicitParam { @@ -922,6 +935,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FMissingImplicitParam +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FMissingReturnType { @@ -935,6 +949,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FMissingReturnType +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FDifferentParamType { @@ -948,6 +963,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FDifferentParamType +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FDifferentImplicitParamType { @@ -961,6 +977,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FDifferentImplicitParamType +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FDifferentReturnType { @@ -974,6 +991,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FDifferentReturnType +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FDifferentParamName { @@ -987,6 +1005,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FDifferentParamName +// CHECK:STDOUT: .J = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @SelfNestedBadParam { @@ -1000,6 +1019,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SelfNestedBadParam +// CHECK:STDOUT: .SelfNested = +// CHECK:STDOUT: .SelfNestedBadParam = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @SelfNestedBadReturnType { @@ -1013,6 +1034,9 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%SelfNestedBadReturnType +// CHECK:STDOUT: .SelfNested = +// CHECK:STDOUT: .SelfNestedBadReturnType = +// CHECK:STDOUT: .SelfNestedBadParam = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@I.%Self: %I.type) { diff --git a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon index 216fb2150897..05264c03d3f5 100644 --- a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon +++ b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon @@ -108,6 +108,7 @@ impl i32 as I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %assoc0 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } @@ -128,6 +129,7 @@ impl i32 as I { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon b/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon index 4d74a1e1ba16..4c9cc7f6c7f3 100644 --- a/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon +++ b/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon @@ -262,6 +262,7 @@ impl () as I where .N = 2 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness.loc31 // CHECK:STDOUT: } @@ -421,6 +422,7 @@ impl () as I where .N = 2 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .G = %G.decl +// CHECK:STDOUT: .M = // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index 0b5a1bb5e835..b028a44c4576 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -74,6 +74,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: witness = @C.%impl_witness // CHECK:STDOUT: } // CHECK:STDOUT: @@ -88,6 +89,8 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .Simple = +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@Simple.%Self: %Simple.type) { diff --git a/toolchain/check/testdata/impl/lookup/alias.carbon b/toolchain/check/testdata/impl/lookup/alias.carbon index 5a0d276d4711..87b1a5c7a338 100644 --- a/toolchain/check/testdata/impl/lookup/alias.carbon +++ b/toolchain/check/testdata/impl/lookup/alias.carbon @@ -107,6 +107,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .HasF = // CHECK:STDOUT: .G = %G // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon index 6afd556b572f..db3a7e6cd25e 100644 --- a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon @@ -92,6 +92,7 @@ fn F(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = // CHECK:STDOUT: .F = %F // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon index fc1fca485c5d..7321a51a1fd1 100644 --- a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon @@ -127,6 +127,8 @@ impl C as I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend @impl.1.%I.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/generic.carbon b/toolchain/check/testdata/impl/lookup/generic.carbon index c25563280555..6cd6bbdc1735 100644 --- a/toolchain/check/testdata/impl/lookup/generic.carbon +++ b/toolchain/check/testdata/impl/lookup/generic.carbon @@ -399,6 +399,7 @@ fn G(x: A) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .T = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/instance_method.carbon b/toolchain/check/testdata/impl/lookup/instance_method.carbon index e132cdd98623..dca7d8b2e4bc 100644 --- a/toolchain/check/testdata/impl/lookup/instance_method.carbon +++ b/toolchain/check/testdata/impl/lookup/instance_method.carbon @@ -143,6 +143,8 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend @impl.%I.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/no_prelude/impl_forall.carbon b/toolchain/check/testdata/impl/lookup/no_prelude/impl_forall.carbon index c2a8d32138f6..6e23e97c8646 100644 --- a/toolchain/check/testdata/impl/lookup/no_prelude/impl_forall.carbon +++ b/toolchain/check/testdata/impl/lookup/no_prelude/impl_forall.carbon @@ -229,6 +229,7 @@ fn TestSpecific(a: A({})) -> {} { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .U = // CHECK:STDOUT: .F = %assoc0.loc7_26.1 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } @@ -262,6 +263,7 @@ fn TestSpecific(a: A({})) -> {} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .V = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } @@ -289,6 +291,7 @@ fn TestSpecific(a: A({})) -> {} { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A.13025a.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .n = %.loc3_8 // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/multiple_extend.carbon b/toolchain/check/testdata/impl/multiple_extend.carbon index 6c15ce45ecc7..724f8c9287ce 100644 --- a/toolchain/check/testdata/impl/multiple_extend.carbon +++ b/toolchain/check/testdata/impl/multiple_extend.carbon @@ -230,6 +230,8 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %assoc0 +// CHECK:STDOUT: .HasG = +// CHECK:STDOUT: .G = // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -241,6 +243,7 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .G = %assoc0 +// CHECK:STDOUT: .F = // CHECK:STDOUT: witness = (%G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -276,6 +279,10 @@ fn P(o: O) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .HasF = +// CHECK:STDOUT: .HasG = +// CHECK:STDOUT: .F = +// CHECK:STDOUT: .G = // CHECK:STDOUT: extend @impl.1.%HasF.ref // CHECK:STDOUT: extend @impl.2.%HasG.ref // CHECK:STDOUT: } @@ -394,6 +401,7 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .A = %assoc0 +// CHECK:STDOUT: .HasA2 = // CHECK:STDOUT: witness = (%A.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -440,6 +448,9 @@ fn P(o: O) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%D +// CHECK:STDOUT: .HasA1 = +// CHECK:STDOUT: .HasA2 = +// CHECK:STDOUT: .A = // CHECK:STDOUT: extend @impl.1.%HasA1.ref // CHECK:STDOUT: extend @impl.2.%HasA2.ref // CHECK:STDOUT: } @@ -544,6 +555,7 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .I = %assoc0 +// CHECK:STDOUT: .J = // CHECK:STDOUT: witness = (%I.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -563,6 +575,8 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B // CHECK:STDOUT: .J = %J.decl +// CHECK:STDOUT: .HasI = +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @E { @@ -578,7 +592,11 @@ fn P(o: O) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%E +// CHECK:STDOUT: .B = // CHECK:STDOUT: .base = %.loc13 +// CHECK:STDOUT: .HasI = +// CHECK:STDOUT: .I = +// CHECK:STDOUT: .J = // CHECK:STDOUT: extend %B.ref // CHECK:STDOUT: extend @impl.%HasI.ref // CHECK:STDOUT: } @@ -702,6 +720,7 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base // CHECK:STDOUT: .K = %K.decl +// CHECK:STDOUT: .HasK = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @L { @@ -717,7 +736,10 @@ fn P(o: O) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%L +// CHECK:STDOUT: .Base = // CHECK:STDOUT: .base = %.loc13 +// CHECK:STDOUT: .HasK = +// CHECK:STDOUT: .K = // CHECK:STDOUT: extend %Base.ref // CHECK:STDOUT: extend @impl.%HasK.ref // CHECK:STDOUT: } @@ -827,6 +849,7 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .N = %assoc0 +// CHECK:STDOUT: .HasN2 = // CHECK:STDOUT: witness = (%N.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -865,6 +888,8 @@ fn P(o: O) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%NBase // CHECK:STDOUT: .N = %N.decl +// CHECK:STDOUT: .HasN1 = +// CHECK:STDOUT: .HasN2 = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O { @@ -886,7 +911,10 @@ fn P(o: O) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%O +// CHECK:STDOUT: .NBase = // CHECK:STDOUT: .base = %.loc17 +// CHECK:STDOUT: .HasN1 = +// CHECK:STDOUT: .HasN2 = // CHECK:STDOUT: .N = %N.decl // CHECK:STDOUT: extend %NBase.ref // CHECK:STDOUT: extend @impl.1.%HasN1.ref diff --git a/toolchain/check/testdata/impl/no_prelude/impl_assoc_const.carbon b/toolchain/check/testdata/impl/no_prelude/impl_assoc_const.carbon index 93553a30aed5..471a06a7d452 100644 --- a/toolchain/check/testdata/impl/no_prelude/impl_assoc_const.carbon +++ b/toolchain/check/testdata/impl/no_prelude/impl_assoc_const.carbon @@ -508,6 +508,10 @@ impl () as N where .Y = {.a = {}} { } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .I4 = %I4.decl +// CHECK:STDOUT: .BAD1 = +// CHECK:STDOUT: .BAD2 = +// CHECK:STDOUT: .BAD3 = +// CHECK:STDOUT: .BAD4 = // CHECK:STDOUT: } // CHECK:STDOUT: %I4.decl: type = interface_decl @I4 [concrete = constants.%I4.type] {} {} // CHECK:STDOUT: impl_decl @impl.1 [concrete] {} { @@ -803,6 +807,7 @@ impl () as N where .Y = {.a = {}} { } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .L2 = %L2.decl +// CHECK:STDOUT: .BAD5 = // CHECK:STDOUT: } // CHECK:STDOUT: %L2.decl: type = interface_decl @L2 [concrete = constants.%L2.type] {} {} // CHECK:STDOUT: impl_decl @impl [concrete] {} { @@ -876,6 +881,7 @@ impl () as N where .Y = {.a = {}} { } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .L3 = %L3.decl +// CHECK:STDOUT: .BAD6 = // CHECK:STDOUT: } // CHECK:STDOUT: %L3.decl: type = interface_decl @L3 [concrete = constants.%L3.type] {} {} // CHECK:STDOUT: impl_decl @impl [concrete] {} { @@ -948,6 +954,8 @@ impl () as N where .Y = {.a = {}} { } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .L4 = %L4.decl +// CHECK:STDOUT: .BAD7 = +// CHECK:STDOUT: .BAD8 = // CHECK:STDOUT: } // CHECK:STDOUT: %L4.decl: type = interface_decl @L4 [concrete = constants.%L4.type] {} {} // CHECK:STDOUT: impl_decl @impl [concrete] {} { diff --git a/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon b/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon index b9de0849a426..9251b8f21ff9 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon @@ -299,6 +299,8 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%MyInt +// CHECK:STDOUT: .Int = +// CHECK:STDOUT: .N = // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -928,6 +930,8 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%OtherInt +// CHECK:STDOUT: .Int = +// CHECK:STDOUT: .IntLiteral = // CHECK:STDOUT: .ToLiteral = %ToLiteral.decl // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon b/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon index 1965daa99cab..3d7f7a8d4cb8 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon @@ -90,6 +90,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .I = // CHECK:STDOUT: extend @impl.%I.ref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -176,6 +177,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .F = // CHECK:STDOUT: extend imports.%Main.import_ref.3019d1.1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/import_interface_assoc_const.carbon b/toolchain/check/testdata/impl/no_prelude/import_interface_assoc_const.carbon index daf0f65d8e5a..c1fbfa054d35 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_interface_assoc_const.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_interface_assoc_const.carbon @@ -721,6 +721,10 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: .I3 = imports.%Main.I3 // CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C5 = %C5.decl +// CHECK:STDOUT: .BAD1 = +// CHECK:STDOUT: .BAD2 = +// CHECK:STDOUT: .BAD3 = +// CHECK:STDOUT: .BAD4 = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C5.decl: type = class_decl @C5 [concrete = constants.%C5] {} {} @@ -1062,6 +1066,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: .I3 = imports.%Main.I3 // CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C8 = %C8.decl +// CHECK:STDOUT: .BAD5 = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C8.decl: type = class_decl @C8 [concrete = constants.%C8] {} {} @@ -1152,6 +1157,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: .I3 = imports.%Main.I3 // CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C9 = %C9.decl +// CHECK:STDOUT: .BAD6 = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C9.decl: type = class_decl @C9 [concrete = constants.%C9] {} {} @@ -1242,6 +1248,8 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: .I3 = imports.%Main.I3 // CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .CA = %CA.decl +// CHECK:STDOUT: .BAD7 = +// CHECK:STDOUT: .BAD8 = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %CA.decl: type = class_decl @CA [concrete = constants.%CA] {} {} diff --git a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon index 3bc0c106073b..a62d66fa05ee 100644 --- a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon +++ b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon @@ -661,6 +661,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Make = %assoc0.loc5_17.1 // CHECK:STDOUT: witness = (%Make.decl) // CHECK:STDOUT: } @@ -677,6 +678,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .B = // CHECK:STDOUT: .Make = %Make.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon b/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon index b826deba9c8d..4f85ed020c16 100644 --- a/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon +++ b/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon @@ -108,6 +108,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .DefaultConstructible = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Make.1(@DefaultConstructible.%Self: %DefaultConstructible.type) { diff --git a/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon b/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon index 63b76060dd54..06a7d0e6cbcd 100644 --- a/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon +++ b/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon @@ -211,6 +211,7 @@ impl D as SelfNested { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness.loc19 // CHECK:STDOUT: } @@ -260,6 +261,7 @@ impl D as SelfNested { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = file.%impl_witness.loc31 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/redeclaration.carbon b/toolchain/check/testdata/impl/redeclaration.carbon index 2df1c5ab419e..9122773aafc2 100644 --- a/toolchain/check/testdata/impl/redeclaration.carbon +++ b/toolchain/check/testdata/impl/redeclaration.carbon @@ -85,5 +85,6 @@ impl i32 as I {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X +// CHECK:STDOUT: .I = // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index 675bb41316b3..946b66ee2121 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -38,6 +38,7 @@ fn Main() { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Main = %Main.decl +// CHECK:STDOUT: .a = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} diff --git a/toolchain/check/testdata/interface/member_lookup.carbon b/toolchain/check/testdata/interface/member_lookup.carbon index 1ecb151e178e..e0d7e7e3d86e 100644 --- a/toolchain/check/testdata/interface/member_lookup.carbon +++ b/toolchain/check/testdata/interface/member_lookup.carbon @@ -169,6 +169,7 @@ fn AccessMissingConcrete(I:! Interface(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .X = @X.%assoc0 // CHECK:STDOUT: witness = (%X) // CHECK:STDOUT: } @@ -397,7 +398,9 @@ fn AccessMissingConcrete(I:! Interface(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .X = @X.%assoc0 +// CHECK:STDOUT: .nonesuch = // CHECK:STDOUT: witness = (%X) // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/default_fn.carbon b/toolchain/check/testdata/interface/no_prelude/default_fn.carbon index 6891dffb8f4e..d79fc796f3bb 100644 --- a/toolchain/check/testdata/interface/no_prelude/default_fn.carbon +++ b/toolchain/check/testdata/interface/no_prelude/default_fn.carbon @@ -59,6 +59,8 @@ class C { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %assoc0 +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .I = // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -83,6 +85,7 @@ class C { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@I.%Self: %I.type) { diff --git a/toolchain/check/testdata/interface/no_prelude/fail_assoc_const_not_constant.carbon b/toolchain/check/testdata/interface/no_prelude/fail_assoc_const_not_constant.carbon index af93c941b74c..3fabe3691503 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_assoc_const_not_constant.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_assoc_const_not_constant.carbon @@ -54,6 +54,7 @@ alias UseOther = I.other; // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .a = .inst19.loc20_7 +// CHECK:STDOUT: .other = // CHECK:STDOUT: has_error // CHECK:STDOUT: witness = () // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/fail_incomplete_type.carbon b/toolchain/check/testdata/interface/no_prelude/fail_incomplete_type.carbon index 8553dfc79e7b..6f83addbe552 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_incomplete_type.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_incomplete_type.carbon @@ -48,6 +48,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self +// CHECK:STDOUT: .C = // CHECK:STDOUT: .T = @T.%assoc0 // CHECK:STDOUT: witness = (%T) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon b/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon index 43cec7430ddf..461f8c4dab94 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon @@ -98,6 +98,8 @@ interface BeingDefined { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self +// CHECK:STDOUT: .BeingDefined = +// CHECK:STDOUT: .T = // CHECK:STDOUT: .H = %assoc0 // CHECK:STDOUT: witness = (%H.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/generic.carbon b/toolchain/check/testdata/interface/no_prelude/generic.carbon index 354924801aea..d3dd3a718529 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic.carbon @@ -220,6 +220,7 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .X = // CHECK:STDOUT: .F = %assoc0.loc10_14.1 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } @@ -250,6 +251,7 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .X = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: witness = @C.%impl_witness.loc15 // CHECK:STDOUT: } @@ -282,6 +284,10 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C +// CHECK:STDOUT: .Simple = +// CHECK:STDOUT: .C = +// CHECK:STDOUT: .WithAssocFn = +// CHECK:STDOUT: .X = // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@WithAssocFn.%T.loc8_23.1: type, @WithAssocFn.%Self.1: @WithAssocFn.%WithAssocFn.type (%WithAssocFn.type.ce6)) { diff --git a/toolchain/check/testdata/interface/no_prelude/import_access.carbon b/toolchain/check/testdata/interface/no_prelude/import_access.carbon index 6674443732ce..946dacc99fd1 100644 --- a/toolchain/check/testdata/interface/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import_access.carbon @@ -249,6 +249,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .Def = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -276,6 +277,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .Def = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -354,6 +356,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -381,6 +384,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .ForwardWithDef = // CHECK:STDOUT: import Test//forward_with_def // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -420,6 +424,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -460,6 +465,7 @@ private interface Redecl {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -497,6 +503,7 @@ private interface Redecl {} // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Test = imports.%Test +// CHECK:STDOUT: .Forward = // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test diff --git a/toolchain/check/testdata/let/no_prelude/import_access.carbon b/toolchain/check/testdata/let/no_prelude/import_access.carbon index 45240a40bcea..51eee19d06c1 100644 --- a/toolchain/check/testdata/let/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/let/no_prelude/import_access.carbon @@ -123,6 +123,7 @@ let v2: () = Test.v; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .v2 = %v2 +// CHECK:STDOUT: .v = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: name_binding_decl { @@ -149,6 +150,7 @@ let v2: () = Test.v; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .v = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index 5895019ff44d..1b50c849403c 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -43,10 +43,12 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Foo: = namespace [concrete] { // CHECK:STDOUT: .Bar = %Bar +// CHECK:STDOUT: .Foo = // CHECK:STDOUT: } // CHECK:STDOUT: %Bar: = namespace [concrete] { // CHECK:STDOUT: .Wiz = %Wiz.decl // CHECK:STDOUT: .Baz = %Baz.decl +// CHECK:STDOUT: .Foo = // CHECK:STDOUT: } // CHECK:STDOUT: %Wiz.decl: %Wiz.type = fn_decl @Wiz [concrete = constants.%Wiz] {} {} // CHECK:STDOUT: %Baz.decl: %Baz.type = fn_decl @Baz [concrete = constants.%Baz] {} {} diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index fab22c448899..e0ddf8b927c0 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -77,6 +77,7 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: %A.decl.loc14: %A.type.0e8 = fn_decl @A.2 [concrete = constants.%A.281] {} {} // CHECK:STDOUT: %M: = namespace [concrete] { // CHECK:STDOUT: .B = %B.decl +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] { // CHECK:STDOUT: %return.patt: %i32 = return_slot_pattern diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index 26f961a71de5..7d9e7edb1258 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -67,10 +67,13 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: .InnerN = %InnerN // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .CallAB = %CallAB.decl +// CHECK:STDOUT: .A = // CHECK:STDOUT: } // CHECK:STDOUT: %InnerN: = namespace [concrete] { // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .CallABC = %CallABC.decl +// CHECK:STDOUT: .A = +// CHECK:STDOUT: .B = // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [concrete = constants.%A] {} {} // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [concrete = constants.%B] {} {} diff --git a/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon index 5b9180333231..119045502bf7 100644 --- a/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_assignment_to_error.carbon @@ -40,6 +40,8 @@ fn Main() { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Main = %Main.decl +// CHECK:STDOUT: .undeclared = +// CHECK:STDOUT: .also_undeclared = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} diff --git a/toolchain/check/testdata/operators/overloaded/add.carbon b/toolchain/check/testdata/operators/overloaded/add.carbon index 29b48350039f..37fedf9e59b7 100644 --- a/toolchain/check/testdata/operators/overloaded/add.carbon +++ b/toolchain/check/testdata/operators/overloaded/add.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_and.carbon b/toolchain/check/testdata/operators/overloaded/bit_and.carbon index 88d1bf5eb752..136a17eb9559 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_and.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_and.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon index 2efe34272635..cf5c85c7a976 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon @@ -96,6 +96,7 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_or.carbon b/toolchain/check/testdata/operators/overloaded/bit_or.carbon index ab911f4b8745..46b195a0e527 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_or.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_or.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon index 0378713d4d40..1ff1a96a7a33 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/dec.carbon b/toolchain/check/testdata/operators/overloaded/dec.carbon index a86d524d14c2..14adc0af9e96 100644 --- a/toolchain/check/testdata/operators/overloaded/dec.carbon +++ b/toolchain/check/testdata/operators/overloaded/dec.carbon @@ -84,6 +84,7 @@ fn TestOp() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/div.carbon b/toolchain/check/testdata/operators/overloaded/div.carbon index 885ce2a76310..6eae3fa8fa96 100644 --- a/toolchain/check/testdata/operators/overloaded/div.carbon +++ b/toolchain/check/testdata/operators/overloaded/div.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/eq.carbon b/toolchain/check/testdata/operators/overloaded/eq.carbon index 187b7df8cadb..e0e083b4f59b 100644 --- a/toolchain/check/testdata/operators/overloaded/eq.carbon +++ b/toolchain/check/testdata/operators/overloaded/eq.carbon @@ -218,6 +218,7 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Equal = %Equal.decl // CHECK:STDOUT: .NotEqual = %NotEqual.decl // CHECK:STDOUT: witness = file.%impl_witness @@ -492,6 +493,7 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Equal = %Equal.decl // CHECK:STDOUT: .NotEqual = %NotEqual.decl // CHECK:STDOUT: witness = file.%impl_witness diff --git a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon index 642404bb415b..0867717ddce9 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon @@ -139,6 +139,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc15 // CHECK:STDOUT: } @@ -163,6 +164,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc18 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon index 7e79ea7080d9..4423c41dc762 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon @@ -59,6 +59,7 @@ fn G(n: i32) { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .undeclared = // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl_for_arg.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl_for_arg.carbon index de7daa0b6ab5..08cf8774ac69 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl_for_arg.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl_for_arg.carbon @@ -163,6 +163,7 @@ fn TestAssign(b: D) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc16 // CHECK:STDOUT: } @@ -187,6 +188,7 @@ fn TestAssign(b: D) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc19 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon index 17b54d688f15..7e00ad83f7c2 100644 --- a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon +++ b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon @@ -167,6 +167,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .X = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc15 // CHECK:STDOUT: } @@ -188,6 +189,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .X = // CHECK:STDOUT: .Convert = %Convert.decl // CHECK:STDOUT: witness = file.%impl_witness.loc19 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/inc.carbon b/toolchain/check/testdata/operators/overloaded/inc.carbon index 88bb417d26bf..868f8e8d4e46 100644 --- a/toolchain/check/testdata/operators/overloaded/inc.carbon +++ b/toolchain/check/testdata/operators/overloaded/inc.carbon @@ -84,6 +84,7 @@ fn TestOp() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/index.carbon b/toolchain/check/testdata/operators/overloaded/index.carbon index 903b7ec9c9d0..c314f8ce7e82 100644 --- a/toolchain/check/testdata/operators/overloaded/index.carbon +++ b/toolchain/check/testdata/operators/overloaded/index.carbon @@ -178,6 +178,8 @@ let x: i32 = c[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .SubscriptType = +// CHECK:STDOUT: .ElementType = // CHECK:STDOUT: .At = %At.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } @@ -488,6 +490,8 @@ let x: i32 = c[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .SubscriptType = +// CHECK:STDOUT: .ElementType = // CHECK:STDOUT: .At = %At.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/left_shift.carbon b/toolchain/check/testdata/operators/overloaded/left_shift.carbon index 03297b2f6506..21d9630b4454 100644 --- a/toolchain/check/testdata/operators/overloaded/left_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/left_shift.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/mod.carbon b/toolchain/check/testdata/operators/overloaded/mod.carbon index 6b7ae5efc210..ac54279c1b3f 100644 --- a/toolchain/check/testdata/operators/overloaded/mod.carbon +++ b/toolchain/check/testdata/operators/overloaded/mod.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/mul.carbon b/toolchain/check/testdata/operators/overloaded/mul.carbon index 80dbf7ccd05a..5a21d19e7bef 100644 --- a/toolchain/check/testdata/operators/overloaded/mul.carbon +++ b/toolchain/check/testdata/operators/overloaded/mul.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/negate.carbon b/toolchain/check/testdata/operators/overloaded/negate.carbon index bf6c2c16e57c..d9305affb68c 100644 --- a/toolchain/check/testdata/operators/overloaded/negate.carbon +++ b/toolchain/check/testdata/operators/overloaded/negate.carbon @@ -96,6 +96,7 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/no_prelude/index.carbon b/toolchain/check/testdata/operators/overloaded/no_prelude/index.carbon index 9e317f24f365..4413005bdb18 100644 --- a/toolchain/check/testdata/operators/overloaded/no_prelude/index.carbon +++ b/toolchain/check/testdata/operators/overloaded/no_prelude/index.carbon @@ -223,6 +223,7 @@ fn F() { ()[()]; } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .SubscriptType = // CHECK:STDOUT: .At = %assoc0.loc5_52.1 // CHECK:STDOUT: witness = (%At.decl) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/ordered.carbon b/toolchain/check/testdata/operators/overloaded/ordered.carbon index dcd606bff669..280b42b86168 100644 --- a/toolchain/check/testdata/operators/overloaded/ordered.carbon +++ b/toolchain/check/testdata/operators/overloaded/ordered.carbon @@ -304,6 +304,7 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Less = %Less.decl // CHECK:STDOUT: .LessOrEquivalent = %LessOrEquivalent.decl // CHECK:STDOUT: .Greater = %Greater.decl diff --git a/toolchain/check/testdata/operators/overloaded/right_shift.carbon b/toolchain/check/testdata/operators/overloaded/right_shift.carbon index e89d25ca9e92..fef52598f5d0 100644 --- a/toolchain/check/testdata/operators/overloaded/right_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/right_shift.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/sub.carbon b/toolchain/check/testdata/operators/overloaded/sub.carbon index cb96f425b650..8f48af231d3e 100644 --- a/toolchain/check/testdata/operators/overloaded/sub.carbon +++ b/toolchain/check/testdata/operators/overloaded/sub.carbon @@ -149,6 +149,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } @@ -173,6 +174,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Op = %Op.decl // CHECK:STDOUT: witness = file.%impl_witness.loc22 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index 643ba7e27222..4b77533a0afb 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -37,6 +37,7 @@ fn Main() { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Main = %Main.decl +// CHECK:STDOUT: .x = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 409585541dee..35dcd0384d53 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -56,6 +56,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core +// CHECK:STDOUT: .x = // CHECK:STDOUT: .a_ref = %a_ref // CHECK:STDOUT: .b_ref = %b_ref // CHECK:STDOUT: .c_ref = %c_ref diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index 3d445443cb94..4a5899c6e59d 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -35,6 +35,7 @@ var a: () = A(); // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .A = // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon b/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon index d3e03ea7d16c..2eb5fe321c09 100644 --- a/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon +++ b/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon @@ -599,6 +599,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [concrete] { +// CHECK:STDOUT: .F = // CHECK:STDOUT: import Other//other_fn_use // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/no_prelude/export_import.carbon b/toolchain/check/testdata/packages/no_prelude/export_import.carbon index 628150cfeaaf..277eebd32970 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_import.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_import.carbon @@ -714,6 +714,7 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Local = %Local // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon b/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon index 3dfc7b4f41ed..3fe19d332147 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon @@ -437,6 +437,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = // CHECK:STDOUT: .d = %d // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/packages/no_prelude/export_name.carbon b/toolchain/check/testdata/packages/no_prelude/export_name.carbon index 323a39e52076..12b99c446648 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_name.carbon @@ -937,7 +937,9 @@ private export C; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { +// CHECK:STDOUT: .C = // CHECK:STDOUT: .Local = %Local +// CHECK:STDOUT: .NS = // CHECK:STDOUT: .NSLocal = %NSLocal // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon b/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon index d1f8b2679de3..b49d1a42fc2d 100644 --- a/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon @@ -133,6 +133,7 @@ var n: {} = i32; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [concrete] { +// CHECK:STDOUT: .Int = // CHECK:STDOUT: import Core//prelude_empty // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/raw_core.carbon b/toolchain/check/testdata/packages/raw_core.carbon index af41b7d9e47e..bbb22b357ce3 100644 --- a/toolchain/check/testdata/packages/raw_core.carbon +++ b/toolchain/check/testdata/packages/raw_core.carbon @@ -149,10 +149,12 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core.eced1c.1: = namespace file.%Core.import.1, [concrete] { +// CHECK:STDOUT: .F = // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Core.eced1c.2: = namespace file.%Core.import.loc4, [concrete] { +// CHECK:STDOUT: .Int = // CHECK:STDOUT: import Core//default // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/arrow.carbon b/toolchain/check/testdata/pointer/arrow.carbon index d5b051a28385..1a242f2b2b56 100644 --- a/toolchain/check/testdata/pointer/arrow.carbon +++ b/toolchain/check/testdata/pointer/arrow.carbon @@ -86,6 +86,7 @@ fn Foo(ptr: C*) { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: .Member = %Member.decl +// CHECK:STDOUT: .C = // CHECK:STDOUT: .field = %.loc13_12 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index ccfccf29db3e..d14c8b93b158 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -43,6 +43,7 @@ fn Test() { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Test = %Test.decl +// CHECK:STDOUT: .undeclared = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [concrete = constants.%Test] {} {} diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 623f9eb2a108..9f7ba435971f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -38,6 +38,7 @@ let n2: i32 = undeclared->foo; // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .n = %n +// CHECK:STDOUT: .undeclared = // CHECK:STDOUT: .n2 = %n2 // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index dd523ed02862..73dd91ce2286 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -31,6 +31,7 @@ fn Six() -> x; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core +// CHECK:STDOUT: .x = // CHECK:STDOUT: .Six = %Six.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon b/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon index 963e6a60ba67..3494a00d44e0 100644 --- a/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon +++ b/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon @@ -181,6 +181,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 +// CHECK:STDOUT: .T = // CHECK:STDOUT: .Convert = %assoc0.loc9_32.1 // CHECK:STDOUT: witness = (%Convert.decl) // CHECK:STDOUT: } @@ -587,7 +588,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -607,7 +610,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc11 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -627,7 +632,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc12 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -647,7 +654,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc13 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -667,7 +676,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc14 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -687,7 +698,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc15 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -707,7 +720,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc16 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -727,7 +742,9 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: +// CHECK:STDOUT: .D = // CHECK:STDOUT: .Convert = %Convert.decl +// CHECK:STDOUT: .Make = // CHECK:STDOUT: witness = file.%impl_witness.loc17 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 0707f917d498..c0b12d76fabe 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -33,6 +33,7 @@ fn F() { a.b; } // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .F = %F.decl +// CHECK:STDOUT: .a = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} diff --git a/toolchain/check/testdata/tuple/access/fail_access_error.carbon b/toolchain/check/testdata/tuple/access/fail_access_error.carbon index 804c6720245e..bebd16ddd22a 100644 --- a/toolchain/check/testdata/tuple/access/fail_access_error.carbon +++ b/toolchain/check/testdata/tuple/access/fail_access_error.carbon @@ -55,6 +55,7 @@ var b: i32 = a.(oops); // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .oops = // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: name_binding_decl { diff --git a/toolchain/check/testdata/var/no_prelude/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/no_prelude/fail_lookup_outside_scope.carbon index 77bfbe8a6744..c32a4bb68f4c 100644 --- a/toolchain/check/testdata/var/no_prelude/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/no_prelude/fail_lookup_outside_scope.carbon @@ -30,6 +30,7 @@ var y: () = x; // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Main = %Main.decl // CHECK:STDOUT: .y = %y +// CHECK:STDOUT: .x = // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} // CHECK:STDOUT: name_binding_decl { diff --git a/toolchain/check/testdata/var/no_prelude/import_access.carbon b/toolchain/check/testdata/var/no_prelude/import_access.carbon index a1b9bbc0c1c6..454cf569c7a9 100644 --- a/toolchain/check/testdata/var/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/var/no_prelude/import_access.carbon @@ -132,6 +132,7 @@ var v2: () = Test.v; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .v2 = %v2 +// CHECK:STDOUT: .v = // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: name_binding_decl { @@ -161,6 +162,7 @@ var v2: () = Test.v; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test: = namespace file.%Test.import, [concrete] { +// CHECK:STDOUT: .v = // CHECK:STDOUT: import Test//def // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/where_expr/constraints.carbon b/toolchain/check/testdata/where_expr/constraints.carbon index e397347be9b4..10c5ffd89fc3 100644 --- a/toolchain/check/testdata/where_expr/constraints.carbon +++ b/toolchain/check/testdata/where_expr/constraints.carbon @@ -252,6 +252,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .Member = @Member.%assoc0 +// CHECK:STDOUT: .J = // CHECK:STDOUT: .Second = @Second.%assoc1 // CHECK:STDOUT: witness = (%Member, %Second) // CHECK:STDOUT: } @@ -398,6 +399,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self +// CHECK:STDOUT: .L = // CHECK:STDOUT: .Associated = @Associated.%assoc0 // CHECK:STDOUT: witness = (%Associated) // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/where_expr/designator.carbon b/toolchain/check/testdata/where_expr/designator.carbon index c66d7346fa56..63ba28649c8b 100644 --- a/toolchain/check/testdata/where_expr/designator.carbon +++ b/toolchain/check/testdata/where_expr/designator.carbon @@ -301,6 +301,7 @@ class D { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .Member = @Member.%assoc0 +// CHECK:STDOUT: .Mismatch = // CHECK:STDOUT: witness = (%Member) // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/where_expr/fail_not_facet.carbon b/toolchain/check/testdata/where_expr/fail_not_facet.carbon index 2ea42143cb04..552e0d4d3cee 100644 --- a/toolchain/check/testdata/where_expr/fail_not_facet.carbon +++ b/toolchain/check/testdata/where_expr/fail_not_facet.carbon @@ -115,6 +115,7 @@ var v: e where .x = 3; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core +// CHECK:STDOUT: .NOT_DECLARED = // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -162,6 +163,7 @@ var v: e where .x = 3; // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [concrete] { // CHECK:STDOUT: .Core = imports.%Core +// CHECK:STDOUT: .e = // CHECK:STDOUT: .v = %v // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index c22d7b422c78..3cba3d25eb88 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -673,10 +673,6 @@ class FormatterImpl { } for (auto [name_id, result] : scope.entries()) { - if (result.is_poisoned()) { - // TODO: Add poisoned names. - continue; - } Indent(); out_ << "."; FormatName(name_id); @@ -691,7 +687,11 @@ class FormatterImpl { break; } out_ << " = "; - FormatName(result.is_found() ? result.target_inst_id() : InstId::None); + if (result.is_poisoned()) { + out_ << ""; + } else { + FormatName(result.is_found() ? result.target_inst_id() : InstId::None); + } out_ << "\n"; }