From 3f4de65ad8b7b20ef5cbd2d6e2e0d669571fc7be Mon Sep 17 00:00:00 2001 From: Calvin Date: Wed, 22 Jan 2025 00:22:07 -0700 Subject: [PATCH] Improve SemIR naming of `import_ref`s (#4824) Changes the name of SemIR `import_ref`s to use the format `.`.
BeforeAfter
%import_ref.05a: type %Main.D: type
%import_ref.8f2: <witness> %Main.import_ref.8f2: <witness>
* [Discord discussion in #toolchain](https://discord.com/channels/655572317891461132/655578254970716160/1330253540999827577) * Closes #4769 --- .../testdata/alias/fail_bool_value.carbon | 2 +- .../check/testdata/alias/fail_builtins.carbon | 4 +- .../alias/no_prelude/export_name.carbon | 70 +-- .../testdata/alias/no_prelude/import.carbon | 68 +-- .../alias/no_prelude/import_access.carbon | 22 +- .../alias/no_prelude/import_order.carbon | 46 +- .../testdata/array/array_in_place.carbon | 2 +- .../testdata/array/array_vs_tuple.carbon | 6 +- .../testdata/array/assign_return_value.carbon | 6 +- .../check/testdata/array/assign_var.carbon | 6 +- toolchain/check/testdata/array/base.carbon | 8 +- .../testdata/array/canonicalize_index.carbon | 12 +- .../testdata/array/fail_bound_negative.carbon | 8 +- .../testdata/array/fail_bound_overflow.carbon | 4 +- .../testdata/array/fail_invalid_type.carbon | 2 +- .../testdata/array/fail_out_of_bound.carbon | 2 +- .../fail_out_of_bound_non_literal.carbon | 6 +- .../testdata/array/fail_type_mismatch.carbon | 6 +- .../testdata/array/function_param.carbon | 6 +- toolchain/check/testdata/array/import.carbon | 10 +- .../testdata/array/index_not_literal.carbon | 6 +- .../array/init_dependent_bound.carbon | 6 +- .../check/testdata/array/nine_elements.carbon | 6 +- .../testdata/as/adapter_conversion.carbon | 32 +- toolchain/check/testdata/as/as_type.carbon | 2 +- toolchain/check/testdata/as/basic.carbon | 6 +- .../testdata/as/fail_no_conversion.carbon | 4 +- .../check/testdata/as/fail_not_type.carbon | 4 +- toolchain/check/testdata/as/overloaded.carbon | 12 +- .../testdata/basics/builtin_types.carbon | 8 +- .../check/testdata/basics/fail_bad_run.carbon | 2 +- .../testdata/basics/fail_bad_run_2.carbon | 2 +- .../basics/fail_non_type_as_type.carbon | 2 +- .../fail_numeric_literal_overflow.carbon | 8 +- .../testdata/basics/numeric_literals.carbon | 8 +- toolchain/check/testdata/basics/parens.carbon | 6 +- .../check/testdata/basics/run_i32.carbon | 6 +- .../testdata/basics/type_literals.carbon | 4 +- .../check/testdata/builtins/bool/eq.carbon | 8 +- .../testdata/builtins/bool/make_type.carbon | 6 +- .../check/testdata/builtins/bool/neq.carbon | 8 +- .../check/testdata/builtins/float/add.carbon | 6 +- .../check/testdata/builtins/float/div.carbon | 6 +- .../check/testdata/builtins/float/eq.carbon | 6 +- .../testdata/builtins/float/greater.carbon | 4 +- .../testdata/builtins/float/greater_eq.carbon | 4 +- .../check/testdata/builtins/float/less.carbon | 4 +- .../testdata/builtins/float/less_eq.carbon | 4 +- .../testdata/builtins/float/make_type.carbon | 30 +- .../check/testdata/builtins/float/mul.carbon | 6 +- .../testdata/builtins/float/negate.carbon | 6 +- .../check/testdata/builtins/float/neq.carbon | 6 +- .../check/testdata/builtins/float/sub.carbon | 6 +- .../check/testdata/builtins/print/char.carbon | 12 +- .../check/testdata/builtins/print/int.carbon | 12 +- .../check/testdata/builtins/read/int.carbon | 8 +- .../testdata/class/access_modifers.carbon | 26 +- .../check/testdata/class/adapter/adapt.carbon | 4 +- .../testdata/class/adapter/adapt_copy.carbon | 14 +- .../class/adapter/extend_adapt.carbon | 20 +- .../class/adapter/fail_adapt_bad_decl.carbon | 4 +- .../adapter/fail_adapt_with_subobjects.carbon | 6 +- .../testdata/class/adapter/init_adapt.carbon | 12 +- toolchain/check/testdata/class/base.carbon | 8 +- .../check/testdata/class/base_field.carbon | 2 +- .../check/testdata/class/base_method.carbon | 6 +- .../class/base_method_qualified.carbon | 2 +- toolchain/check/testdata/class/basic.carbon | 6 +- .../class/complete_in_member_fn.carbon | 2 +- .../testdata/class/compound_field.carbon | 2 +- .../class/cross_package_import.carbon | 48 +- .../testdata/class/derived_to_base.carbon | 6 +- .../check/testdata/class/fail_abstract.carbon | 6 +- .../testdata/class/fail_base_bad_type.carbon | 22 +- .../class/fail_compound_type_mismatch.carbon | 4 +- .../class/fail_derived_to_base.carbon | 4 +- .../class/fail_field_modifiers.carbon | 6 +- .../testdata/class/fail_generic_method.carbon | 2 +- .../testdata/class/fail_import_misuses.carbon | 18 +- .../testdata/class/fail_incomplete.carbon | 2 +- .../check/testdata/class/fail_init.carbon | 6 +- .../class/fail_init_as_inplace.carbon | 6 +- .../testdata/class/fail_member_of_let.carbon | 2 +- .../check/testdata/class/fail_scope.carbon | 6 +- .../check/testdata/class/fail_self.carbon | 2 +- .../testdata/class/fail_unbound_field.carbon | 2 +- .../testdata/class/fail_unknown_member.carbon | 2 +- .../check/testdata/class/field_access.carbon | 6 +- .../class/field_access_in_value.carbon | 6 +- .../check/testdata/class/generic/adapt.carbon | 112 ++-- .../class/generic/base_is_generic.carbon | 114 ++-- .../check/testdata/class/generic/call.carbon | 14 +- .../generic/complete_in_conversion.carbon | 12 +- .../check/testdata/class/generic/field.carbon | 2 +- .../testdata/class/generic/import.carbon | 124 ++-- .../check/testdata/class/generic/init.carbon | 4 +- .../class/generic/member_access.carbon | 4 +- .../class/generic/member_lookup.carbon | 4 +- .../testdata/class/generic/redeclare.carbon | 6 +- .../testdata/class/generic/stringify.carbon | 18 +- toolchain/check/testdata/class/import.carbon | 90 +-- .../check/testdata/class/import_base.carbon | 60 +- .../testdata/class/import_indirect.carbon | 164 ++--- .../testdata/class/import_member_cycle.carbon | 18 +- .../testdata/class/import_struct_cyle.carbon | 26 +- .../testdata/class/inheritance_access.carbon | 22 +- toolchain/check/testdata/class/init.carbon | 2 +- toolchain/check/testdata/class/init_as.carbon | 6 +- .../check/testdata/class/init_nested.carbon | 2 +- toolchain/check/testdata/class/local.carbon | 6 +- toolchain/check/testdata/class/method.carbon | 6 +- .../check/testdata/class/nested_name.carbon | 2 +- .../class/no_prelude/export_name.carbon | 26 +- .../testdata/class/no_prelude/extern.carbon | 36 +- .../class/no_prelude/implicit_import.carbon | 28 +- .../class/no_prelude/import_access.carbon | 32 +- .../no_prelude/indirect_import_member.carbon | 176 +++--- .../no_definition_in_impl_file.carbon | 8 +- .../class/no_prelude/syntactic_merge.carbon | 36 +- .../check/testdata/class/raw_self.carbon | 2 +- .../check/testdata/class/redeclaration.carbon | 2 +- .../check/testdata/class/reenter_scope.carbon | 2 +- toolchain/check/testdata/class/reorder.carbon | 6 +- .../testdata/class/reorder_qualified.carbon | 6 +- toolchain/check/testdata/class/scope.carbon | 6 +- toolchain/check/testdata/class/self.carbon | 4 +- .../testdata/class/self_conversion.carbon | 6 +- .../check/testdata/class/self_type.carbon | 2 +- .../check/testdata/class/static_method.carbon | 2 +- .../class/syntactic_merge_literal.carbon | 12 +- .../class/todo_access_modifiers.carbon | 2 +- .../testdata/class/virtual_modifiers.carbon | 60 +- toolchain/check/testdata/const/basic.carbon | 2 +- .../check/testdata/const/collapse.carbon | 2 +- .../check/testdata/const/fail_collapse.carbon | 4 +- toolchain/check/testdata/const/import.carbon | 20 +- toolchain/check/testdata/deduce/array.carbon | 48 +- .../check/testdata/deduce/generic_type.carbon | 6 +- .../check/testdata/deduce/int_float.carbon | 32 +- toolchain/check/testdata/deduce/tuple.carbon | 6 +- .../check/testdata/eval/aggregate.carbon | 6 +- .../check/testdata/eval/fail_aggregate.carbon | 6 +- toolchain/check/testdata/eval/symbolic.carbon | 6 +- .../expr_category/in_place_tuple_init.carbon | 2 +- .../testdata/function/builtin/call.carbon | 8 +- .../function/builtin/definition.carbon | 2 +- .../function/builtin/fail_redefined.carbon | 2 +- .../testdata/function/builtin/method.carbon | 12 +- .../no_prelude/call_from_operator.carbon | 116 ++-- .../function/builtin/no_prelude/import.carbon | 28 +- .../function/call/fail_not_callable.carbon | 2 +- .../function/call/fail_param_count.carbon | 2 +- .../function/call/fail_param_type.carbon | 4 +- .../call/fail_return_type_mismatch.carbon | 6 +- .../check/testdata/function/call/i32.carbon | 6 +- .../function/call/more_param_ir.carbon | 6 +- .../testdata/function/call/params_one.carbon | 6 +- .../function/call/params_one_comma.carbon | 6 +- .../testdata/function/call/params_two.carbon | 6 +- .../function/call/params_two_comma.carbon | 6 +- .../call/prefer_unqualified_lookup.carbon | 6 +- .../declaration/fail_param_in_type.carbon | 2 +- .../declaration/fail_param_redecl.carbon | 2 +- .../function/declaration/import.carbon | 188 +++--- .../declaration/no_prelude/export_name.carbon | 10 +- .../declaration/no_prelude/extern.carbon | 6 +- .../no_prelude/extern_library.carbon | 4 +- .../fail_import_incomplete_return.carbon | 44 +- .../no_prelude/name_poisoning.carbon | 20 +- .../no_definition_in_impl_file.carbon | 8 +- .../declaration/param_same_name.carbon | 2 +- .../function/definition/import.carbon | 56 +- .../function/definition/import_access.carbon | 16 +- .../no_prelude/extern_library.carbon | 4 +- .../no_prelude/implicit_import.carbon | 12 +- .../no_prelude/syntactic_merge.carbon | 36 +- .../function/definition/params_one.carbon | 2 +- .../definition/params_one_comma.carbon | 2 +- .../function/definition/params_two.carbon | 2 +- .../definition/params_two_comma.carbon | 2 +- .../testdata/function/generic/deduce.carbon | 24 +- .../generic/no_prelude/import_specific.carbon | 12 +- .../function/generic/param_in_type.carbon | 6 +- .../function/generic/resolve_used.carbon | 12 +- .../function/generic/return_slot.carbon | 2 +- .../function/generic/undefined.carbon | 18 +- toolchain/check/testdata/generic/local.carbon | 6 +- toolchain/check/testdata/global/decl.carbon | 2 +- .../check/testdata/global/simple_init.carbon | 6 +- .../testdata/global/simple_with_fun.carbon | 6 +- toolchain/check/testdata/if/else.carbon | 2 +- .../if/fail_reachable_fallthrough.carbon | 8 +- toolchain/check/testdata/if/fail_scope.carbon | 8 +- toolchain/check/testdata/if/no_else.carbon | 2 +- .../if/unreachable_fallthrough.carbon | 8 +- toolchain/check/testdata/if_expr/basic.carbon | 8 +- .../if_expr/constant_condition.carbon | 6 +- .../testdata/if_expr/control_flow.carbon | 8 +- .../if_expr/fail_not_in_function.carbon | 6 +- .../if_expr/fail_partial_constant.carbon | 6 +- .../check/testdata/if_expr/nested.carbon | 8 +- .../check/testdata/if_expr/struct.carbon | 8 +- toolchain/check/testdata/impl/compound.carbon | 2 +- .../check/testdata/impl/declaration.carbon | 2 +- toolchain/check/testdata/impl/empty.carbon | 2 +- .../testdata/impl/extend_impl_generic.carbon | 6 +- .../testdata/impl/fail_call_invalid.carbon | 2 +- .../impl/fail_extend_impl_scope.carbon | 2 +- .../impl/fail_extend_impl_type_as.carbon | 2 +- .../impl/fail_extend_non_interface.carbon | 2 +- .../impl/fail_impl_bad_assoc_fn.carbon | 4 +- .../impl/fail_impl_bad_interface.carbon | 8 +- .../testdata/impl/fail_redefinition.carbon | 2 +- .../impl/fail_self_type_mismatch.carbon | 2 +- .../impl/fail_todo_use_assoc_const.carbon | 12 +- .../lookup/fail_todo_undefined_impl.carbon | 2 +- .../impl/lookup/instance_method.carbon | 2 +- .../impl/lookup/no_prelude/import.carbon | 574 +++++++++--------- .../lookup/no_prelude/specific_args.carbon | 256 ++++---- .../testdata/impl/lookup/transitive.carbon | 80 +-- .../no_prelude/import_builtin_call.carbon | 130 ++-- .../impl/no_prelude/import_extend_impl.carbon | 54 +- .../impl/no_prelude/import_generic.carbon | 104 ++-- .../import_interface_assoc_const.carbon | 410 ++++++------- .../impl/no_prelude/import_self.carbon | 24 +- .../impl/no_prelude/import_use_generic.carbon | 56 +- .../impl/no_prelude/interface_args.carbon | 320 +++++----- .../no_definition_in_impl_file.carbon | 52 +- .../check/testdata/impl/redeclaration.carbon | 2 +- .../index/array_element_access.carbon | 6 +- .../check/testdata/index/expr_category.carbon | 6 +- .../index/fail_array_large_index.carbon | 6 +- .../index/fail_array_non_int_indexing.carbon | 6 +- .../fail_array_out_of_bound_access.carbon | 6 +- .../testdata/index/fail_expr_category.carbon | 6 +- .../testdata/index/fail_invalid_base.carbon | 4 +- .../testdata/index/fail_name_not_found.carbon | 2 +- .../index/fail_negative_indexing.carbon | 10 +- .../index/fail_non_tuple_access.carbon | 2 +- .../testdata/interface/assoc_const.carbon | 2 +- .../fail_assoc_const_bad_default.carbon | 2 +- .../fail_todo_assoc_const_default.carbon | 6 +- .../fail_todo_define_default_fn_inline.carbon | 2 +- ..._todo_define_default_fn_out_of_line.carbon | 2 +- .../testdata/interface/member_lookup.carbon | 4 +- .../interface/no_prelude/export_name.carbon | 18 +- .../fail_definition_imported.carbon | 4 +- .../no_prelude/generic_import.carbon | 26 +- .../interface/no_prelude/import.carbon | 98 +-- .../interface/no_prelude/import_access.carbon | 20 +- .../no_prelude/import_interface_decl.carbon | 18 +- .../no_prelude/syntactic_merge.carbon | 48 +- .../interface/todo_define_not_default.carbon | 6 +- .../ir/duplicate_name_same_line.carbon | 6 +- .../testdata/let/compile_time_bindings.carbon | 26 +- toolchain/check/testdata/let/convert.carbon | 6 +- .../testdata/let/fail_duplicate_decl.carbon | 6 +- .../check/testdata/let/fail_generic.carbon | 4 +- .../testdata/let/fail_generic_import.carbon | 8 +- .../testdata/let/fail_missing_value.carbon | 2 +- .../check/testdata/let/fail_modifiers.carbon | 6 +- .../testdata/let/fail_use_in_init.carbon | 2 +- toolchain/check/testdata/let/generic.carbon | 2 +- .../check/testdata/let/generic_import.carbon | 10 +- toolchain/check/testdata/let/global.carbon | 6 +- toolchain/check/testdata/let/local.carbon | 2 +- .../testdata/let/no_prelude/import.carbon | 12 +- .../let/no_prelude/import_access.carbon | 6 +- .../check/testdata/let/shadowed_decl.carbon | 6 +- .../testdata/namespace/add_to_import.carbon | 10 +- .../check/testdata/namespace/alias.carbon | 6 +- .../fail_conflict_after_merge.carbon | 4 +- ...l_conflict_imported_namespace_first.carbon | 4 +- ..._conflict_imported_namespace_nested.carbon | 4 +- ..._conflict_imported_namespace_second.carbon | 4 +- ...conflict_in_imports_namespace_first.carbon | 6 +- ...onflict_in_imports_namespace_second.carbon | 6 +- .../namespace/fail_decl_in_alias.carbon | 6 +- .../testdata/namespace/fail_params.carbon | 2 +- .../check/testdata/namespace/imported.carbon | 24 +- .../namespace/imported_indirect.carbon | 56 +- .../check/testdata/namespace/merging.carbon | 28 +- .../merging_with_indirections.carbon | 46 +- .../check/testdata/namespace/shadow.carbon | 6 +- .../testdata/operators/builtin/and.carbon | 2 +- .../operators/builtin/assignment.carbon | 6 +- .../fail_and_or_not_in_function.carbon | 6 +- .../fail_and_or_partial_constant.carbon | 4 +- .../fail_assignment_to_non_assignable.carbon | 6 +- .../fail_redundant_compound_access.carbon | 6 +- .../builtin/fail_type_mismatch.carbon | 4 +- .../fail_type_mismatch_assignment.carbon | 6 +- .../builtin/fail_type_mismatch_once.carbon | 4 +- .../builtin/fail_unimplemented_op.carbon | 4 +- .../testdata/operators/builtin/or.carbon | 2 +- .../operators/builtin/unary_op.carbon | 2 +- .../testdata/operators/overloaded/add.carbon | 12 +- .../operators/overloaded/bit_and.carbon | 12 +- .../overloaded/bit_complement.carbon | 6 +- .../operators/overloaded/bit_or.carbon | 12 +- .../operators/overloaded/bit_xor.carbon | 12 +- .../testdata/operators/overloaded/dec.carbon | 6 +- .../testdata/operators/overloaded/div.carbon | 12 +- .../testdata/operators/overloaded/eq.carbon | 22 +- .../overloaded/fail_assign_non_ref.carbon | 12 +- .../overloaded/fail_error_recovery.carbon | 6 +- .../operators/overloaded/fail_no_impl.carbon | 8 +- .../overloaded/fail_no_impl_for_arg.carbon | 14 +- .../operators/overloaded/implicit_as.carbon | 10 +- .../testdata/operators/overloaded/inc.carbon | 6 +- .../operators/overloaded/index.carbon | 30 +- .../operators/overloaded/left_shift.carbon | 12 +- .../testdata/operators/overloaded/mod.carbon | 12 +- .../testdata/operators/overloaded/mul.carbon | 12 +- .../operators/overloaded/negate.carbon | 6 +- .../operators/overloaded/ordered.carbon | 12 +- .../operators/overloaded/right_shift.carbon | 12 +- .../testdata/operators/overloaded/sub.carbon | 12 +- .../package_expr/fail_not_found.carbon | 2 +- .../check/testdata/package_expr/syntax.carbon | 12 +- .../fail_conflict_no_namespaces.carbon | 6 +- .../packages/fail_import_type_error.carbon | 26 +- .../packages/implicit_imports_prelude.carbon | 14 +- .../testdata/packages/loaded_global.carbon | 16 +- .../no_prelude/cross_package_export.carbon | 214 +++---- .../no_prelude/cross_package_import.carbon | 36 +- .../packages/no_prelude/export_import.carbon | 204 +++---- .../packages/no_prelude/export_mixed.carbon | 164 ++--- .../packages/no_prelude/export_name.carbon | 376 ++++++------ .../no_prelude/fail_export_name_member.carbon | 16 +- .../no_prelude/fail_export_name_params.carbon | 8 +- .../implicit_imports_entities.carbon | 120 ++-- .../no_prelude/missing_prelude.carbon | 2 +- .../packages/unused_lazy_import.carbon | 4 +- .../testdata/pointer/address_of_deref.carbon | 6 +- .../testdata/pointer/address_of_lvalue.carbon | 6 +- toolchain/check/testdata/pointer/basic.carbon | 6 +- .../pointer/fail_address_of_value.carbon | 2 +- .../testdata/pointer/fail_deref_error.carbon | 2 +- .../pointer/fail_deref_not_pointer.carbon | 2 +- .../testdata/pointer/fail_deref_type.carbon | 2 +- .../pointer/fail_type_mismatch.carbon | 2 +- .../check/testdata/pointer/import.carbon | 18 +- .../testdata/pointer/nested_const.carbon | 2 +- toolchain/check/testdata/pointer/types.carbon | 2 +- .../testdata/return/code_after_return.carbon | 4 +- .../return/code_after_return_value.carbon | 8 +- .../testdata/return/fail_call_in_type.carbon | 2 +- .../return/fail_missing_return.carbon | 2 +- .../fail_return_var_no_returned_var.carbon | 2 +- .../fail_return_with_returned_var.carbon | 6 +- .../return/fail_returned_var_shadow.carbon | 6 +- .../return/fail_returned_var_type.carbon | 4 +- .../testdata/return/fail_type_mismatch.carbon | 4 +- .../testdata/return/fail_value_missing.carbon | 2 +- .../testdata/return/fail_var_in_type.carbon | 2 +- .../no_prelude/import_convert_function.carbon | 250 ++++---- .../check/testdata/return/returned_var.carbon | 6 +- .../testdata/return/returned_var_scope.carbon | 8 +- toolchain/check/testdata/return/struct.carbon | 6 +- toolchain/check/testdata/return/tuple.carbon | 6 +- toolchain/check/testdata/return/value.carbon | 6 +- .../testdata/struct/fail_assign_empty.carbon | 2 +- .../struct/fail_duplicate_name.carbon | 2 +- .../struct/fail_field_name_mismatch.carbon | 2 +- .../struct/fail_field_type_mismatch.carbon | 2 +- .../struct/fail_member_access_type.carbon | 4 +- .../struct/fail_non_member_access.carbon | 6 +- .../struct/fail_too_few_values.carbon | 2 +- .../testdata/struct/fail_type_assign.carbon | 4 +- .../testdata/struct/fail_value_as_type.carbon | 2 +- toolchain/check/testdata/struct/import.carbon | 104 ++-- .../struct/literal_member_access.carbon | 2 +- .../testdata/struct/member_access.carbon | 8 +- .../struct/nested_struct_in_place.carbon | 2 +- .../check/testdata/struct/one_entry.carbon | 6 +- .../testdata/struct/partially_const.carbon | 6 +- .../testdata/struct/reorder_fields.carbon | 4 +- .../testdata/struct/tuple_as_element.carbon | 6 +- .../check/testdata/struct/two_entries.carbon | 6 +- .../tuple/access/element_access.carbon | 6 +- .../tuple/access/fail_access_error.carbon | 6 +- .../tuple/access/fail_large_index.carbon | 6 +- .../access/fail_negative_indexing.carbon | 10 +- .../access/fail_non_deterministic_type.carbon | 6 +- .../tuple/access/fail_non_int_indexing.carbon | 6 +- .../tuple/access/fail_non_tuple_access.carbon | 8 +- .../access/fail_out_of_bound_access.carbon | 6 +- .../fail_out_of_bound_not_literal.carbon | 6 +- .../tuple/access/index_not_literal.carbon | 14 +- .../tuple/access/return_value_access.carbon | 6 +- .../testdata/tuple/fail_assign_nested.carbon | 2 +- .../tuple/fail_element_type_mismatch.carbon | 6 +- .../tuple/fail_nested_incomplete.carbon | 2 +- .../tuple/fail_too_few_element.carbon | 2 +- .../testdata/tuple/fail_type_assign.carbon | 4 +- .../testdata/tuple/fail_value_as_type.carbon | 2 +- toolchain/check/testdata/tuple/import.carbon | 104 ++-- .../check/testdata/tuple/nested_tuple.carbon | 6 +- .../tuple/nested_tuple_in_place.carbon | 6 +- .../check/testdata/tuple/one_element.carbon | 6 +- .../check/testdata/tuple/two_elements.carbon | 6 +- .../var/fail_storage_is_literal.carbon | 2 +- .../var/fail_todo_control_flow_init.carbon | 2 +- .../var/no_prelude/export_name.carbon | 10 +- .../testdata/var/no_prelude/import.carbon | 6 +- .../var/no_prelude/import_access.carbon | 6 +- .../testdata/where_expr/constraints.carbon | 38 +- .../testdata/where_expr/dot_self_index.carbon | 4 +- .../testdata/where_expr/equal_rewrite.carbon | 82 +-- .../testdata/where_expr/fail_not_facet.carbon | 6 +- .../testdata/where_expr/non_generic.carbon | 2 +- .../testdata/while/break_continue.carbon | 2 +- .../testdata/while/fail_bad_condition.carbon | 2 +- .../testdata/while/unreachable_end.carbon | 2 +- toolchain/check/testdata/while/while.carbon | 2 +- .../multifile_raw_and_textual_ir.carbon | 6 +- toolchain/sem_ir/inst_namer.cpp | 27 +- 418 files changed, 4164 insertions(+), 4139 deletions(-) diff --git a/toolchain/check/testdata/alias/fail_bool_value.carbon b/toolchain/check/testdata/alias/fail_bool_value.carbon index 5c9c45d73d5a..e8c5b428073e 100644 --- a/toolchain/check/testdata/alias/fail_bool_value.carbon +++ b/toolchain/check/testdata/alias/fail_bool_value.carbon @@ -25,7 +25,7 @@ let a_test: bool = a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/alias/fail_builtins.carbon b/toolchain/check/testdata/alias/fail_builtins.carbon index 0d60e0484c95..fd4f0bdffa1b 100644 --- a/toolchain/check/testdata/alias/fail_builtins.carbon +++ b/toolchain/check/testdata/alias/fail_builtins.carbon @@ -31,8 +31,8 @@ alias b = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/alias/no_prelude/export_name.carbon b/toolchain/check/testdata/alias/no_prelude/export_name.carbon index 9f3f634b6001..b0da1b4a1995 100644 --- a/toolchain/check/testdata/alias/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/alias/no_prelude/export_name.carbon @@ -104,26 +104,26 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//base, C, unloaded -// CHECK:STDOUT: %import_ref.05a: type = import_ref Main//base, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.D: type = import_ref Main//base, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .D = %D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %D: type = export D, imports.%import_ref.05a [template = constants.%C] +// CHECK:STDOUT: %D: type = export D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_orig.carbon @@ -135,26 +135,26 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.909 = import_ref Main//base, D, unloaded -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D = import_ref Main//base, D, unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: .D = imports.%import_ref.909 +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- use_export.carbon @@ -167,14 +167,14 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.c3f: type = import_ref Main//export, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//export, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export, inst21 [indirect], unloaded +// CHECK:STDOUT: %Main.D: type = import_ref Main//export, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//export, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst21 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.c3f +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .d = %d // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -183,15 +183,15 @@ var d: D* = &c; // CHECK:STDOUT: %.loc6: %C = var_pattern %d.patt // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %C = var d -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.c3f [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %d: ref %C = bind_name d, %d.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -210,12 +210,12 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//export, D, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//export, D, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -246,16 +246,16 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.c3f: type = import_ref Main//export, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_orig, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//export_orig, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_orig, inst21 [indirect], unloaded +// CHECK:STDOUT: %Main.D: type = import_ref Main//export, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_orig, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//export_orig, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_orig, inst21 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.c3f -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d // CHECK:STDOUT: } @@ -265,7 +265,7 @@ var d: D* = &c; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %ptr.019 = binding_pattern d @@ -273,17 +273,17 @@ var d: D* = &c; // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %ptr.019 = var d // CHECK:STDOUT: %.loc8_9: type = splice_block %ptr [template = constants.%ptr.019] { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.c3f [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C [template = constants.%ptr.019] // CHECK:STDOUT: } // CHECK:STDOUT: %d: ref %ptr.019 = bind_name d, %d.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_orig.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/alias/no_prelude/import.carbon b/toolchain/check/testdata/alias/no_prelude/import.carbon index 6cdc57bca169..7f5c5b272fde 100644 --- a/toolchain/check/testdata/alias/no_prelude/import.carbon +++ b/toolchain/check/testdata/alias/no_prelude/import.carbon @@ -115,41 +115,41 @@ var c: () = a_alias_alias; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//class1, C, unloaded -// CHECK:STDOUT: %import_ref.204: type = import_ref Main//class1, c_alias, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.6da = import_ref Main//class1, a, unloaded -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//class1, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//class1, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//class1, C, unloaded +// CHECK:STDOUT: %Main.c_alias: type = import_ref Main//class1, c_alias, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.a = import_ref Main//class1, a, unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//class1, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//class1, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .c_alias = imports.%import_ref.204 -// CHECK:STDOUT: .a = imports.%import_ref.6da +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .c_alias = imports.%Main.c_alias +// CHECK:STDOUT: .a = imports.%Main.a // CHECK:STDOUT: .c_alias_alias = %c_alias_alias // CHECK:STDOUT: .b = %b // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %c_alias.ref.loc6: type = name_ref c_alias, imports.%import_ref.204 [template = constants.%C] -// CHECK:STDOUT: %c_alias_alias: type = bind_alias c_alias_alias, imports.%import_ref.204 [template = constants.%C] +// CHECK:STDOUT: %c_alias.ref.loc6: type = name_ref c_alias, imports.%Main.c_alias [template = constants.%C] +// CHECK:STDOUT: %c_alias_alias: type = bind_alias c_alias_alias, imports.%Main.c_alias [template = constants.%C] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %ptr = binding_pattern b // CHECK:STDOUT: %.loc8_1: %ptr = var_pattern %b.patt // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref %ptr = var b // CHECK:STDOUT: %.loc8_15: type = splice_block %ptr [template = constants.%ptr] { -// CHECK:STDOUT: %c_alias.ref.loc8: type = name_ref c_alias, imports.%import_ref.204 [template = constants.%C] +// CHECK:STDOUT: %c_alias.ref.loc8: type = name_ref c_alias, imports.%Main.c_alias [template = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C [template = constants.%ptr] // CHECK:STDOUT: } // CHECK:STDOUT: %b: ref %ptr = bind_name b, %b.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "class1.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- class3.carbon @@ -162,16 +162,16 @@ var c: () = a_alias_alias; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3fd: type = import_ref Main//class2, c_alias_alias, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.b9b = import_ref Main//class2, b, unloaded -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//class2, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//class2, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.c_alias_alias: type = import_ref Main//class2, c_alias_alias, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b = import_ref Main//class2, b, unloaded +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//class2, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//class2, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .c_alias_alias = imports.%import_ref.3fd -// CHECK:STDOUT: .b = imports.%import_ref.b9b +// CHECK:STDOUT: .c_alias_alias = imports.%Main.c_alias_alias +// CHECK:STDOUT: .b = imports.%Main.b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -181,17 +181,17 @@ var c: () = a_alias_alias; // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %ptr = var c // CHECK:STDOUT: %.loc6_21: type = splice_block %ptr [template = constants.%ptr] { -// CHECK:STDOUT: %c_alias_alias.ref: type = name_ref c_alias_alias, imports.%import_ref.3fd [template = constants.%C] +// CHECK:STDOUT: %c_alias_alias.ref: type = name_ref c_alias_alias, imports.%Main.c_alias_alias [template = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C [template = constants.%ptr] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %ptr = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "class2.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- var1.carbon @@ -237,20 +237,20 @@ var c: () = a_alias_alias; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0e2 = import_ref Main//var1, a, unloaded -// CHECK:STDOUT: %import_ref.22c: ref %empty_tuple.type = import_ref Main//var1, a_alias, loaded +// CHECK:STDOUT: %Main.a = import_ref Main//var1, a, unloaded +// CHECK:STDOUT: %Main.a_alias: ref %empty_tuple.type = import_ref Main//var1, a_alias, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a = imports.%import_ref.0e2 -// CHECK:STDOUT: .a_alias = imports.%import_ref.22c +// CHECK:STDOUT: .a = imports.%Main.a +// CHECK:STDOUT: .a_alias = imports.%Main.a_alias // CHECK:STDOUT: .a_alias_alias = %a_alias_alias // CHECK:STDOUT: .b = %b // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %a_alias.ref: ref %empty_tuple.type = name_ref a_alias, imports.%import_ref.22c -// CHECK:STDOUT: %a_alias_alias: ref %empty_tuple.type = bind_alias a_alias_alias, imports.%import_ref.22c +// CHECK:STDOUT: %a_alias.ref: ref %empty_tuple.type = name_ref a_alias, imports.%Main.a_alias +// CHECK:STDOUT: %a_alias_alias: ref %empty_tuple.type = bind_alias a_alias_alias, imports.%Main.a_alias // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %empty_tuple.type = binding_pattern b // CHECK:STDOUT: %.loc8_1: %empty_tuple.type = var_pattern %b.patt @@ -265,7 +265,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_alias.ref: ref %empty_tuple.type = name_ref a_alias, imports.%import_ref.22c +// CHECK:STDOUT: %a_alias.ref: ref %empty_tuple.type = name_ref a_alias, imports.%Main.a_alias // CHECK:STDOUT: %.loc8_13: init %empty_tuple.type = tuple_init () to file.%b.var [template = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_1: init %empty_tuple.type = converted %a_alias.ref, %.loc8_13 [template = constants.%empty_tuple] // CHECK:STDOUT: assign file.%b.var, %.loc8_1 @@ -280,14 +280,14 @@ var c: () = a_alias_alias; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.692: ref %empty_tuple.type = import_ref Main//var2, a_alias_alias, loaded [template = ] -// CHECK:STDOUT: %import_ref.bb6 = import_ref Main//var2, b, unloaded +// CHECK:STDOUT: %Main.a_alias_alias: ref %empty_tuple.type = import_ref Main//var2, a_alias_alias, loaded [template = ] +// CHECK:STDOUT: %Main.b = import_ref Main//var2, b, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_alias_alias = imports.%import_ref.692 -// CHECK:STDOUT: .b = imports.%import_ref.bb6 +// CHECK:STDOUT: .a_alias_alias = imports.%Main.a_alias_alias +// CHECK:STDOUT: .b = imports.%Main.b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -305,7 +305,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_alias_alias.ref: ref %empty_tuple.type = name_ref a_alias_alias, imports.%import_ref.692 [template = ] +// CHECK:STDOUT: %a_alias_alias.ref: ref %empty_tuple.type = name_ref a_alias_alias, imports.%Main.a_alias_alias [template = ] // CHECK:STDOUT: %.loc11_13: init %empty_tuple.type = tuple_init () to file.%c.var [template = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_1: init %empty_tuple.type = converted %a_alias_alias.ref, %.loc11_13 [template = constants.%empty_tuple] // CHECK:STDOUT: assign file.%c.var, %.loc11_1 diff --git a/toolchain/check/testdata/alias/no_prelude/import_access.carbon b/toolchain/check/testdata/alias/no_prelude/import_access.carbon index 58ead31538d9..1fd0c624c306 100644 --- a/toolchain/check/testdata/alias/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/alias/no_prelude/import_access.carbon @@ -89,16 +89,16 @@ var inst: Test.A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Test//def, C, unloaded -// CHECK:STDOUT: %import_ref.323: type = import_ref Test//def, A, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Test//def, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Test//def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Test.C = import_ref Test//def, C, unloaded +// CHECK:STDOUT: %Test.A: type = import_ref Test//def, A, loaded [template = constants.%C] +// CHECK:STDOUT: %Test.import_ref.8f2: = import_ref Test//def, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Test.import_ref.2c4 = import_ref Test//def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .A [private] = imports.%import_ref.323 +// CHECK:STDOUT: .C = imports.%Test.C +// CHECK:STDOUT: .A [private] = imports.%Test.A // CHECK:STDOUT: .inst = %inst // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -108,15 +108,15 @@ var inst: Test.A = {}; // CHECK:STDOUT: %.loc4: %C = var_pattern %inst.patt // CHECK:STDOUT: } // CHECK:STDOUT: %inst.var: ref %C = var inst -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.323 [template = constants.%C] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Test.A [template = constants.%C] // CHECK:STDOUT: %inst: ref %C = bind_name inst, %inst.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "def.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Test.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Test.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -135,12 +135,12 @@ var inst: Test.A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Test//def, C, unloaded +// CHECK:STDOUT: %Test.C = import_ref Test//def, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Test.C // CHECK:STDOUT: .inst = %inst // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import diff --git a/toolchain/check/testdata/alias/no_prelude/import_order.carbon b/toolchain/check/testdata/alias/no_prelude/import_order.carbon index 495d9f4a654f..6b269504fa0a 100644 --- a/toolchain/check/testdata/alias/no_prelude/import_order.carbon +++ b/toolchain/check/testdata/alias/no_prelude/import_order.carbon @@ -86,23 +86,23 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//a, C, unloaded -// CHECK:STDOUT: %import_ref.e38: type = import_ref Main//a, a, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.fb0: type = import_ref Main//a, b, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.610: type = import_ref Main//a, c, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.14f: type = import_ref Main//a, d, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.146: = import_ref Main//a, loc4_22, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.f99: %C.elem = import_ref Main//a, loc4_16, loaded [template = %.2fc] +// CHECK:STDOUT: %Main.C = import_ref Main//a, C, unloaded +// CHECK:STDOUT: %Main.a: type = import_ref Main//a, a, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b: type = import_ref Main//a, b, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.c: type = import_ref Main//a, c, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.d: type = import_ref Main//a, d, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.146: = import_ref Main//a, loc4_22, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.f99: %C.elem = import_ref Main//a, loc4_16, loaded [template = %.2fc] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .a = imports.%import_ref.e38 -// CHECK:STDOUT: .b = imports.%import_ref.fb0 -// CHECK:STDOUT: .c = imports.%import_ref.610 -// CHECK:STDOUT: .d = imports.%import_ref.14f +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .a = imports.%Main.a +// CHECK:STDOUT: .b = imports.%Main.b +// CHECK:STDOUT: .c = imports.%Main.c +// CHECK:STDOUT: .d = imports.%Main.d // CHECK:STDOUT: .d_val = %d_val // CHECK:STDOUT: .c_val = %c_val // CHECK:STDOUT: .b_val = %b_val @@ -114,37 +114,37 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %.loc7: %C = var_pattern %d_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %d_val.var: ref %C = var d_val -// CHECK:STDOUT: %d.ref: type = name_ref d, imports.%import_ref.14f [template = constants.%C] +// CHECK:STDOUT: %d.ref: type = name_ref d, imports.%Main.d [template = constants.%C] // CHECK:STDOUT: %d_val: ref %C = bind_name d_val, %d_val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_val.patt: %C = binding_pattern c_val // CHECK:STDOUT: %.loc8: %C = var_pattern %c_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c_val.var: ref %C = var c_val -// CHECK:STDOUT: %c.ref: type = name_ref c, imports.%import_ref.610 [template = constants.%C] +// CHECK:STDOUT: %c.ref: type = name_ref c, imports.%Main.c [template = constants.%C] // CHECK:STDOUT: %c_val: ref %C = bind_name c_val, %c_val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_val.patt: %C = binding_pattern b_val // CHECK:STDOUT: %.loc9: %C = var_pattern %b_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %b_val.var: ref %C = var b_val -// CHECK:STDOUT: %b.ref: type = name_ref b, imports.%import_ref.fb0 [template = constants.%C] +// CHECK:STDOUT: %b.ref: type = name_ref b, imports.%Main.b [template = constants.%C] // CHECK:STDOUT: %b_val: ref %C = bind_name b_val, %b_val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a_val.patt: %C = binding_pattern a_val // CHECK:STDOUT: %.loc10: %C = var_pattern %a_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %a_val.var: ref %C = var a_val -// CHECK:STDOUT: %a.ref: type = name_ref a, imports.%import_ref.e38 [template = constants.%C] +// CHECK:STDOUT: %a.ref: type = name_ref a, imports.%Main.a [template = constants.%C] // CHECK:STDOUT: %a_val: ref %C = bind_name a_val, %a_val.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.146 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.146 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .v = imports.%import_ref.f99 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .v = imports.%Main.import_ref.f99 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -158,7 +158,7 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %.loc7_1: init %C = converted %.loc7_24.1, %.loc7_24.4 [template = constants.%C.val] // CHECK:STDOUT: assign file.%d_val.var, %.loc7_1 // CHECK:STDOUT: %d_val.ref: ref %C = name_ref d_val, file.%d_val -// CHECK:STDOUT: %v.ref.loc8: %C.elem = name_ref v, imports.%import_ref.f99 [template = imports.%.2fc] +// CHECK:STDOUT: %v.ref.loc8: %C.elem = name_ref v, imports.%Main.import_ref.f99 [template = imports.%.2fc] // CHECK:STDOUT: %.loc8_27.1: ref %empty_tuple.type = class_element_access %d_val.ref, element0 // CHECK:STDOUT: %.loc8_29.1: %struct_type.v = struct_literal (%.loc8_27.1) // CHECK:STDOUT: %.loc8_29.2: ref %empty_tuple.type = class_element_access file.%c_val.var, element0 @@ -168,7 +168,7 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %.loc8_1: init %C = converted %.loc8_29.1, %.loc8_29.4 [template = constants.%C.val] // CHECK:STDOUT: assign file.%c_val.var, %.loc8_1 // CHECK:STDOUT: %c_val.ref: ref %C = name_ref c_val, file.%c_val -// CHECK:STDOUT: %v.ref.loc9: %C.elem = name_ref v, imports.%import_ref.f99 [template = imports.%.2fc] +// CHECK:STDOUT: %v.ref.loc9: %C.elem = name_ref v, imports.%Main.import_ref.f99 [template = imports.%.2fc] // CHECK:STDOUT: %.loc9_27.1: ref %empty_tuple.type = class_element_access %c_val.ref, element0 // CHECK:STDOUT: %.loc9_29.1: %struct_type.v = struct_literal (%.loc9_27.1) // CHECK:STDOUT: %.loc9_29.2: ref %empty_tuple.type = class_element_access file.%b_val.var, element0 @@ -178,7 +178,7 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %.loc9_1: init %C = converted %.loc9_29.1, %.loc9_29.4 [template = constants.%C.val] // CHECK:STDOUT: assign file.%b_val.var, %.loc9_1 // CHECK:STDOUT: %b_val.ref: ref %C = name_ref b_val, file.%b_val -// CHECK:STDOUT: %v.ref.loc10: %C.elem = name_ref v, imports.%import_ref.f99 [template = imports.%.2fc] +// CHECK:STDOUT: %v.ref.loc10: %C.elem = name_ref v, imports.%Main.import_ref.f99 [template = imports.%.2fc] // CHECK:STDOUT: %.loc10_27.1: ref %empty_tuple.type = class_element_access %b_val.ref, element0 // CHECK:STDOUT: %.loc10_29.1: %struct_type.v = struct_literal (%.loc10_27.1) // CHECK:STDOUT: %.loc10_29.2: ref %empty_tuple.type = class_element_access file.%a_val.var, element0 diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index 47ef1d7d7e35..058c2b2694cc 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -34,7 +34,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/array_vs_tuple.carbon b/toolchain/check/testdata/array/array_vs_tuple.carbon index a47f72d980c0..e54696322d58 100644 --- a/toolchain/check/testdata/array/array_vs_tuple.carbon +++ b/toolchain/check/testdata/array/array_vs_tuple.carbon @@ -28,7 +28,7 @@ fn G() { // CHECK:STDOUT: %tuple.type.37f: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -48,8 +48,8 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index e882233d4369..e64bf3072b1e 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -26,7 +26,7 @@ fn Run() { // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -41,8 +41,8 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index 54975068a189..936fd6d0c616 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -23,7 +23,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %tuple.type.37f: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -42,8 +42,8 @@ var b: [i32; 3] = a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/base.carbon b/toolchain/check/testdata/array/base.carbon index 48384a449b55..2fcd7fb4c4f3 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -23,7 +23,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -50,9 +50,9 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/canonicalize_index.carbon b/toolchain/check/testdata/array/canonicalize_index.carbon index 03a5b9223a07..82cab4566d81 100644 --- a/toolchain/check/testdata/array/canonicalize_index.carbon +++ b/toolchain/check/testdata/array/canonicalize_index.carbon @@ -29,7 +29,7 @@ let c: [i32; ConvertToU32(3)]* = &a; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -39,7 +39,7 @@ let c: [i32; ConvertToU32(3)]* = &a; // CHECK:STDOUT: %Convert.specific_fn.787: = specific_function %Convert.bound.ef9, @Convert.2(%int_32) [template] // CHECK:STDOUT: %int_2.ef8: %i32 = int_value 2 [template] // CHECK:STDOUT: %int_3.822: %i32 = int_value 3 [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound.2d6: = bound_method %int_3.822, %Convert.960 [template] @@ -53,7 +53,7 @@ let c: [i32; ConvertToU32(3)]* = &a; // CHECK:STDOUT: %Convert.specific_fn.b42: = specific_function %Convert.bound.b30, @Convert.2(%int_32) [template] // CHECK:STDOUT: %array: %array_type = tuple_value (%int_1.5d2, %int_2.ef8, %int_3.822) [template] // CHECK:STDOUT: %int_3.d14: %u32 = int_value 3 [template] -// CHECK:STDOUT: %impl_witness.8da2: = impl_witness (imports.%import_ref.823), @impl.45(%int_32) [template] +// CHECK:STDOUT: %impl_witness.8da2: = impl_witness (imports.%Core.import_ref.823), @impl.45(%int_32) [template] // CHECK:STDOUT: %Convert.type.e06: type = fn_type @Convert.9, @impl.45(%int_32) [template] // CHECK:STDOUT: %Convert.47f: %Convert.type.e06 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.258: = bound_method %int_3.d14, %Convert.47f [template] @@ -62,9 +62,9 @@ let c: [i32; ConvertToU32(3)]* = &a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .UInt = %import_ref.bcd -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .UInt = %Core.UInt +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_bound_negative.carbon b/toolchain/check/testdata/array/fail_bound_negative.carbon index 3bc28089c175..1742c26b8833 100644 --- a/toolchain/check/testdata/array/fail_bound_negative.carbon +++ b/toolchain/check/testdata/array/fail_bound_negative.carbon @@ -26,14 +26,14 @@ var a: [i32; Negate(1)]; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] // CHECK:STDOUT: %Convert.specific_fn.70c: = specific_function %Convert.bound.ab5, @Convert.2(%int_32) [template] // CHECK:STDOUT: %int_1.5d2: %i32 = int_value 1 [template] // CHECK:STDOUT: %int_-1.251: %i32 = int_value -1 [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound.75d: = bound_method %int_-1.251, %Convert.960 [template] @@ -43,8 +43,8 @@ var a: [i32; Negate(1)]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_bound_overflow.carbon b/toolchain/check/testdata/array/fail_bound_overflow.carbon index f0383fd0f9c5..507bd6a2da56 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -34,8 +34,8 @@ var b: [1; 39999999999999999993]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index 04c03c4d3383..11fdcba7bbb7 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -25,7 +25,7 @@ var a: [1; 1]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_out_of_bound.carbon b/toolchain/check/testdata/array/fail_out_of_bound.carbon index 87d051af2671..c607eb15d453 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -28,7 +28,7 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon index 986b95df8215..5d9134e11a15 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon @@ -27,7 +27,7 @@ var b: i32 = a[{.index = 3}.index]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,8 +46,8 @@ var b: i32 = a[{.index = 3}.index]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/fail_type_mismatch.carbon b/toolchain/check/testdata/array/fail_type_mismatch.carbon index aedc64a23f0f..b6a807688ef8 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -53,7 +53,7 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: %tuple.type.b0f: type = tuple_type (Core.IntLiteral, String, String) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -69,8 +69,8 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index 7c62c873840f..48c6a1cb881b 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -32,7 +32,7 @@ fn G() -> i32 { // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -49,8 +49,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/import.carbon b/toolchain/check/testdata/array/import.carbon index de00f797d4ca..dda2c5afc02b 100644 --- a/toolchain/check/testdata/array/import.carbon +++ b/toolchain/check/testdata/array/import.carbon @@ -35,7 +35,7 @@ fn G(n: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -76,9 +76,9 @@ fn G(n: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Main//library, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.F: %F.type = import_ref Main//library, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -86,7 +86,7 @@ fn G(n: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } @@ -113,7 +113,7 @@ fn G(n: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%n.param_patt: %i32) -> %i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [template = constants.%F] // CHECK:STDOUT: %.loc5_12.1: ref %array_type = temporary_storage // CHECK:STDOUT: %F.call: init %array_type = call %F.ref() to %.loc5_12.1 // CHECK:STDOUT: %n.ref: %i32 = name_ref n, %n diff --git a/toolchain/check/testdata/array/index_not_literal.carbon b/toolchain/check/testdata/array/index_not_literal.carbon index 4abdeb61c058..986321b9e9d8 100644 --- a/toolchain/check/testdata/array/index_not_literal.carbon +++ b/toolchain/check/testdata/array/index_not_literal.carbon @@ -23,7 +23,7 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -42,8 +42,8 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/init_dependent_bound.carbon b/toolchain/check/testdata/array/init_dependent_bound.carbon index d420d657b585..6d19eb3f8e51 100644 --- a/toolchain/check/testdata/array/init_dependent_bound.carbon +++ b/toolchain/check/testdata/array/init_dependent_bound.carbon @@ -45,7 +45,7 @@ fn H() { G(3); } // CHECK:STDOUT: %F.type: type = fn_type @F [template] // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %N.51e, %Convert.960 [symbolic] @@ -61,8 +61,8 @@ fn H() { G(3); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/nine_elements.carbon b/toolchain/check/testdata/array/nine_elements.carbon index 2b08eef74342..edf69ba242f5 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -28,7 +28,7 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -63,8 +63,8 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index 8df4c4bfc9b5..e226b5255fb2 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -178,7 +178,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.x.y.4cf: type = struct_type {.x: Core.IntLiteral, .y: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -194,8 +194,8 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -365,7 +365,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: %complete_type.f8a: = complete_type_witness %i32.builtin [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.197 [template] @@ -375,8 +375,8 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -544,7 +544,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.x.y.4cf: type = struct_type {.x: Core.IntLiteral, .y: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -558,8 +558,8 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -656,7 +656,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.x.y.4cf: type = struct_type {.x: Core.IntLiteral, .y: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -670,8 +670,8 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -776,7 +776,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -863,7 +863,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -957,8 +957,8 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/as_type.carbon b/toolchain/check/testdata/as/as_type.carbon index 3c56d448cb87..947104a937af 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -21,7 +21,7 @@ let t: type = (i32, i32) as type; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index 8edbc724111c..355c239579c5 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -21,7 +21,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.197 [template] @@ -31,8 +31,8 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index b734787fe673..e8f34ba85a79 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -29,8 +29,8 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/fail_not_type.carbon b/toolchain/check/testdata/as/fail_not_type.carbon index 53f0d3e14062..14c5f132a697 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -28,8 +28,8 @@ let n: i32 = 1 as 2; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/overloaded.carbon b/toolchain/check/testdata/as/overloaded.carbon index e11e87c8a0c4..84f8aa40ade0 100644 --- a/toolchain/check/testdata/as/overloaded.carbon +++ b/toolchain/check/testdata/as/overloaded.carbon @@ -44,7 +44,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %Convert.type.c23: type = fn_type @Convert.3 [template] // CHECK:STDOUT: %Convert.8bb: %Convert.type.c23 = struct_value () [template] // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.5(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.5(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.7, @impl.5(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound.e80: = bound_method %int_4.0c1, %Convert.197 [template] @@ -55,12 +55,12 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.16b: %As.type.90f = import_ref Core//prelude/operators/as, As, loaded [template = constants.%As.generic] +// CHECK:STDOUT: %Core.As: %As.type.90f = import_ref Core//prelude/operators/as, As, loaded [template = constants.%As.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -75,7 +75,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %As.ref: %As.type.90f = name_ref As, imports.%import_ref.16b [template = constants.%As.generic] +// CHECK:STDOUT: %As.ref: %As.type.90f = name_ref As, imports.%Core.As [template = constants.%As.generic] // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %As.type: type = facet_type <@As, @As(constants.%X)> [template = constants.%As.type.602] // CHECK:STDOUT: } @@ -83,7 +83,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %As.ref: %As.type.90f = name_ref As, imports.%import_ref.16b [template = constants.%As.generic] +// CHECK:STDOUT: %As.ref: %As.type.90f = name_ref As, imports.%Core.As [template = constants.%As.generic] // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %As.type: type = facet_type <@As, @As(constants.%i32)> [template = constants.%As.type.fd4] diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index d70f5031fead..517915651ee6 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -20,7 +20,7 @@ var test_type: type = i32; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -35,9 +35,9 @@ var test_type: type = i32; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/fail_bad_run.carbon b/toolchain/check/testdata/basics/fail_bad_run.carbon index 860bfde2293b..d601bf8943c3 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -29,7 +29,7 @@ fn Run() -> String {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index 5fa43b060ef5..5ec7aa955379 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -25,7 +25,7 @@ fn Run(n: i32) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon index f8f1a8c6259e..38d65bfcd489 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -25,7 +25,7 @@ var x: type = 42; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/fail_numeric_literal_overflow.carbon b/toolchain/check/testdata/basics/fail_numeric_literal_overflow.carbon index bcd409aa6cfd..043b9f5f0304 100644 --- a/toolchain/check/testdata/basics/fail_numeric_literal_overflow.carbon +++ b/toolchain/check/testdata/basics/fail_numeric_literal_overflow.carbon @@ -45,7 +45,7 @@ let e: f64 = 5.0e39999999999999999993; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_39999999999999999993.af6: Core.IntLiteral = int_value 39999999999999999993 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.7ef: = bound_method %int_39999999999999999993.af6, %Convert.956 [template] @@ -62,9 +62,9 @@ let e: f64 = 5.0e39999999999999999993; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 26621cc66555..a8b56e52a8b0 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -44,7 +44,7 @@ fn F() { // CHECK:STDOUT: %tuple.type.27c: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.e09: = bound_method %int_8.b85, %Convert.956 [template] @@ -78,9 +78,9 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index e8f371a35078..8865a06cdb52 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -18,7 +18,7 @@ var b: i32 = ((2)); // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -32,8 +32,8 @@ var b: i32 = ((2)); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index bec76984e3ff..ec044a586137 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -19,7 +19,7 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: %Run: %Run.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -29,8 +29,8 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/type_literals.carbon b/toolchain/check/testdata/basics/type_literals.carbon index 17dec5698dc9..d93200363823 100644 --- a/toolchain/check/testdata/basics/type_literals.carbon +++ b/toolchain/check/testdata/basics/type_literals.carbon @@ -139,7 +139,7 @@ var test_f128: f128; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -205,7 +205,7 @@ var test_f128: f128; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .UInt = %import_ref.bcd +// CHECK:STDOUT: .UInt = %Core.UInt // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/bool/eq.carbon b/toolchain/check/testdata/builtins/bool/eq.carbon index 46dd4101a34b..c335731643ed 100644 --- a/toolchain/check/testdata/builtins/bool/eq.carbon +++ b/toolchain/check/testdata/builtins/bool/eq.carbon @@ -64,7 +64,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -291,7 +291,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: %False.type: type = fn_type @False [template] // CHECK:STDOUT: %False: %False.type = struct_value () [template] // CHECK:STDOUT: %Equal.type.79c: type = fn_type @Equal.1 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.998, imports.%import_ref.fb6) [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Core.import_ref.998, imports.%Core.import_ref.fb6) [template] // CHECK:STDOUT: %Equal.type.aa3: type = fn_type @Equal.2 [template] // CHECK:STDOUT: %Equal.6e2: %Equal.type.aa3 = struct_value () [template] // CHECK:STDOUT: %Equal.bound.fe0: = bound_method %true, %Equal.6e2 [template] @@ -300,8 +300,8 @@ var d: C(false == false) = True(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Eq = %import_ref.822 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Eq = %Core.Eq // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/bool/make_type.carbon b/toolchain/check/testdata/builtins/bool/make_type.carbon index 1c58ef2c3619..ce4a42bebf4c 100644 --- a/toolchain/check/testdata/builtins/bool/make_type.carbon +++ b/toolchain/check/testdata/builtins/bool/make_type.carbon @@ -62,7 +62,7 @@ var b: Bool() = false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %Bool.type = import_ref Main//types, Bool, loaded [template = constants.%Bool] +// CHECK:STDOUT: %Main.Bool: %Bool.type = import_ref Main//types, Bool, loaded [template = constants.%Bool] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -71,7 +71,7 @@ var b: Bool() = false; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Bool = imports.%import_ref +// CHECK:STDOUT: .Bool = imports.%Main.Bool // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .b = %b // CHECK:STDOUT: } @@ -83,7 +83,7 @@ var b: Bool() = false; // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref bool = var b // CHECK:STDOUT: %.loc6_13.1: type = splice_block %.loc6_13.3 [template = bool] { -// CHECK:STDOUT: %Bool.ref: %Bool.type = name_ref Bool, imports.%import_ref [template = constants.%Bool] +// CHECK:STDOUT: %Bool.ref: %Bool.type = name_ref Bool, imports.%Main.Bool [template = constants.%Bool] // CHECK:STDOUT: %bool.make_type: init type = call %Bool.ref() [template = bool] // CHECK:STDOUT: %.loc6_13.2: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc6_13.3: type = converted %bool.make_type, %.loc6_13.2 [template = bool] diff --git a/toolchain/check/testdata/builtins/bool/neq.carbon b/toolchain/check/testdata/builtins/bool/neq.carbon index 4f3432f44d7a..790dfc06081f 100644 --- a/toolchain/check/testdata/builtins/bool/neq.carbon +++ b/toolchain/check/testdata/builtins/bool/neq.carbon @@ -64,7 +64,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -291,7 +291,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: %False.type: type = fn_type @False [template] // CHECK:STDOUT: %False: %False.type = struct_value () [template] // CHECK:STDOUT: %NotEqual.type.e6c: type = fn_type @NotEqual.1 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.85b, imports.%import_ref.67a) [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Core.import_ref.85b, imports.%Core.import_ref.67a) [template] // CHECK:STDOUT: %NotEqual.type.c0e: type = fn_type @NotEqual.2 [template] // CHECK:STDOUT: %NotEqual.bf4: %NotEqual.type.c0e = struct_value () [template] // CHECK:STDOUT: %NotEqual.bound.542: = bound_method %true, %NotEqual.bf4 [template] @@ -300,8 +300,8 @@ var d: C(false != false) = False(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Eq = %import_ref.822 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Eq = %Core.Eq // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/add.carbon b/toolchain/check/testdata/builtins/float/add.carbon index 003d265ec9c8..105ee767e6f4 100644 --- a/toolchain/check/testdata/builtins/float/add.carbon +++ b/toolchain/check/testdata/builtins/float/add.carbon @@ -68,7 +68,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -207,8 +207,8 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/div.carbon b/toolchain/check/testdata/builtins/float/div.carbon index 0a6f2da7b203..6fb29a1319b4 100644 --- a/toolchain/check/testdata/builtins/float/div.carbon +++ b/toolchain/check/testdata/builtins/float/div.carbon @@ -74,7 +74,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -247,8 +247,8 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/eq.carbon b/toolchain/check/testdata/builtins/float/eq.carbon index 6406805f1b81..ed0f78f438f9 100644 --- a/toolchain/check/testdata/builtins/float/eq.carbon +++ b/toolchain/check/testdata/builtins/float/eq.carbon @@ -60,8 +60,8 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.eq"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -238,7 +238,7 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.eq"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/greater.carbon b/toolchain/check/testdata/builtins/float/greater.carbon index af5e568fc8cb..48404728442f 100644 --- a/toolchain/check/testdata/builtins/float/greater.carbon +++ b/toolchain/check/testdata/builtins/float/greater.carbon @@ -58,8 +58,8 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/greater_eq.carbon b/toolchain/check/testdata/builtins/float/greater_eq.carbon index 4d0520856317..5ae1aaac5606 100644 --- a/toolchain/check/testdata/builtins/float/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/float/greater_eq.carbon @@ -58,8 +58,8 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/less.carbon b/toolchain/check/testdata/builtins/float/less.carbon index 89adb5624314..47c23a77692d 100644 --- a/toolchain/check/testdata/builtins/float/less.carbon +++ b/toolchain/check/testdata/builtins/float/less.carbon @@ -58,8 +58,8 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/less_eq.carbon b/toolchain/check/testdata/builtins/float/less_eq.carbon index 7b9ae9cea29d..836461759479 100644 --- a/toolchain/check/testdata/builtins/float/less_eq.carbon +++ b/toolchain/check/testdata/builtins/float/less_eq.carbon @@ -58,8 +58,8 @@ fn RuntimeCallIsValid(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/make_type.carbon b/toolchain/check/testdata/builtins/float/make_type.carbon index 4987ebfa8f2a..55fa677d33c2 100644 --- a/toolchain/check/testdata/builtins/float/make_type.carbon +++ b/toolchain/check/testdata/builtins/float/make_type.carbon @@ -56,7 +56,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -96,7 +96,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_64.fab: Core.IntLiteral = int_value 64 [template] // CHECK:STDOUT: %Convert.type.6da: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%import_ref.a86), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%Core.import_ref.a86), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.ed5: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.16d: %Convert.type.ed5 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_64.fab, %Convert.16d [template] @@ -108,10 +108,10 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.fb8: %Float.type = import_ref Main//types, Float, loaded [template = constants.%Float] +// CHECK:STDOUT: %Main.Float: %Float.type = import_ref Main//types, Float, loaded [template = constants.%Float] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -119,7 +119,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Float = imports.%import_ref.fb8 +// CHECK:STDOUT: .Float = imports.%Main.Float // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f // CHECK:STDOUT: .GetFloat = %GetFloat.decl @@ -132,7 +132,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: } // CHECK:STDOUT: %f.var: ref f64 = var f // CHECK:STDOUT: %.loc6_16.1: type = splice_block %.loc6_16.3 [template = f64] { -// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%import_ref.fb8 [template = constants.%Float] +// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%Main.Float [template = constants.%Float] // CHECK:STDOUT: %int_64: Core.IntLiteral = int_value 64 [template = constants.%int_64.fab] // CHECK:STDOUT: %impl.elem0: %Convert.type.6da = impl_witness_access constants.%impl_witness.b97, element0 [template = constants.%Convert.16d] // CHECK:STDOUT: %Convert.bound: = bound_method %int_64, %impl.elem0 [template = constants.%Convert.bound] @@ -166,7 +166,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: // CHECK:STDOUT: fn @GetFloat(%dyn_size.param_patt: %i32) -> type { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%import_ref.fb8 [template = constants.%Float] +// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%Main.Float [template = constants.%Float] // CHECK:STDOUT: %dyn_size.ref: %i32 = name_ref dyn_size, %dyn_size // CHECK:STDOUT: %float.make_type: init type = call %Float.ref(%dyn_size.ref) // CHECK:STDOUT: %.loc9_25.1: type = value_of_initializer %float.make_type @@ -189,7 +189,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: %int_32.be0: Core.IntLiteral = int_value 32 [template] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32.be0) [template] // CHECK:STDOUT: %Convert.type.6da: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%import_ref.a86), @impl.1(%int_32.be0) [template] +// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%Core.import_ref.a86), @impl.1(%int_32.be0) [template] // CHECK:STDOUT: %Convert.type.ed5: type = fn_type @Convert.2, @impl.1(%int_32.be0) [template] // CHECK:STDOUT: %Convert.16d: %Convert.type.ed5 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.cce: = bound_method %int_32.be0, %Convert.16d [template] @@ -202,10 +202,10 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.fb8: %Float.type = import_ref Main//types, Float, loaded [template = constants.%Float] +// CHECK:STDOUT: %Main.Float: %Float.type = import_ref Main//types, Float, loaded [template = constants.%Float] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -213,7 +213,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Float = imports.%import_ref.fb8 +// CHECK:STDOUT: .Float = imports.%Main.Float // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .invalid_float = %invalid_float // CHECK:STDOUT: .dyn_size = %dyn_size @@ -227,7 +227,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: } // CHECK:STDOUT: %invalid_float.var: ref = var invalid_float // CHECK:STDOUT: %.loc10_28.1: type = splice_block %.loc10_28.3 [template = ] { -// CHECK:STDOUT: %Float.ref.loc10: %Float.type = name_ref Float, imports.%import_ref.fb8 [template = constants.%Float] +// CHECK:STDOUT: %Float.ref.loc10: %Float.type = name_ref Float, imports.%Main.Float [template = constants.%Float] // CHECK:STDOUT: %int_32.loc10: Core.IntLiteral = int_value 32 [template = constants.%int_32.be0] // CHECK:STDOUT: %impl.elem0: %Convert.type.6da = impl_witness_access constants.%impl_witness.b97, element0 [template = constants.%Convert.16d] // CHECK:STDOUT: %Convert.bound: = bound_method %int_32.loc10, %impl.elem0 [template = constants.%Convert.bound.cce] @@ -256,7 +256,7 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: } // CHECK:STDOUT: %dyn.var: ref = var dyn // CHECK:STDOUT: %.1: = splice_block [template = ] { -// CHECK:STDOUT: %Float.ref.loc17: %Float.type = name_ref Float, imports.%import_ref.fb8 [template = constants.%Float] +// CHECK:STDOUT: %Float.ref.loc17: %Float.type = name_ref Float, imports.%Main.Float [template = constants.%Float] // CHECK:STDOUT: %dyn_size.ref: ref %i32 = name_ref dyn_size, %dyn_size // CHECK:STDOUT: %.loc17_16: %i32 = bind_value %dyn_size.ref // CHECK:STDOUT: %float.make_type.loc17: init type = call %Float.ref.loc17(%.loc17_16) diff --git a/toolchain/check/testdata/builtins/float/mul.carbon b/toolchain/check/testdata/builtins/float/mul.carbon index 989c515babcc..763ac597ca4f 100644 --- a/toolchain/check/testdata/builtins/float/mul.carbon +++ b/toolchain/check/testdata/builtins/float/mul.carbon @@ -68,7 +68,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -207,8 +207,8 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/negate.carbon b/toolchain/check/testdata/builtins/float/negate.carbon index 1e0d4a26e03e..d01571608017 100644 --- a/toolchain/check/testdata/builtins/float/negate.carbon +++ b/toolchain/check/testdata/builtins/float/negate.carbon @@ -88,7 +88,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -214,8 +214,8 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/neq.carbon b/toolchain/check/testdata/builtins/float/neq.carbon index e2c6b9ca7895..826157eb89cc 100644 --- a/toolchain/check/testdata/builtins/float/neq.carbon +++ b/toolchain/check/testdata/builtins/float/neq.carbon @@ -60,8 +60,8 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.neq"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -238,7 +238,7 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.neq"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/float/sub.carbon b/toolchain/check/testdata/builtins/float/sub.carbon index 6a00f30ddc71..22b53294d0c8 100644 --- a/toolchain/check/testdata/builtins/float/sub.carbon +++ b/toolchain/check/testdata/builtins/float/sub.carbon @@ -68,7 +68,7 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -207,8 +207,8 @@ fn RuntimeCallIsValidBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/print/char.carbon b/toolchain/check/testdata/builtins/print/char.carbon index 5dec1afbc55b..8c3e44ccb8b1 100644 --- a/toolchain/check/testdata/builtins/print/char.carbon +++ b/toolchain/check/testdata/builtins/print/char.carbon @@ -28,7 +28,7 @@ fn Main() { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -44,14 +44,14 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .PrintChar = %import_ref.f2f +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .PrintChar = %Core.PrintChar // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//io // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f2f: %PrintChar.type.089 = import_ref Core//io, PrintChar, loaded [template = constants.%PrintChar.d75] +// CHECK:STDOUT: %Core.PrintChar: %PrintChar.type.089 = import_ref Core//io, PrintChar, loaded [template = constants.%PrintChar.d75] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -95,7 +95,7 @@ fn Main() { // CHECK:STDOUT: %.loc16_13.2: %i32 = converted %int_1, %.loc16_13.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %print.char.loc16: init %i32 = call %PrintChar.ref.loc16(%.loc16_13.2) // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %PrintChar.ref.loc17: %PrintChar.type.089 = name_ref PrintChar, imports.%import_ref.f2f [template = constants.%PrintChar.d75] +// CHECK:STDOUT: %PrintChar.ref.loc17: %PrintChar.type.089 = name_ref PrintChar, imports.%Core.PrintChar [template = constants.%PrintChar.d75] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0.loc17: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc17: = bound_method %int_2, %impl.elem0.loc17 [template = constants.%Convert.bound.ef9] diff --git a/toolchain/check/testdata/builtins/print/int.carbon b/toolchain/check/testdata/builtins/print/int.carbon index 3ec022fa0290..fec15a32b8cc 100644 --- a/toolchain/check/testdata/builtins/print/int.carbon +++ b/toolchain/check/testdata/builtins/print/int.carbon @@ -30,7 +30,7 @@ fn Main() { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,14 +46,14 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Print = %import_ref.a34 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Print = %Core.Print // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//io // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.a34: %Print.type.6ed = import_ref Core//io, Print, loaded [template = constants.%Print.723] +// CHECK:STDOUT: %Core.Print: %Print.type.6ed = import_ref Core//io, Print, loaded [template = constants.%Print.723] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -91,7 +91,7 @@ fn Main() { // CHECK:STDOUT: %.loc16_9.2: %i32 = converted %int_1, %.loc16_9.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %print.int.loc16: init %empty_tuple.type = call %Print.ref.loc16(%.loc16_9.2) // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Print.ref.loc18: %Print.type.6ed = name_ref Print, imports.%import_ref.a34 [template = constants.%Print.723] +// CHECK:STDOUT: %Print.ref.loc18: %Print.type.6ed = name_ref Print, imports.%Core.Print [template = constants.%Print.723] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0.loc18: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc18: = bound_method %int_2, %impl.elem0.loc18 [template = constants.%Convert.bound.ef9] diff --git a/toolchain/check/testdata/builtins/read/int.carbon b/toolchain/check/testdata/builtins/read/int.carbon index 15d77521da95..da6db5b9ba6e 100644 --- a/toolchain/check/testdata/builtins/read/int.carbon +++ b/toolchain/check/testdata/builtins/read/int.carbon @@ -32,13 +32,13 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ReadChar = %import_ref.ecd +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ReadChar = %Core.ReadChar // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//io // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.ecd: %ReadChar.type.9f3 = import_ref Core//io, ReadChar, loaded [template = constants.%ReadChar.01f] +// CHECK:STDOUT: %Core.ReadChar: %ReadChar.type.9f3 = import_ref Core//io, ReadChar, loaded [template = constants.%ReadChar.01f] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -80,7 +80,7 @@ fn Main() { // CHECK:STDOUT: %m.patt: %i32 = binding_pattern m // CHECK:STDOUT: } // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ReadChar.ref.loc17: %ReadChar.type.9f3 = name_ref ReadChar, imports.%import_ref.ecd [template = constants.%ReadChar.01f] +// CHECK:STDOUT: %ReadChar.ref.loc17: %ReadChar.type.9f3 = name_ref ReadChar, imports.%Core.ReadChar [template = constants.%ReadChar.01f] // CHECK:STDOUT: %read.char.loc17: init %i32 = call %ReadChar.ref.loc17() // CHECK:STDOUT: %.loc17_10: type = splice_block %i32.loc17 [template = constants.%i32] { // CHECK:STDOUT: %int_32.loc17: Core.IntLiteral = int_value 32 [template = constants.%int_32] diff --git a/toolchain/check/testdata/class/access_modifers.carbon b/toolchain/check/testdata/class/access_modifers.carbon index 446cc071979f..92ef992431b9 100644 --- a/toolchain/check/testdata/class/access_modifers.carbon +++ b/toolchain/check/testdata/class/access_modifers.carbon @@ -155,7 +155,7 @@ class A { // CHECK:STDOUT: %Circle.elem: type = unbound_element_type %Circle, %i32 [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.4e6: = bound_method %int_5.64b, %Convert.956 [template] @@ -179,8 +179,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -322,7 +322,7 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -385,7 +385,7 @@ class A { // CHECK:STDOUT: %complete_type.5a5: = complete_type_witness %struct_type.radius [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -395,8 +395,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -504,7 +504,7 @@ class A { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_5.64b, %Convert.956 [template] @@ -516,8 +516,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -580,7 +580,7 @@ class A { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_5.64b, %Convert.956 [template] @@ -592,8 +592,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/adapt.carbon b/toolchain/check/testdata/class/adapter/adapt.carbon index 2bb5267e5fa7..79f523094654 100644 --- a/toolchain/check/testdata/class/adapter/adapt.carbon +++ b/toolchain/check/testdata/class/adapter/adapt.carbon @@ -79,7 +79,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -224,7 +224,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/adapt_copy.carbon b/toolchain/check/testdata/class/adapter/adapt_copy.carbon index 757ab8991b81..b5260423c10c 100644 --- a/toolchain/check/testdata/class/adapter/adapt_copy.carbon +++ b/toolchain/check/testdata/class/adapter/adapt_copy.carbon @@ -139,8 +139,8 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .UInt = %import_ref.bcd +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .UInt = %Core.UInt // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -278,8 +278,8 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .UInt = %import_ref.bcd +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .UInt = %Core.UInt // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -541,7 +541,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -644,8 +644,8 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .UInt = %import_ref.bcd +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .UInt = %Core.UInt // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/extend_adapt.carbon b/toolchain/check/testdata/class/adapter/extend_adapt.carbon index b3aa99c5f6bf..67f6cd4bb799 100644 --- a/toolchain/check/testdata/class/adapter/extend_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/extend_adapt.carbon @@ -161,7 +161,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -276,7 +276,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -358,8 +358,8 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -445,7 +445,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -513,7 +513,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -584,12 +584,12 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -609,7 +609,7 @@ fn F(a: IntAdapter) -> i32 { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param0 // CHECK:STDOUT: %.loc4_31.1: type = splice_block %.loc4_31.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_31.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_31.3: type = converted %int_literal.make_type, %.loc4_31.2 [template = Core.IntLiteral] 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 9582ac463a91..acb234d9ef38 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_bad_decl.carbon @@ -114,7 +114,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -167,7 +167,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } 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 cfd4385be98b..426cf23e42a6 100644 --- a/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon +++ b/toolchain/check/testdata/class/adapter/fail_adapt_with_subobjects.carbon @@ -89,7 +89,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -141,7 +141,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -217,7 +217,7 @@ class AdaptWithBaseAndFields { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/adapter/init_adapt.carbon b/toolchain/check/testdata/class/adapter/init_adapt.carbon index 5edc42253532..13482f54f5b6 100644 --- a/toolchain/check/testdata/class/adapter/init_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/init_adapt.carbon @@ -106,7 +106,7 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -124,8 +124,8 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -290,7 +290,7 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -308,8 +308,8 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 17c479356cf3..b3ecd50cc5e9 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -66,7 +66,7 @@ class Derived { // CHECK:STDOUT: %int_7.29f: Core.IntLiteral = int_value 7 [template] // CHECK:STDOUT: %struct_type.base.d.a20: type = struct_type {.base: %struct_type.b.a15, .d: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ac3: = bound_method %int_4.0c1, %Convert.956 [template] @@ -85,8 +85,8 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -230,7 +230,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 8e800056e3d4..875b7ed1014c 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -47,7 +47,7 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index 273b1cd08804..66f69744f8e7 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -41,7 +41,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: %complete_type.fd7: = complete_type_witness %struct_type.a [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -58,8 +58,8 @@ fn Call(p: Derived*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/base_method_qualified.carbon b/toolchain/check/testdata/class/base_method_qualified.carbon index 0e3fe8b65a5d..499293144fcb 100644 --- a/toolchain/check/testdata/class/base_method_qualified.carbon +++ b/toolchain/check/testdata/class/base_method_qualified.carbon @@ -71,7 +71,7 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index 8c0bc4b66c0c..b344f0138643 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -43,7 +43,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %Run: %Run.type = struct_value () [template] // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_4.0c1, %Convert.956 [template] @@ -53,8 +53,8 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 c36ff156ec92..9b1a20e486ed 100644 --- a/toolchain/check/testdata/class/complete_in_member_fn.carbon +++ b/toolchain/check/testdata/class/complete_in_member_fn.carbon @@ -29,7 +29,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/compound_field.carbon b/toolchain/check/testdata/class/compound_field.carbon index 252b5376309d..ae5ce7cd4683 100644 --- a/toolchain/check/testdata/class/compound_field.carbon +++ b/toolchain/check/testdata/class/compound_field.carbon @@ -65,7 +65,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/cross_package_import.carbon b/toolchain/check/testdata/class/cross_package_import.carbon index 4d924c2cb4d9..66aab11245b9 100644 --- a/toolchain/check/testdata/class/cross_package_import.carbon +++ b/toolchain/check/testdata/class/cross_package_import.carbon @@ -199,12 +199,12 @@ var c: Other.C = {}; // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//other_define // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//other_define, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//other_define, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -222,16 +222,16 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc6_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -256,10 +256,10 @@ var c: Other.C = {}; // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//other_extern // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: type = import_ref Other//other_extern, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.C: type = import_ref Other//other_extern, C, loaded [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -277,7 +277,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.var: ref = var c // CHECK:STDOUT: %.loc14_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: = bind_name c, // CHECK:STDOUT: } @@ -306,13 +306,13 @@ var c: Other.C = {}; // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//other_define // CHECK:STDOUT: import Other//other_extern // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//other_define, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//other_define, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -330,16 +330,16 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc19_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -366,13 +366,13 @@ var c: Other.C = {}; // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//other_define // CHECK:STDOUT: import Other//other_conflict // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//other_define, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//other_define, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.8f2: = import_ref Other//other_define, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//other_define, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -390,16 +390,16 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc19_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "other_define.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index 82889589029c..2b384f6a7dbc 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -79,7 +79,7 @@ fn ConvertInit() { // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %struct_type.base.c.136: type = struct_type {.base: %struct_type.base.b.bf0, .c: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -98,8 +98,8 @@ fn ConvertInit() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index a28a52e1266c..76f3e7297053 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -473,7 +473,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -553,7 +553,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -636,7 +636,7 @@ fn CallReturnAbstract() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 d575bb1bdaef..ed194e816a65 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -191,7 +191,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -257,8 +257,8 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -331,7 +331,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -435,8 +435,8 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -545,8 +545,8 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -649,8 +649,8 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -757,7 +757,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon b/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon index 30446233fa89..559535461252 100644 --- a/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon +++ b/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon @@ -46,8 +46,8 @@ fn AccessBInA(a: A) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 73acf540dfc2..7c39905f93b1 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -70,8 +70,8 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_field_modifiers.carbon b/toolchain/check/testdata/class/fail_field_modifiers.carbon index da6497ef5fee..dc9c729c532e 100644 --- a/toolchain/check/testdata/class/fail_field_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_field_modifiers.carbon @@ -44,7 +44,7 @@ class Class { // CHECK:STDOUT: %Class.elem: type = unbound_element_type %Class, %i32 [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -60,8 +60,8 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_generic_method.carbon b/toolchain/check/testdata/class/fail_generic_method.carbon index 7f5bc7e4426d..ae70ec110cb5 100644 --- a/toolchain/check/testdata/class/fail_generic_method.carbon +++ b/toolchain/check/testdata/class/fail_generic_method.carbon @@ -56,7 +56,7 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_import_misuses.carbon b/toolchain/check/testdata/class/fail_import_misuses.carbon index bdd0bc42cb25..2b658f9bd7e6 100644 --- a/toolchain/check/testdata/class/fail_import_misuses.carbon +++ b/toolchain/check/testdata/class/fail_import_misuses.carbon @@ -92,20 +92,20 @@ var a: Incomplete; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.e6e: type = import_ref Main//a, Empty, loaded [template = constants.%Empty] -// CHECK:STDOUT: %import_ref.9b0: type = import_ref Main//a, Incomplete, loaded [template = constants.%Incomplete] +// CHECK:STDOUT: %Main.Empty: type = import_ref Main//a, Empty, loaded [template = constants.%Empty] +// CHECK:STDOUT: %Main.Incomplete: type = import_ref Main//a, Incomplete, loaded [template = constants.%Incomplete] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc5_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.fd7 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc5_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.fd7 = import_ref Main//a, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Empty = imports.%import_ref.e6e -// CHECK:STDOUT: .Incomplete = imports.%import_ref.9b0 +// CHECK:STDOUT: .Empty = imports.%Main.Empty +// CHECK:STDOUT: .Incomplete = imports.%Main.Incomplete // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: } @@ -117,15 +117,15 @@ var a: Incomplete; // CHECK:STDOUT: %.loc25: = var_pattern %a.patt // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref = var a -// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, imports.%import_ref.9b0 [template = constants.%Incomplete] +// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, imports.%Main.Incomplete [template = constants.%Incomplete] // CHECK:STDOUT: %a: = bind_name a, // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Empty [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.fd7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.fd7 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @.1 { diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index a0ef07a114bd..e633bc663025 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -215,7 +215,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index a6f42a95b784..e93bcb842661 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -47,7 +47,7 @@ fn F() { // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.c: type = struct_type {.a: Core.IntLiteral, .c: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -59,8 +59,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 6625c075ef78..a6f808a6117f 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -46,7 +46,7 @@ fn F() { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -60,8 +60,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index c913669636bf..1e5ba03d0afd 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -42,7 +42,7 @@ fn T.F() {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index 92a2a0dca3bd..f5c03d63dc49 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -34,7 +34,7 @@ fn G() -> i32 { // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,8 +46,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index a27498f8b5b8..f2c568e6d6d4 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -76,7 +76,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index 78c3fe730405..cd902b3fee60 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -44,7 +44,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index da894fb1cd4e..dd8de516e3b8 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -36,7 +36,7 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index d2d166e63268..1e2d95cb0368 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -34,7 +34,7 @@ fn Run() { // CHECK:STDOUT: %Run: %Run.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -48,8 +48,8 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index 4202f908c4d3..a131b1799dab 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -35,7 +35,7 @@ fn Test() { // CHECK:STDOUT: %Test: %Test.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -49,8 +49,8 @@ fn Test() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/adapt.carbon b/toolchain/check/testdata/class/generic/adapt.carbon index 93cab46a40df..642c9a56791d 100644 --- a/toolchain/check/testdata/class/generic/adapt.carbon +++ b/toolchain/check/testdata/class/generic/adapt.carbon @@ -148,7 +148,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -285,26 +285,26 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Main//adapt_specific_type, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.c01: type = import_ref Main//adapt_specific_type, Adapter, loaded [template = constants.%Adapter] -// CHECK:STDOUT: %import_ref.baa = import_ref Main//adapt_specific_type, Access, unloaded +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//adapt_specific_type, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Main.Adapter: type = import_ref Main//adapt_specific_type, Adapter, loaded [template = constants.%Adapter] +// CHECK:STDOUT: %Main.Access = import_ref Main//adapt_specific_type, Access, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b5f: = import_ref Main//adapt_specific_type, loc6_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.433)] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//adapt_specific_type, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.262: @C.%C.elem (%C.elem.66c) = import_ref Main//adapt_specific_type, loc5_8, loaded [template = %.22b] -// CHECK:STDOUT: %import_ref.709: = import_ref Main//adapt_specific_type, loc10_1, loaded [template = constants.%complete_type.c07] -// CHECK:STDOUT: %import_ref.feb = import_ref Main//adapt_specific_type, inst45 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b5f: = import_ref Main//adapt_specific_type, loc6_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.433)] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//adapt_specific_type, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.262: @C.%C.elem (%C.elem.66c) = import_ref Main//adapt_specific_type, loc5_8, loaded [template = %.22b] +// CHECK:STDOUT: %Main.import_ref.709: = import_ref Main//adapt_specific_type, loc10_1, loaded [template = constants.%complete_type.c07] +// CHECK:STDOUT: %Main.import_ref.feb = import_ref Main//adapt_specific_type, inst45 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .Adapter = imports.%import_ref.c01 -// CHECK:STDOUT: .Access = imports.%import_ref.baa +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .Adapter = imports.%Main.Adapter +// CHECK:STDOUT: .Access = imports.%Main.Access // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .ImportedAccess = %ImportedAccess.decl // CHECK:STDOUT: } @@ -319,7 +319,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %int_32.loc6: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc6: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %a.param: %Adapter = value_param runtime_param0 -// CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%import_ref.c01 [template = constants.%Adapter] +// CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%Main.Adapter [template = constants.%Adapter] // CHECK:STDOUT: %a: %Adapter = bind_name a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param runtime_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param @@ -327,10 +327,10 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Adapter [from "adapt_specific_type.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.709 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.709 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.feb +// CHECK:STDOUT: .Self = imports.%Main.import_ref.feb // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(constants.%T: type) [from "adapt_specific_type.carbon"] { @@ -345,24 +345,24 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type: = complete_type_witness @C.%struct_type.x (%struct_type.x.2ac) [symbolic = %complete_type (constants.%complete_type.433)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.b5f +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.b5f // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 -// CHECK:STDOUT: .x = imports.%import_ref.262 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 +// CHECK:STDOUT: .x = imports.%Main.import_ref.262 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ImportedAccess(%a.param_patt: %Adapter) -> %i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %Adapter = name_ref a, %a -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C.generic] // CHECK:STDOUT: %int_32.loc7: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc7: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%i32) [template = constants.%C.239] // CHECK:STDOUT: %.loc7_13.1: %C.239 = as_compatible %a.ref // CHECK:STDOUT: %.loc7_13.2: %C.239 = converted %a.ref, %.loc7_13.1 -// CHECK:STDOUT: %x.ref: %C.elem.ed6 = name_ref x, imports.%import_ref.262 [template = imports.%.22b] +// CHECK:STDOUT: %x.ref: %C.elem.ed6 = name_ref x, imports.%Main.import_ref.262 [template = imports.%.22b] // CHECK:STDOUT: %.loc7_23.1: ref %i32 = class_element_access %.loc7_13.2, element0 // CHECK:STDOUT: %.loc7_23.2: %i32 = bind_value %.loc7_23.1 // CHECK:STDOUT: return %.loc7_23.2 @@ -414,8 +414,8 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -546,7 +546,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -652,26 +652,26 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.148 = import_ref Main//extend_adapt_specific_type_library, C, unloaded -// CHECK:STDOUT: %import_ref.c01: type = import_ref Main//extend_adapt_specific_type_library, Adapter, loaded [template = constants.%Adapter] +// CHECK:STDOUT: %Main.C = import_ref Main//extend_adapt_specific_type_library, C, unloaded +// CHECK:STDOUT: %Main.Adapter: type = import_ref Main//extend_adapt_specific_type_library, Adapter, loaded [template = constants.%Adapter] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b5f: = import_ref Main//extend_adapt_specific_type_library, loc9_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.433)] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//extend_adapt_specific_type_library, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.262: @C.%C.elem (%C.elem.66c) = import_ref Main//extend_adapt_specific_type_library, loc8_8, loaded [template = %.22b] -// CHECK:STDOUT: %import_ref.709: = import_ref Main//extend_adapt_specific_type_library, loc13_1, loaded [template = constants.%complete_type.c07] -// CHECK:STDOUT: %import_ref.feb = import_ref Main//extend_adapt_specific_type_library, inst45 [no loc], unloaded -// CHECK:STDOUT: %import_ref.19d12e.2: type = import_ref Main//extend_adapt_specific_type_library, loc12_21, loaded [template = constants.%C.239] +// CHECK:STDOUT: %Main.import_ref.b5f: = import_ref Main//extend_adapt_specific_type_library, loc9_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.433)] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//extend_adapt_specific_type_library, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.262: @C.%C.elem (%C.elem.66c) = import_ref Main//extend_adapt_specific_type_library, loc8_8, loaded [template = %.22b] +// CHECK:STDOUT: %Main.import_ref.709: = import_ref Main//extend_adapt_specific_type_library, loc13_1, loaded [template = constants.%complete_type.c07] +// CHECK:STDOUT: %Main.import_ref.feb = import_ref Main//extend_adapt_specific_type_library, inst45 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.19d12e.2: type = import_ref Main//extend_adapt_specific_type_library, loc12_21, loaded [template = constants.%C.239] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.148 -// CHECK:STDOUT: .Adapter = imports.%import_ref.c01 +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .Adapter = imports.%Main.Adapter // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .ImportedAccess = %ImportedAccess.decl // CHECK:STDOUT: } @@ -686,7 +686,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %a.param: %Adapter = value_param runtime_param0 -// CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%import_ref.c01 [template = constants.%Adapter] +// CHECK:STDOUT: %Adapter.ref: type = name_ref Adapter, imports.%Main.Adapter [template = constants.%Adapter] // CHECK:STDOUT: %a: %Adapter = bind_name a, %a.param // CHECK:STDOUT: %return.param: ref %i32 = out_param runtime_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param @@ -694,11 +694,11 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Adapter [from "extend_adapt_specific_type_library.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.709 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.709 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.feb -// CHECK:STDOUT: extend imports.%import_ref.19d12e.2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.feb +// CHECK:STDOUT: extend imports.%Main.import_ref.19d12e.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(constants.%T: type) [from "extend_adapt_specific_type_library.carbon"] { @@ -713,18 +713,18 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type: = complete_type_witness @C.%struct_type.x (%struct_type.x.2ac) [symbolic = %complete_type (constants.%complete_type.433)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.b5f +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.b5f // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 -// CHECK:STDOUT: .x = imports.%import_ref.262 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 +// CHECK:STDOUT: .x = imports.%Main.import_ref.262 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ImportedAccess(%a.param_patt: %Adapter) -> %i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %Adapter = name_ref a, %a -// CHECK:STDOUT: %x.ref: %C.elem.ed6 = name_ref x, imports.%import_ref.262 [template = imports.%.22b] +// CHECK:STDOUT: %x.ref: %C.elem.ed6 = name_ref x, imports.%Main.import_ref.262 [template = imports.%.22b] // CHECK:STDOUT: %.loc15_11.1: %C.239 = converted %a.ref, [template = ] // CHECK:STDOUT: %.loc15_11.2: %i32 = class_element_access , element0 [template = ] // CHECK:STDOUT: return @@ -771,7 +771,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -883,21 +883,21 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bb5: %Adapter.type = import_ref Main//adapt_generic_type, Adapter, loaded [template = constants.%Adapter.generic] -// CHECK:STDOUT: %import_ref.339 = import_ref Main//adapt_generic_type, Convert, unloaded +// CHECK:STDOUT: %Main.Adapter: %Adapter.type = import_ref Main//adapt_generic_type, Adapter, loaded [template = constants.%Adapter.generic] +// CHECK:STDOUT: %Main.Convert = import_ref Main//adapt_generic_type, Convert, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.fb3: = import_ref Main//adapt_generic_type, loc6_1, loaded [symbolic = @Adapter.%complete_type (constants.%complete_type.f87)] -// CHECK:STDOUT: %import_ref.9a3 = import_ref Main//adapt_generic_type, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.fb3: = import_ref Main//adapt_generic_type, loc6_1, loaded [symbolic = @Adapter.%complete_type (constants.%complete_type.f87)] +// CHECK:STDOUT: %Main.import_ref.9a3 = import_ref Main//adapt_generic_type, inst27 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Adapter = imports.%import_ref.bb5 -// CHECK:STDOUT: .Convert = imports.%import_ref.339 +// CHECK:STDOUT: .Adapter = imports.%Main.Adapter +// CHECK:STDOUT: .Convert = imports.%Main.Convert // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .ImportedConvert = %ImportedConvert.decl // CHECK:STDOUT: .C = %C.decl @@ -915,7 +915,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %i32.loc6_40: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %a.param: %Adapter.e4c = value_param runtime_param0 // CHECK:STDOUT: %.loc6: type = splice_block %Adapter [template = constants.%Adapter.e4c] { -// CHECK:STDOUT: %Adapter.ref: %Adapter.type = name_ref Adapter, imports.%import_ref.bb5 [template = constants.%Adapter.generic] +// CHECK:STDOUT: %Adapter.ref: %Adapter.type = name_ref Adapter, imports.%Main.Adapter [template = constants.%Adapter.generic] // CHECK:STDOUT: %int_32.loc6_31: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc6_31: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %Adapter: type = class_type @Adapter, @Adapter(constants.%i32) [template = constants.%Adapter.e4c] @@ -935,7 +935,7 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %a.param: %Adapter.58f = value_param runtime_param0 // CHECK:STDOUT: %.loc14: type = splice_block %Adapter [template = constants.%Adapter.58f] { -// CHECK:STDOUT: %Adapter.ref: %Adapter.type = name_ref Adapter, imports.%import_ref.bb5 [template = constants.%Adapter.generic] +// CHECK:STDOUT: %Adapter.ref: %Adapter.type = name_ref Adapter, imports.%Main.Adapter [template = constants.%Adapter.generic] // CHECK:STDOUT: %C.ref.loc14: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Adapter: type = class_type @Adapter, @Adapter(constants.%C) [template = constants.%Adapter.58f] // CHECK:STDOUT: } @@ -954,10 +954,10 @@ fn ImportedConvertLocal(a: Adapter(C)) -> i32 { // CHECK:STDOUT: %complete_type: = complete_type_witness @Adapter.%T (%T) [symbolic = %complete_type (constants.%complete_type.f87)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.fb3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.fb3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.9a3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.9a3 // 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 8123fef8b81a..fd28d6e85c5a 100644 --- a/toolchain/check/testdata/class/generic/base_is_generic.carbon +++ b/toolchain/check/testdata/class/generic/base_is_generic.carbon @@ -117,7 +117,7 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -271,33 +271,33 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.97d = import_ref Main//extend_generic_base, Base, unloaded -// CHECK:STDOUT: %import_ref.3fa = import_ref Main//extend_generic_base, Param, unloaded -// CHECK:STDOUT: %import_ref.58f: type = import_ref Main//extend_generic_base, Derived, loaded [template = constants.%Derived] -// CHECK:STDOUT: %import_ref.ec1 = import_ref Main//extend_generic_base, DoubleFieldAccess, unloaded +// CHECK:STDOUT: %Main.Base = import_ref Main//extend_generic_base, Base, unloaded +// CHECK:STDOUT: %Main.Param = import_ref Main//extend_generic_base, Param, unloaded +// CHECK:STDOUT: %Main.Derived: type = import_ref Main//extend_generic_base, Derived, loaded [template = constants.%Derived] +// CHECK:STDOUT: %Main.DoubleFieldAccess = import_ref Main//extend_generic_base, DoubleFieldAccess, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.e8d: = import_ref Main//extend_generic_base, loc10_1, loaded [template = constants.%complete_type.09d] -// CHECK:STDOUT: %import_ref.446 = import_ref Main//extend_generic_base, inst45 [no loc], unloaded -// CHECK:STDOUT: %import_ref.a92: %Param.elem = import_ref Main//extend_generic_base, loc9_8, loaded [template = %.be7] -// CHECK:STDOUT: %import_ref.b5f: = import_ref Main//extend_generic_base, loc6_1, loaded [symbolic = @Base.%complete_type (constants.%complete_type.433)] -// CHECK:STDOUT: %import_ref.8e0 = import_ref Main//extend_generic_base, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.7f7: @Base.%Base.elem (%Base.elem.9af) = import_ref Main//extend_generic_base, loc5_8, loaded [template = %.e66] -// CHECK:STDOUT: %import_ref.bd0: = import_ref Main//extend_generic_base, loc14_1, loaded [template = constants.%complete_type.b07] -// CHECK:STDOUT: %import_ref.f6c = import_ref Main//extend_generic_base, inst82 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d24 = import_ref Main//extend_generic_base, loc13_27, unloaded -// CHECK:STDOUT: %import_ref.77a301.2: type = import_ref Main//extend_generic_base, loc13_26, loaded [template = constants.%Base.7a8] +// CHECK:STDOUT: %Main.import_ref.e8d: = import_ref Main//extend_generic_base, loc10_1, loaded [template = constants.%complete_type.09d] +// CHECK:STDOUT: %Main.import_ref.446 = import_ref Main//extend_generic_base, inst45 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.a92: %Param.elem = import_ref Main//extend_generic_base, loc9_8, loaded [template = %.be7] +// CHECK:STDOUT: %Main.import_ref.b5f: = import_ref Main//extend_generic_base, loc6_1, loaded [symbolic = @Base.%complete_type (constants.%complete_type.433)] +// CHECK:STDOUT: %Main.import_ref.8e0 = import_ref Main//extend_generic_base, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.7f7: @Base.%Base.elem (%Base.elem.9af) = import_ref Main//extend_generic_base, loc5_8, loaded [template = %.e66] +// CHECK:STDOUT: %Main.import_ref.bd0: = import_ref Main//extend_generic_base, loc14_1, loaded [template = constants.%complete_type.b07] +// CHECK:STDOUT: %Main.import_ref.f6c = import_ref Main//extend_generic_base, inst82 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.d24 = import_ref Main//extend_generic_base, loc13_27, unloaded +// CHECK:STDOUT: %Main.import_ref.77a301.2: type = import_ref Main//extend_generic_base, loc13_26, loaded [template = constants.%Base.7a8] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Base = imports.%import_ref.97d -// CHECK:STDOUT: .Param = imports.%import_ref.3fa -// CHECK:STDOUT: .Derived = imports.%import_ref.58f -// CHECK:STDOUT: .DoubleFieldAccess = imports.%import_ref.ec1 +// CHECK:STDOUT: .Base = imports.%Main.Base +// CHECK:STDOUT: .Param = imports.%Main.Param +// CHECK:STDOUT: .Derived = imports.%Main.Derived +// CHECK:STDOUT: .DoubleFieldAccess = imports.%Main.DoubleFieldAccess // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .ImportedDoubleFieldAccess = %ImportedDoubleFieldAccess.decl // CHECK:STDOUT: } @@ -312,7 +312,7 @@ fn H() { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %d.param: %Derived = value_param runtime_param0 -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, imports.%import_ref.58f [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, imports.%Main.Derived [template = constants.%Derived] // CHECK:STDOUT: %d: %Derived = bind_name d, %d.param // CHECK:STDOUT: %return.param: ref %i32 = out_param runtime_param1 // CHECK:STDOUT: %return: ref %i32 = return_slot %return.param @@ -320,20 +320,20 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Derived [from "extend_generic_base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.bd0 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.bd0 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f6c -// CHECK:STDOUT: .base = imports.%import_ref.d24 -// CHECK:STDOUT: extend imports.%import_ref.77a301.2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.f6c +// CHECK:STDOUT: .base = imports.%Main.import_ref.d24 +// CHECK:STDOUT: extend imports.%Main.import_ref.77a301.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Param [from "extend_generic_base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.e8d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.e8d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.446 -// CHECK:STDOUT: .y = imports.%import_ref.a92 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.446 +// CHECK:STDOUT: .y = imports.%Main.import_ref.a92 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Base(constants.%T: type) [from "extend_generic_base.carbon"] { @@ -348,22 +348,22 @@ fn H() { // CHECK:STDOUT: %complete_type: = complete_type_witness @Base.%struct_type.x (%struct_type.x.2ac) [symbolic = %complete_type (constants.%complete_type.433)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.b5f +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.b5f // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.8e0 -// CHECK:STDOUT: .x = imports.%import_ref.7f7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.8e0 +// CHECK:STDOUT: .x = imports.%Main.import_ref.7f7 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ImportedDoubleFieldAccess(%d.param_patt: %Derived) -> %i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %d.ref: %Derived = name_ref d, %d -// CHECK:STDOUT: %x.ref: %Base.elem.d1f = name_ref x, imports.%import_ref.7f7 [template = imports.%.e66] +// CHECK:STDOUT: %x.ref: %Base.elem.d1f = name_ref x, imports.%Main.import_ref.7f7 [template = imports.%.e66] // CHECK:STDOUT: %.loc7_11.1: ref %Base.7a8 = class_element_access %d.ref, element0 // CHECK:STDOUT: %.loc7_11.2: ref %Base.7a8 = converted %d.ref, %.loc7_11.1 // CHECK:STDOUT: %.loc7_11.3: ref %Param = class_element_access %.loc7_11.2, element0 -// CHECK:STDOUT: %y.ref: %Param.elem = name_ref y, imports.%import_ref.a92 [template = imports.%.be7] +// CHECK:STDOUT: %y.ref: %Param.elem = name_ref y, imports.%Main.import_ref.a92 [template = imports.%.be7] // CHECK:STDOUT: %.loc7_13.1: ref %i32 = class_element_access %.loc7_11.3, element0 // CHECK:STDOUT: %.loc7_13.2: %i32 = bind_value %.loc7_13.1 // CHECK:STDOUT: return %.loc7_13.2 @@ -534,7 +534,7 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -777,28 +777,28 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.687 = import_ref Main//extend_generic_symbolic_base, X, unloaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Main//extend_generic_symbolic_base, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.bde = import_ref Main//extend_generic_symbolic_base, F, unloaded +// CHECK:STDOUT: %Main.X = import_ref Main//extend_generic_symbolic_base, X, unloaded +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//extend_generic_symbolic_base, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Main.F = import_ref Main//extend_generic_symbolic_base, F, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//extend_generic_symbolic_base, loc6_1, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.e8e = import_ref Main//extend_generic_symbolic_base, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b8a: @X.%G.type (%G.type.56f312.1) = import_ref Main//extend_generic_symbolic_base, loc5_15, loaded [symbolic = @X.%G (constants.%G.b504c4.1)] -// CHECK:STDOUT: %import_ref.93f: = import_ref Main//extend_generic_symbolic_base, loc10_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.768)] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//extend_generic_symbolic_base, inst68 [no loc], unloaded -// CHECK:STDOUT: %import_ref.65d = import_ref Main//extend_generic_symbolic_base, loc9_20, unloaded -// CHECK:STDOUT: %import_ref.561eb2.2: type = import_ref Main//extend_generic_symbolic_base, loc9_19, loaded [symbolic = @C.%X (constants.%X.75b6d8.2)] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//extend_generic_symbolic_base, loc6_1, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Main.import_ref.e8e = import_ref Main//extend_generic_symbolic_base, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b8a: @X.%G.type (%G.type.56f312.1) = import_ref Main//extend_generic_symbolic_base, loc5_15, loaded [symbolic = @X.%G (constants.%G.b504c4.1)] +// CHECK:STDOUT: %Main.import_ref.93f: = import_ref Main//extend_generic_symbolic_base, loc10_1, loaded [symbolic = @C.%complete_type (constants.%complete_type.768)] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//extend_generic_symbolic_base, inst68 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.65d = import_ref Main//extend_generic_symbolic_base, loc9_20, unloaded +// CHECK:STDOUT: %Main.import_ref.561eb2.2: type = import_ref Main//extend_generic_symbolic_base, loc9_19, loaded [symbolic = @C.%X (constants.%X.75b6d8.2)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .X = imports.%import_ref.687 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .X = imports.%Main.X +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .H = %H.decl // CHECK:STDOUT: } @@ -820,12 +820,12 @@ fn H() { // CHECK:STDOUT: %complete_type: = complete_type_witness @C.%struct_type.base (%struct_type.base.f5f) [symbolic = %complete_type (constants.%complete_type.768)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.93f +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.93f // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 -// CHECK:STDOUT: .base = imports.%import_ref.65d -// CHECK:STDOUT: extend imports.%import_ref.561eb2.2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 +// CHECK:STDOUT: .base = imports.%Main.import_ref.65d +// CHECK:STDOUT: extend imports.%Main.import_ref.561eb2.2 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -838,11 +838,11 @@ fn H() { // CHECK:STDOUT: %G: @X.%G.type (%G.type.56f312.1) = struct_value () [symbolic = %G (constants.%G.b504c4.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e8e -// CHECK:STDOUT: .G = imports.%import_ref.b8a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e8e +// CHECK:STDOUT: .G = imports.%Main.import_ref.b8a // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -851,11 +851,11 @@ fn H() { // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %j.patt: %i32 = binding_pattern j // CHECK:STDOUT: } -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C.generic] // CHECK:STDOUT: %int_32.loc7_18: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc7_18: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%i32) [template = constants.%C.98a] -// CHECK:STDOUT: %.loc7_22: %G.type.862 = specific_constant imports.%import_ref.b8a, @X(constants.%i32) [template = constants.%G.d5e] +// CHECK:STDOUT: %.loc7_22: %G.type.862 = specific_constant imports.%Main.import_ref.b8a, @X(constants.%i32) [template = constants.%G.d5e] // CHECK:STDOUT: %G.ref: %G.type.862 = name_ref G, %.loc7_22 [template = constants.%G.d5e] // CHECK:STDOUT: %G.specific_fn: = specific_function %G.ref, @G(constants.%i32) [template = constants.%G.specific_fn.7a3] // CHECK:STDOUT: %G.call: init %i32 = call %G.specific_fn() diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index 3eed31485ebf..31385e980b4c 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -104,7 +104,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %ptr.235: type = ptr_type %i32 [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.4e6: = bound_method %int_5.64b, %Convert.956 [template] @@ -120,8 +120,8 @@ class Outer(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -252,7 +252,7 @@ class Outer(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -339,7 +339,7 @@ class Outer(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -427,8 +427,8 @@ class Outer(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 ad581c12ecfe..a04e4c747e67 100644 --- a/toolchain/check/testdata/class/generic/complete_in_conversion.carbon +++ b/toolchain/check/testdata/class/generic/complete_in_conversion.carbon @@ -61,7 +61,7 @@ fn F(a: A(0)*) { // CHECK:STDOUT: %complete_type.547: = complete_type_witness %struct_type.base.n [symbolic] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -79,13 +79,13 @@ fn F(a: A(0)*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f0 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f0: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -106,7 +106,7 @@ fn F(a: A(0)*) { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param0 // CHECK:STDOUT: %.loc2_27.1: type = splice_block %.loc2_27.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f0 [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc2_27.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc2_27.3: type = converted %int_literal.make_type, %.loc2_27.2 [template = Core.IntLiteral] diff --git a/toolchain/check/testdata/class/generic/field.carbon b/toolchain/check/testdata/class/generic/field.carbon index 16555a422221..fb26d92792f8 100644 --- a/toolchain/check/testdata/class/generic/field.carbon +++ b/toolchain/check/testdata/class/generic/field.carbon @@ -63,7 +63,7 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index b16d5fa1db7e..6bbed3e36be4 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -104,7 +104,7 @@ class Class(U:! type) { // CHECK:STDOUT: %complete_type.54b: = complete_type_witness %struct_type.n [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -117,8 +117,8 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -275,7 +275,7 @@ class Class(U:! type) { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.n.44a: type = struct_type {.n: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.ea0: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%import_ref.773), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%Main.import_ref.773), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.e14: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.4cb: %Convert.type.e14 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.4cb [template] @@ -285,23 +285,23 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.cfa: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %Main.CompleteClass: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 -// CHECK:STDOUT: .ImplicitAs = %import_ref.e26 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.a68] -// CHECK:STDOUT: %import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded -// CHECK:STDOUT: %import_ref.051 = import_ref Main//foo, loc7_8, unloaded -// CHECK:STDOUT: %import_ref.570 = import_ref Main//foo, loc8_17, unloaded +// CHECK:STDOUT: %Main.import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.a68] +// CHECK:STDOUT: %Main.import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.051 = import_ref Main//foo, loc7_8, unloaded +// CHECK:STDOUT: %Main.import_ref.570 = import_ref Main//foo, loc8_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: .CompleteClass = imports.%import_ref.cfa +// CHECK:STDOUT: .CompleteClass = imports.%Main.CompleteClass // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } @@ -319,7 +319,7 @@ class Class(U:! type) { // CHECK:STDOUT: %return.patt: %CompleteClass.a06 = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %CompleteClass.a06 = out_param_pattern %return.patt, runtime_param0 // CHECK:STDOUT: } { -// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.cfa [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%Main.CompleteClass [template = constants.%CompleteClass.generic] // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%i32) [template = constants.%CompleteClass.a06] @@ -365,12 +365,12 @@ class Class(U:! type) { // CHECK:STDOUT: %F: @CompleteClass.%F.type (%F.type.14f) = struct_value () [symbolic = %F (constants.%F.874)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.eb1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.eb1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.3c0 -// CHECK:STDOUT: .n = imports.%import_ref.051 -// CHECK:STDOUT: .F = imports.%import_ref.570 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.3c0 +// CHECK:STDOUT: .n = imports.%Main.import_ref.051 +// CHECK:STDOUT: .F = imports.%Main.import_ref.570 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -458,25 +458,25 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.92e = import_ref Main//foo, Class, unloaded -// CHECK:STDOUT: %import_ref.cfa: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type.b25 = import_ref Main//foo, F, loaded [template = constants.%F.c41] +// CHECK:STDOUT: %Main.Class = import_ref Main//foo, Class, unloaded +// CHECK:STDOUT: %Main.CompleteClass: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %Main.F: %F.type.b25 = import_ref Main//foo, F, loaded [template = constants.%F.c41] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.54b] -// CHECK:STDOUT: %import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e76: @CompleteClass.%CompleteClass.elem (%CompleteClass.elem.28a) = import_ref Main//foo, loc7_8, loaded [template = %.364] -// CHECK:STDOUT: %import_ref.a52: @CompleteClass.%F.type (%F.type.14f) = import_ref Main//foo, loc8_17, loaded [symbolic = @CompleteClass.%F (constants.%F.874)] +// CHECK:STDOUT: %Main.import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.54b] +// CHECK:STDOUT: %Main.import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e76: @CompleteClass.%CompleteClass.elem (%CompleteClass.elem.28a) = import_ref Main//foo, loc7_8, loaded [template = %.364] +// CHECK:STDOUT: %Main.import_ref.a52: @CompleteClass.%F.type (%F.type.14f) = import_ref Main//foo, loc8_17, loaded [symbolic = @CompleteClass.%F (constants.%F.874)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Class = imports.%import_ref.92e -// CHECK:STDOUT: .CompleteClass = imports.%import_ref.cfa -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .Class = imports.%Main.Class +// CHECK:STDOUT: .CompleteClass = imports.%Main.CompleteClass +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .UseMethod = %UseMethod.decl // CHECK:STDOUT: .UseField = %UseField.decl @@ -514,12 +514,12 @@ class Class(U:! type) { // CHECK:STDOUT: %F: @CompleteClass.%F.type (%F.type.14f) = struct_value () [symbolic = %F (constants.%F.874)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.eb1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.eb1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.3c0 -// CHECK:STDOUT: .n = imports.%import_ref.e76 -// CHECK:STDOUT: .F = imports.%import_ref.a52 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.3c0 +// CHECK:STDOUT: .n = imports.%Main.import_ref.e76 +// CHECK:STDOUT: .F = imports.%Main.import_ref.a52 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -530,19 +530,19 @@ class Class(U:! type) { // CHECK:STDOUT: %.loc6_3.1: %CompleteClass.e9e = var_pattern %v.patt // CHECK:STDOUT: } // CHECK:STDOUT: %v.var: ref %CompleteClass.e9e = var v -// CHECK:STDOUT: %F.ref.loc6: %F.type.b25 = name_ref F, imports.%import_ref.b37 [template = constants.%F.c41] +// CHECK:STDOUT: %F.ref.loc6: %F.type.b25 = name_ref F, imports.%Main.F [template = constants.%F.c41] // CHECK:STDOUT: %.loc6_3.2: ref %CompleteClass.e9e = splice_block %v.var {} // CHECK:STDOUT: %F.call.loc6: init %CompleteClass.e9e = call %F.ref.loc6() to %.loc6_3.2 // CHECK:STDOUT: assign %v.var, %F.call.loc6 // CHECK:STDOUT: %.loc6_27: type = splice_block %CompleteClass [template = constants.%CompleteClass.e9e] { -// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.cfa [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%Main.CompleteClass [template = constants.%CompleteClass.generic] // CHECK:STDOUT: %int_32.loc6: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc6: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%i32) [template = constants.%CompleteClass.e9e] // CHECK:STDOUT: } // CHECK:STDOUT: %v: ref %CompleteClass.e9e = bind_name v, %v.var // CHECK:STDOUT: %v.ref: ref %CompleteClass.e9e = name_ref v, %v -// CHECK:STDOUT: %.loc7_11: %F.type.1bc = specific_constant imports.%import_ref.a52, @CompleteClass(constants.%i32) [template = constants.%F.f7c] +// CHECK:STDOUT: %.loc7_11: %F.type.1bc = specific_constant imports.%Main.import_ref.a52, @CompleteClass(constants.%i32) [template = constants.%F.f7c] // CHECK:STDOUT: %F.ref.loc7: %F.type.1bc = name_ref F, %.loc7_11 [template = constants.%F.f7c] // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref.loc7, @F.1(constants.%i32) [template = constants.%F.specific_fn] // CHECK:STDOUT: %F.call.loc7: init %i32 = call %F.specific_fn() @@ -566,19 +566,19 @@ class Class(U:! type) { // CHECK:STDOUT: %.loc11_3.1: %CompleteClass.e9e = var_pattern %v.patt // CHECK:STDOUT: } // CHECK:STDOUT: %v.var: ref %CompleteClass.e9e = var v -// CHECK:STDOUT: %F.ref: %F.type.b25 = name_ref F, imports.%import_ref.b37 [template = constants.%F.c41] +// CHECK:STDOUT: %F.ref: %F.type.b25 = name_ref F, imports.%Main.F [template = constants.%F.c41] // CHECK:STDOUT: %.loc11_3.2: ref %CompleteClass.e9e = splice_block %v.var {} // CHECK:STDOUT: %F.call: init %CompleteClass.e9e = call %F.ref() to %.loc11_3.2 // CHECK:STDOUT: assign %v.var, %F.call // CHECK:STDOUT: %.loc11_27: type = splice_block %CompleteClass [template = constants.%CompleteClass.e9e] { -// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.cfa [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%Main.CompleteClass [template = constants.%CompleteClass.generic] // CHECK:STDOUT: %int_32.loc11: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc11: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(constants.%i32) [template = constants.%CompleteClass.e9e] // CHECK:STDOUT: } // CHECK:STDOUT: %v: ref %CompleteClass.e9e = bind_name v, %v.var // CHECK:STDOUT: %v.ref: ref %CompleteClass.e9e = name_ref v, %v -// CHECK:STDOUT: %n.ref: %CompleteClass.elem.7fc = name_ref n, imports.%import_ref.e76 [template = imports.%.364] +// CHECK:STDOUT: %n.ref: %CompleteClass.elem.7fc = name_ref n, imports.%Main.import_ref.e76 [template = imports.%.364] // CHECK:STDOUT: %.loc12_11.1: ref %i32 = class_element_access %v.ref, element0 // CHECK:STDOUT: %.loc12_11.2: %i32 = bind_value %.loc12_11.1 // CHECK:STDOUT: return %.loc12_11.2 @@ -645,26 +645,26 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.92e = import_ref Main//foo, Class, unloaded -// CHECK:STDOUT: %import_ref.cfa: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type.b25 = import_ref Main//foo, F, loaded [template = constants.%F.c41] +// CHECK:STDOUT: %Main.Class = import_ref Main//foo, Class, unloaded +// CHECK:STDOUT: %Main.CompleteClass: %CompleteClass.type = import_ref Main//foo, CompleteClass, loaded [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %Main.F: %F.type.b25 = import_ref Main//foo, F, loaded [template = constants.%F.c41] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.a68] -// CHECK:STDOUT: %import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded -// CHECK:STDOUT: %import_ref.051 = import_ref Main//foo, loc7_8, unloaded -// CHECK:STDOUT: %import_ref.570 = import_ref Main//foo, loc8_17, unloaded +// CHECK:STDOUT: %Main.import_ref.eb1: = import_ref Main//foo, loc9_1, loaded [template = constants.%complete_type.a68] +// CHECK:STDOUT: %Main.import_ref.3c0 = import_ref Main//foo, inst37 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.051 = import_ref Main//foo, loc7_8, unloaded +// CHECK:STDOUT: %Main.import_ref.570 = import_ref Main//foo, loc8_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Class = imports.%import_ref.92e -// CHECK:STDOUT: .CompleteClass = imports.%import_ref.cfa -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .Class = imports.%Main.Class +// CHECK:STDOUT: .CompleteClass = imports.%Main.CompleteClass +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Use = %Use.decl // CHECK:STDOUT: } @@ -684,12 +684,12 @@ class Class(U:! type) { // CHECK:STDOUT: %F: @CompleteClass.%F.type (%F.type.14f) = struct_value () [symbolic = %F (constants.%F.874)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.eb1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.eb1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.3c0 -// CHECK:STDOUT: .n = imports.%import_ref.051 -// CHECK:STDOUT: .F = imports.%import_ref.570 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.3c0 +// CHECK:STDOUT: .n = imports.%Main.import_ref.051 +// CHECK:STDOUT: .F = imports.%Main.import_ref.570 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -700,13 +700,13 @@ class Class(U:! type) { // CHECK:STDOUT: %.loc14_3.1: %CompleteClass.0fe = var_pattern %v.patt // CHECK:STDOUT: } // CHECK:STDOUT: %v.var: ref %CompleteClass.0fe = var v -// CHECK:STDOUT: %F.ref: %F.type.b25 = name_ref F, imports.%import_ref.b37 [template = constants.%F.c41] +// CHECK:STDOUT: %F.ref: %F.type.b25 = name_ref F, imports.%Main.F [template = constants.%F.c41] // CHECK:STDOUT: %.loc14_34: ref %CompleteClass.a06 = temporary_storage // CHECK:STDOUT: %F.call: init %CompleteClass.a06 = call %F.ref() to %.loc14_34 // CHECK:STDOUT: %.loc14_3.2: %CompleteClass.0fe = converted %F.call, [template = ] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: %.loc14_28: type = splice_block %CompleteClass [template = constants.%CompleteClass.0fe] { -// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.cfa [template = constants.%CompleteClass.generic] +// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%Main.CompleteClass [template = constants.%CompleteClass.generic] // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32 [template = constants.%ptr.9e1] @@ -776,9 +776,9 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.23a: %Class.type = import_ref Main//foo, Class, loaded [template = constants.%Class.generic] -// CHECK:STDOUT: %import_ref.f6d = import_ref Main//foo, CompleteClass, unloaded -// CHECK:STDOUT: %import_ref.bde = import_ref Main//foo, F, unloaded +// CHECK:STDOUT: %Main.Class: %Class.type = import_ref Main//foo, Class, loaded [template = constants.%Class.generic] +// CHECK:STDOUT: %Main.CompleteClass = import_ref Main//foo, CompleteClass, unloaded +// CHECK:STDOUT: %Main.F = import_ref Main//foo, F, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -787,9 +787,9 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Class = imports.%import_ref.23a -// CHECK:STDOUT: .CompleteClass = imports.%import_ref.f6d -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .Class = imports.%Main.Class +// CHECK:STDOUT: .CompleteClass = imports.%Main.CompleteClass +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index 19c01d75f542..fced392d86bd 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -71,7 +71,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -279,7 +279,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_access.carbon b/toolchain/check/testdata/class/generic/member_access.carbon index 15c09b98bd0f..1b1be788b5ef 100644 --- a/toolchain/check/testdata/class/generic/member_access.carbon +++ b/toolchain/check/testdata/class/generic/member_access.carbon @@ -96,7 +96,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -422,7 +422,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/member_lookup.carbon b/toolchain/check/testdata/class/generic/member_lookup.carbon index af47353abd8e..ec2523a190e5 100644 --- a/toolchain/check/testdata/class/generic/member_lookup.carbon +++ b/toolchain/check/testdata/class/generic/member_lookup.carbon @@ -114,7 +114,7 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -445,7 +445,7 @@ fn AccessMissingConcrete(x: Derived(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/redeclare.carbon b/toolchain/check/testdata/class/generic/redeclare.carbon index f283a07b85dd..e42640ab048b 100644 --- a/toolchain/check/testdata/class/generic/redeclare.carbon +++ b/toolchain/check/testdata/class/generic/redeclare.carbon @@ -228,7 +228,7 @@ class E(U:! type) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -321,7 +321,7 @@ class E(U:! type) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -413,7 +413,7 @@ class E(U:! type) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/generic/stringify.carbon b/toolchain/check/testdata/class/generic/stringify.carbon index 37931f1ea9bb..458c0fef0585 100644 --- a/toolchain/check/testdata/class/generic/stringify.carbon +++ b/toolchain/check/testdata/class/generic/stringify.carbon @@ -101,7 +101,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -189,8 +189,8 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -337,7 +337,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_123.fff: Core.IntLiteral = int_value 123 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_123.fff, %Convert.956 [template] @@ -348,8 +348,8 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -447,7 +447,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -470,8 +470,8 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index ea961ca257b2..19abe8a553c7 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -72,7 +72,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -170,7 +170,7 @@ fn Run() { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.x.c96: type = struct_type {.x: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.6da: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%import_ref.a86), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%Core.import_ref.a86), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.ed5: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.16d: %Convert.type.ed5 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.43e: = bound_method %int_1.5b8, %Convert.16d [template] @@ -194,36 +194,36 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.e6e: type = import_ref Main//a, Empty, loaded [template = constants.%Empty] -// CHECK:STDOUT: %import_ref.53b: type = import_ref Main//a, Field, loaded [template = constants.%Field] -// CHECK:STDOUT: %import_ref.046: type = import_ref Main//a, ForwardDeclared, loaded [template = constants.%ForwardDeclared.7b34f2.1] -// CHECK:STDOUT: %import_ref.9b0: type = import_ref Main//a, Incomplete, loaded [template = constants.%Incomplete] +// CHECK:STDOUT: %Main.Empty: type = import_ref Main//a, Empty, loaded [template = constants.%Empty] +// CHECK:STDOUT: %Main.Field: type = import_ref Main//a, Field, loaded [template = constants.%Field] +// CHECK:STDOUT: %Main.ForwardDeclared: type = import_ref Main//a, ForwardDeclared, loaded [template = constants.%ForwardDeclared.7b34f2.1] +// CHECK:STDOUT: %Main.Incomplete: type = import_ref Main//a, Incomplete, loaded [template = constants.%Incomplete] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//a, loc5_1, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.fd7 = import_ref Main//a, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.709: = import_ref Main//a, loc9_1, loaded [template = constants.%complete_type.c07] -// CHECK:STDOUT: %import_ref.845 = import_ref Main//a, inst21 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4d2: %Field.elem = import_ref Main//a, loc8_8, loaded [template = %.d33] -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//a, loc16_1, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.39e731.1 = import_ref Main//a, inst59 [no loc], unloaded -// CHECK:STDOUT: %import_ref.760: %F.type = import_ref Main//a, loc14_21, loaded [template = constants.%F] -// CHECK:STDOUT: %import_ref.26e: %G.type = import_ref Main//a, loc15_27, loaded [template = constants.%G] -// CHECK:STDOUT: %import_ref.8f24d3.3: = import_ref Main//a, loc16_1, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.39e731.2 = import_ref Main//a, inst59 [no loc], unloaded -// CHECK:STDOUT: %import_ref.42a = import_ref Main//a, loc14_21, unloaded -// CHECK:STDOUT: %import_ref.67a = import_ref Main//a, loc15_27, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//a, loc5_1, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Main.import_ref.fd7 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.709: = import_ref Main//a, loc9_1, loaded [template = constants.%complete_type.c07] +// CHECK:STDOUT: %Main.import_ref.845 = import_ref Main//a, inst21 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4d2: %Field.elem = import_ref Main//a, loc8_8, loaded [template = %.d33] +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//a, loc16_1, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Main.import_ref.39e731.1 = import_ref Main//a, inst59 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.760: %F.type = import_ref Main//a, loc14_21, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.import_ref.26e: %G.type = import_ref Main//a, loc15_27, loaded [template = constants.%G] +// CHECK:STDOUT: %Main.import_ref.8f24d3.3: = import_ref Main//a, loc16_1, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Main.import_ref.39e731.2 = import_ref Main//a, inst59 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.42a = import_ref Main//a, loc14_21, unloaded +// CHECK:STDOUT: %Main.import_ref.67a = import_ref Main//a, loc15_27, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Empty = imports.%import_ref.e6e -// CHECK:STDOUT: .Field = imports.%import_ref.53b -// CHECK:STDOUT: .ForwardDeclared = imports.%import_ref.046 -// CHECK:STDOUT: .Incomplete = imports.%import_ref.9b0 +// CHECK:STDOUT: .Empty = imports.%Main.Empty +// CHECK:STDOUT: .Field = imports.%Main.Field +// CHECK:STDOUT: .ForwardDeclared = imports.%Main.ForwardDeclared +// CHECK:STDOUT: .Incomplete = imports.%Main.Incomplete // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Run = %Run.decl // CHECK:STDOUT: } @@ -233,36 +233,36 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Empty [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.fd7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.fd7 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Field [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.709 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.709 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.845 -// CHECK:STDOUT: .x = imports.%import_ref.4d2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.845 +// CHECK:STDOUT: .x = imports.%Main.import_ref.4d2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDeclared.1 [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.39e731.1 -// CHECK:STDOUT: .F = imports.%import_ref.760 -// CHECK:STDOUT: .G = imports.%import_ref.26e +// CHECK:STDOUT: .Self = imports.%Main.import_ref.39e731.1 +// CHECK:STDOUT: .F = imports.%Main.import_ref.760 +// CHECK:STDOUT: .G = imports.%Main.import_ref.26e // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDeclared.2 [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.39e731.2 -// CHECK:STDOUT: .F = imports.%import_ref.42a -// CHECK:STDOUT: .G = imports.%import_ref.67a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.39e731.2 +// CHECK:STDOUT: .F = imports.%Main.import_ref.42a +// CHECK:STDOUT: .G = imports.%Main.import_ref.67a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Incomplete [from "a.carbon"]; @@ -278,7 +278,7 @@ fn Run() { // CHECK:STDOUT: %.loc7_19.2: init %Empty = class_init (), %a.var [template = constants.%Empty.val] // CHECK:STDOUT: %.loc7_3.2: init %Empty = converted %.loc7_19.1, %.loc7_19.2 [template = constants.%Empty.val] // CHECK:STDOUT: assign %a.var, %.loc7_3.2 -// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%import_ref.e6e [template = constants.%Empty] +// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%Main.Empty [template = constants.%Empty] // CHECK:STDOUT: %a: ref %Empty = bind_name a, %a.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %Field = binding_pattern b @@ -297,10 +297,10 @@ fn Run() { // CHECK:STDOUT: %.loc9_25.5: init %Field = class_init (%.loc9_25.4), %b.var [template = constants.%Field.val] // CHECK:STDOUT: %.loc9_3.2: init %Field = converted %.loc9_25.1, %.loc9_25.5 [template = constants.%Field.val] // CHECK:STDOUT: assign %b.var, %.loc9_3.2 -// CHECK:STDOUT: %Field.ref: type = name_ref Field, imports.%import_ref.53b [template = constants.%Field] +// CHECK:STDOUT: %Field.ref: type = name_ref Field, imports.%Main.Field [template = constants.%Field] // CHECK:STDOUT: %b: ref %Field = bind_name b, %b.var // CHECK:STDOUT: %b.ref: ref %Field = name_ref b, %b -// CHECK:STDOUT: %x.ref: %Field.elem = name_ref x, imports.%import_ref.4d2 [template = imports.%.d33] +// CHECK:STDOUT: %x.ref: %Field.elem = name_ref x, imports.%Main.import_ref.4d2 [template = imports.%.d33] // CHECK:STDOUT: %.loc10_4: ref %i32 = class_element_access %b.ref, element0 // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0.loc10: %Convert.type.6da = impl_witness_access constants.%impl_witness.b97, element0 [template = constants.%Convert.16d] @@ -318,15 +318,15 @@ fn Run() { // CHECK:STDOUT: %.loc12_29.2: init %ForwardDeclared.7b34f2.1 = class_init (), %c.var [template = constants.%ForwardDeclared.val] // CHECK:STDOUT: %.loc12_3.2: init %ForwardDeclared.7b34f2.1 = converted %.loc12_29.1, %.loc12_29.2 [template = constants.%ForwardDeclared.val] // CHECK:STDOUT: assign %c.var, %.loc12_3.2 -// CHECK:STDOUT: %ForwardDeclared.ref.loc12: type = name_ref ForwardDeclared, imports.%import_ref.046 [template = constants.%ForwardDeclared.7b34f2.1] +// CHECK:STDOUT: %ForwardDeclared.ref.loc12: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.7b34f2.1] // CHECK:STDOUT: %c: ref %ForwardDeclared.7b34f2.1 = bind_name c, %c.var // CHECK:STDOUT: %c.ref.loc13: ref %ForwardDeclared.7b34f2.1 = name_ref c, %c -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.760 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.760 [template = constants.%F] // CHECK:STDOUT: %F.bound: = bound_method %c.ref.loc13, %F.ref // CHECK:STDOUT: %.loc13: %ForwardDeclared.7b34f2.1 = bind_value %c.ref.loc13 // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.bound(%.loc13) // CHECK:STDOUT: %c.ref.loc14: ref %ForwardDeclared.7b34f2.1 = name_ref c, %c -// CHECK:STDOUT: %G.ref: %G.type = name_ref G, imports.%import_ref.26e [template = constants.%G] +// CHECK:STDOUT: %G.ref: %G.type = name_ref G, imports.%Main.import_ref.26e [template = constants.%G] // CHECK:STDOUT: %G.bound: = bound_method %c.ref.loc14, %G.ref // CHECK:STDOUT: %addr.loc14: %ptr.6cf = addr_of %c.ref.loc14 // CHECK:STDOUT: %G.call: init %empty_tuple.type = call %G.bound(%addr.loc14) @@ -339,7 +339,7 @@ fn Run() { // CHECK:STDOUT: %addr.loc16: %ptr.6cf = addr_of %c.ref.loc16 // CHECK:STDOUT: assign %d.var, %addr.loc16 // CHECK:STDOUT: %.loc16_25: type = splice_block %ptr.loc16 [template = constants.%ptr.6cf] { -// CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%import_ref.046 [template = constants.%ForwardDeclared.7b34f2.1] +// CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.7b34f2.1] // CHECK:STDOUT: %ptr.loc16: type = ptr_type %ForwardDeclared.7b34f2.1 [template = constants.%ptr.6cf] // CHECK:STDOUT: } // CHECK:STDOUT: %d: ref %ptr.6cf = bind_name d, %d.var @@ -349,7 +349,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: %e.var: ref %ptr.c62 = var e // CHECK:STDOUT: %.loc18_20: type = splice_block %ptr.loc18 [template = constants.%ptr.c62] { -// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, imports.%import_ref.9b0 [template = constants.%Incomplete] +// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, imports.%Main.Incomplete [template = constants.%Incomplete] // CHECK:STDOUT: %ptr.loc18: type = ptr_type %Incomplete [template = constants.%ptr.c62] // CHECK:STDOUT: } // CHECK:STDOUT: %e: ref %ptr.c62 = bind_name e, %e.var diff --git a/toolchain/check/testdata/class/import_base.carbon b/toolchain/check/testdata/class/import_base.carbon index f819c88b6b00..5a4456ecf09b 100644 --- a/toolchain/check/testdata/class/import_base.carbon +++ b/toolchain/check/testdata/class/import_base.carbon @@ -57,7 +57,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -147,7 +147,7 @@ fn Run() { // CHECK:STDOUT: %struct_type.x.unused.c45: type = struct_type {.x: Core.IntLiteral, .unused: Core.IntLiteral} [template] // CHECK:STDOUT: %struct_type.base.6c7: type = struct_type {.base: %struct_type.x.unused.c45} [template] // CHECK:STDOUT: %Convert.type.6da: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%import_ref.a86), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.b97: = impl_witness (imports.%Core.import_ref.a86), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.ed5: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.16d: %Convert.type.ed5 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.9aa: = bound_method %int_0.5c6, %Convert.16d [template] @@ -168,29 +168,29 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.1eb = import_ref Main//a, Base, unloaded -// CHECK:STDOUT: %import_ref.794: type = import_ref Main//a, Child, loaded [template = constants.%Child] +// CHECK:STDOUT: %Main.Base = import_ref Main//a, Base, unloaded +// CHECK:STDOUT: %Main.Child: type = import_ref Main//a, Child, loaded [template = constants.%Child] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.239: = import_ref Main//a, loc10_1, loaded [template = constants.%complete_type.90f] -// CHECK:STDOUT: %import_ref.1f3 = import_ref Main//a, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e8f: %F.type = import_ref Main//a, loc5_21, loaded [template = constants.%F] -// CHECK:STDOUT: %import_ref.8bf = import_ref Main//a, loc6_26, unloaded -// CHECK:STDOUT: %import_ref.e67: %Base.elem = import_ref Main//a, loc8_8, loaded [template = %.720] -// CHECK:STDOUT: %import_ref.2e4 = import_ref Main//a, loc9_13, unloaded -// CHECK:STDOUT: %import_ref.c5f: = import_ref Main//a, loc14_1, loaded [template = constants.%complete_type.15c] -// CHECK:STDOUT: %import_ref.9a9 = import_ref Main//a, inst76 [no loc], unloaded -// CHECK:STDOUT: %import_ref.7e5 = import_ref Main//a, loc13_20, unloaded -// CHECK:STDOUT: %import_ref.a21640.2: type = import_ref Main//a, loc13_16, loaded [template = constants.%Base] +// CHECK:STDOUT: %Main.import_ref.239: = import_ref Main//a, loc10_1, loaded [template = constants.%complete_type.90f] +// CHECK:STDOUT: %Main.import_ref.1f3 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e8f: %F.type = import_ref Main//a, loc5_21, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.import_ref.8bf = import_ref Main//a, loc6_26, unloaded +// CHECK:STDOUT: %Main.import_ref.e67: %Base.elem = import_ref Main//a, loc8_8, loaded [template = %.720] +// CHECK:STDOUT: %Main.import_ref.2e4 = import_ref Main//a, loc9_13, unloaded +// CHECK:STDOUT: %Main.import_ref.c5f: = import_ref Main//a, loc14_1, loaded [template = constants.%complete_type.15c] +// CHECK:STDOUT: %Main.import_ref.9a9 = import_ref Main//a, inst76 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.7e5 = import_ref Main//a, loc13_20, unloaded +// CHECK:STDOUT: %Main.import_ref.a21640.2: type = import_ref Main//a, loc13_16, loaded [template = constants.%Base] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Base = imports.%import_ref.1eb -// CHECK:STDOUT: .Child = imports.%import_ref.794 +// CHECK:STDOUT: .Base = imports.%Main.Base +// CHECK:STDOUT: .Child = imports.%Main.Child // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Run = %Run.decl // CHECK:STDOUT: } @@ -200,23 +200,23 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Child [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.c5f +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.c5f // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.9a9 -// CHECK:STDOUT: .base = imports.%import_ref.7e5 -// CHECK:STDOUT: extend imports.%import_ref.a21640.2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.9a9 +// CHECK:STDOUT: .base = imports.%Main.import_ref.7e5 +// CHECK:STDOUT: extend imports.%Main.import_ref.a21640.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.239 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.239 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1f3 -// CHECK:STDOUT: .F = imports.%import_ref.e8f -// CHECK:STDOUT: .Unused = imports.%import_ref.8bf -// CHECK:STDOUT: .x = imports.%import_ref.e67 -// CHECK:STDOUT: .unused = imports.%import_ref.2e4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.1f3 +// CHECK:STDOUT: .F = imports.%Main.import_ref.e8f +// CHECK:STDOUT: .Unused = imports.%Main.import_ref.8bf +// CHECK:STDOUT: .x = imports.%Main.import_ref.e67 +// CHECK:STDOUT: .unused = imports.%Main.import_ref.2e4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { @@ -250,10 +250,10 @@ fn Run() { // CHECK:STDOUT: %.loc7_48.4: init %Child = class_init (%.loc7_48.3), %a.var [template = constants.%Child.val] // CHECK:STDOUT: %.loc7_3.2: init %Child = converted %.loc7_48.1, %.loc7_48.4 [template = constants.%Child.val] // CHECK:STDOUT: assign %a.var, %.loc7_3.2 -// CHECK:STDOUT: %Child.ref: type = name_ref Child, imports.%import_ref.794 [template = constants.%Child] +// CHECK:STDOUT: %Child.ref: type = name_ref Child, imports.%Main.Child [template = constants.%Child] // CHECK:STDOUT: %a: ref %Child = bind_name a, %a.var // CHECK:STDOUT: %a.ref.loc8: ref %Child = name_ref a, %a -// CHECK:STDOUT: %x.ref: %Base.elem = name_ref x, imports.%import_ref.e67 [template = imports.%.720] +// CHECK:STDOUT: %x.ref: %Base.elem = name_ref x, imports.%Main.import_ref.e67 [template = imports.%.720] // CHECK:STDOUT: %.loc8_4.1: ref %Base = class_element_access %a.ref.loc8, element0 // CHECK:STDOUT: %.loc8_4.2: ref %Base = converted %a.ref.loc8, %.loc8_4.1 // CHECK:STDOUT: %.loc8_4.3: ref %i32 = class_element_access %.loc8_4.2, element0 @@ -265,7 +265,7 @@ fn Run() { // CHECK:STDOUT: %.loc8_7: init %i32 = converted %int_2, %int.convert_checked.loc8 [template = constants.%int_2.d0d] // CHECK:STDOUT: assign %.loc8_4.3, %.loc8_7 // CHECK:STDOUT: %a.ref.loc9: ref %Child = name_ref a, %a -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.e8f [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.e8f [template = constants.%F] // CHECK:STDOUT: %F.bound: = bound_method %a.ref.loc9, %F.ref // CHECK:STDOUT: %.loc9_3.1: ref %Base = class_element_access %a.ref.loc9, element0 // CHECK:STDOUT: %.loc9_3.2: ref %Base = converted %a.ref.loc9, %.loc9_3.1 diff --git a/toolchain/check/testdata/class/import_indirect.carbon b/toolchain/check/testdata/class/import_indirect.carbon index a979dd90b492..76e778ee3ba0 100644 --- a/toolchain/check/testdata/class/import_indirect.carbon +++ b/toolchain/check/testdata/class/import_indirect.carbon @@ -143,18 +143,18 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .D = %D // CHECK:STDOUT: .b_val = %b_val @@ -162,14 +162,14 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %D: type = bind_alias D, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_val.patt: %C = binding_pattern b_val // CHECK:STDOUT: %.loc8: %C = var_pattern %b_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %b_val.var: ref %C = var b_val -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %b_val: ref %C = bind_name b_val, %b_val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ptr.patt: %ptr.019 = binding_pattern b_ptr @@ -184,10 +184,10 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -213,18 +213,18 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .E = %E // CHECK:STDOUT: .c_val = %c_val @@ -232,14 +232,14 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %E: type = bind_alias E, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %E: type = bind_alias E, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_val.patt: %C = binding_pattern c_val // CHECK:STDOUT: %.loc8: %C = var_pattern %c_val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c_val.var: ref %C = var c_val -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c_val: ref %C = bind_name c_val, %c_val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_ptr.patt: %ptr.019 = binding_pattern c_ptr @@ -254,10 +254,10 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -283,24 +283,24 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ff6: type = import_ref Main//b, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0da = import_ref Main//b, b_val, unloaded -// CHECK:STDOUT: %import_ref.ff5 = import_ref Main//b, b_ptr, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//b, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b_val = import_ref Main//b, b_val, unloaded +// CHECK:STDOUT: %Main.b_ptr = import_ref Main//b, b_ptr, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .D = imports.%import_ref.ff6 -// CHECK:STDOUT: .b_val = imports.%import_ref.0da -// CHECK:STDOUT: .b_ptr = imports.%import_ref.ff5 +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .b_val = imports.%Main.b_val +// CHECK:STDOUT: .b_ptr = imports.%Main.b_ptr // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .val = %val // CHECK:STDOUT: .ptr = %ptr.loc8_5 @@ -312,7 +312,7 @@ var ptr: E* = &val; // CHECK:STDOUT: %.loc7: %C = var_pattern %val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %val.var: ref %C = var val -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %val: ref %C = bind_name val, %val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %ptr.019 = binding_pattern ptr @@ -320,17 +320,17 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.var: ref %ptr.019 = var ptr // CHECK:STDOUT: %.loc8_11: type = splice_block %ptr.loc8_11 [template = constants.%ptr.019] { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.ff6 [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %C [template = constants.%ptr.019] // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.loc8_5: ref %ptr.019 = bind_name ptr, %ptr.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -356,24 +356,24 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.ff6: type = import_ref Main//b, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0da = import_ref Main//b, b_val, unloaded -// CHECK:STDOUT: %import_ref.ff5 = import_ref Main//b, b_ptr, unloaded -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//b, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b_val = import_ref Main//b, b_val, unloaded +// CHECK:STDOUT: %Main.b_ptr = import_ref Main//b, b_ptr, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.ff6 -// CHECK:STDOUT: .b_val = imports.%import_ref.0da -// CHECK:STDOUT: .b_ptr = imports.%import_ref.ff5 -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .b_val = imports.%Main.b_val +// CHECK:STDOUT: .b_ptr = imports.%Main.b_ptr +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .val = %val // CHECK:STDOUT: .ptr = %ptr.loc8_5 @@ -385,7 +385,7 @@ var ptr: E* = &val; // CHECK:STDOUT: %.loc7: %C = var_pattern %val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %val.var: ref %C = var val -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %val: ref %C = bind_name val, %val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %ptr.019 = binding_pattern ptr @@ -393,17 +393,17 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.var: ref %ptr.019 = var ptr // CHECK:STDOUT: %.loc8_11: type = splice_block %ptr.loc8_11 [template = constants.%ptr.019] { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.ff6 [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %C [template = constants.%ptr.019] // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.loc8_5: ref %ptr.019 = bind_name ptr, %ptr.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -429,28 +429,28 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.ff6: type = import_ref Main//b, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0da = import_ref Main//b, b_val, unloaded -// CHECK:STDOUT: %import_ref.ff5 = import_ref Main//b, b_ptr, unloaded -// CHECK:STDOUT: %import_ref.2c9: type = import_ref Main//c, E, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.963 = import_ref Main//c, c_val, unloaded -// CHECK:STDOUT: %import_ref.be6 = import_ref Main//c, c_ptr, unloaded +// CHECK:STDOUT: %Main.D: type = import_ref Main//b, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b_val = import_ref Main//b, b_val, unloaded +// CHECK:STDOUT: %Main.b_ptr = import_ref Main//b, b_ptr, unloaded +// CHECK:STDOUT: %Main.E: type = import_ref Main//c, E, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.c_val = import_ref Main//c, c_val, unloaded +// CHECK:STDOUT: %Main.c_ptr = import_ref Main//c, c_ptr, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//b, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//b, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//b, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//b, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.ff6 -// CHECK:STDOUT: .b_val = imports.%import_ref.0da -// CHECK:STDOUT: .b_ptr = imports.%import_ref.ff5 -// CHECK:STDOUT: .E = imports.%import_ref.2c9 -// CHECK:STDOUT: .c_val = imports.%import_ref.963 -// CHECK:STDOUT: .c_ptr = imports.%import_ref.be6 +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .b_val = imports.%Main.b_val +// CHECK:STDOUT: .b_ptr = imports.%Main.b_ptr +// CHECK:STDOUT: .E = imports.%Main.E +// CHECK:STDOUT: .c_val = imports.%Main.c_val +// CHECK:STDOUT: .c_ptr = imports.%Main.c_ptr // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .val = %val // CHECK:STDOUT: .ptr = %ptr.loc8_5 @@ -462,7 +462,7 @@ var ptr: E* = &val; // CHECK:STDOUT: %.loc7: %C = var_pattern %val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %val.var: ref %C = var val -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.ff6 [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %val: ref %C = bind_name val, %val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %ptr.019 = binding_pattern ptr @@ -470,17 +470,17 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.var: ref %ptr.019 = var ptr // CHECK:STDOUT: %.loc8_11: type = splice_block %ptr.loc8_11 [template = constants.%ptr.019] { -// CHECK:STDOUT: %E.ref: type = name_ref E, imports.%import_ref.2c9 [template = constants.%C] +// CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [template = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %C [template = constants.%ptr.019] // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.loc8_5: ref %ptr.019 = bind_name ptr, %ptr.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -506,28 +506,28 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.2c9: type = import_ref Main//c, E, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.963 = import_ref Main//c, c_val, unloaded -// CHECK:STDOUT: %import_ref.be6 = import_ref Main//c, c_ptr, unloaded -// CHECK:STDOUT: %import_ref.ff6: type = import_ref Main//b, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0da = import_ref Main//b, b_val, unloaded -// CHECK:STDOUT: %import_ref.ff5 = import_ref Main//b, b_ptr, unloaded +// CHECK:STDOUT: %Main.E: type = import_ref Main//c, E, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.c_val = import_ref Main//c, c_val, unloaded +// CHECK:STDOUT: %Main.c_ptr = import_ref Main//c, c_ptr, unloaded +// CHECK:STDOUT: %Main.D: type = import_ref Main//b, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.b_val = import_ref Main//b, b_val, unloaded +// CHECK:STDOUT: %Main.b_ptr = import_ref Main//b, b_ptr, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//b, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//b, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//b, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//b, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .E = imports.%import_ref.2c9 -// CHECK:STDOUT: .c_val = imports.%import_ref.963 -// CHECK:STDOUT: .c_ptr = imports.%import_ref.be6 -// CHECK:STDOUT: .D = imports.%import_ref.ff6 -// CHECK:STDOUT: .b_val = imports.%import_ref.0da -// CHECK:STDOUT: .b_ptr = imports.%import_ref.ff5 +// CHECK:STDOUT: .E = imports.%Main.E +// CHECK:STDOUT: .c_val = imports.%Main.c_val +// CHECK:STDOUT: .c_ptr = imports.%Main.c_ptr +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .b_val = imports.%Main.b_val +// CHECK:STDOUT: .b_ptr = imports.%Main.b_ptr // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .val = %val // CHECK:STDOUT: .ptr = %ptr.loc8_5 @@ -539,7 +539,7 @@ var ptr: E* = &val; // CHECK:STDOUT: %.loc7: %C = var_pattern %val.patt // CHECK:STDOUT: } // CHECK:STDOUT: %val.var: ref %C = var val -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.ff6 [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %val: ref %C = bind_name val, %val.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %ptr.019 = binding_pattern ptr @@ -547,17 +547,17 @@ var ptr: E* = &val; // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.var: ref %ptr.019 = var ptr // CHECK:STDOUT: %.loc8_11: type = splice_block %ptr.loc8_11 [template = constants.%ptr.019] { -// CHECK:STDOUT: %E.ref: type = name_ref E, imports.%import_ref.2c9 [template = constants.%C] +// CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [template = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %C [template = constants.%ptr.019] // CHECK:STDOUT: } // CHECK:STDOUT: %ptr.loc8_5: ref %ptr.019 = bind_name ptr, %ptr.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index 8218dc035797..c8a2fa116e47 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -78,19 +78,19 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.c07: type = import_ref Main//a, Cycle, loaded [template = constants.%Cycle] +// CHECK:STDOUT: %Main.Cycle: type = import_ref Main//a, Cycle, loaded [template = constants.%Cycle] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72d: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.3a6 = import_ref Main//a, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4e0 = import_ref Main//a, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.72d: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.3a6 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4e0 = import_ref Main//a, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Cycle = imports.%import_ref.c07 +// CHECK:STDOUT: .Cycle = imports.%Main.Cycle // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Run = %Run.decl // CHECK:STDOUT: } @@ -100,11 +100,11 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.72d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.72d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.3a6 -// CHECK:STDOUT: .a = imports.%import_ref.4e0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.3a6 +// CHECK:STDOUT: .a = imports.%Main.import_ref.4e0 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { @@ -115,7 +115,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref %ptr = var a // CHECK:STDOUT: %.loc7_15: type = splice_block %ptr [template = constants.%ptr] { -// CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, imports.%import_ref.c07 [template = constants.%Cycle] +// CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, imports.%Main.Cycle [template = constants.%Cycle] // CHECK:STDOUT: %ptr: type = ptr_type %Cycle [template = constants.%ptr] // CHECK:STDOUT: } // CHECK:STDOUT: %a: ref %ptr = bind_name a, %a.var diff --git a/toolchain/check/testdata/class/import_struct_cyle.carbon b/toolchain/check/testdata/class/import_struct_cyle.carbon index 1d7b36078dfe..571c4d1f76e5 100644 --- a/toolchain/check/testdata/class/import_struct_cyle.carbon +++ b/toolchain/check/testdata/class/import_struct_cyle.carbon @@ -99,21 +99,21 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.103 = import_ref Main//a, Cycle, unloaded -// CHECK:STDOUT: %import_ref.e18: ref %struct_type.b = import_ref Main//a, a, loaded +// CHECK:STDOUT: %Main.Cycle = import_ref Main//a, Cycle, unloaded +// CHECK:STDOUT: %Main.a: ref %struct_type.b = import_ref Main//a, a, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b93: = import_ref Main//a, loc11_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.3a6 = import_ref Main//a, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.455: %Cycle.elem = import_ref Main//a, loc10_8, loaded [template = %.354] +// CHECK:STDOUT: %Main.import_ref.b93: = import_ref Main//a, loc11_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.3a6 = import_ref Main//a, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.455: %Cycle.elem = import_ref Main//a, loc10_8, loaded [template = %.354] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Cycle = imports.%import_ref.103 -// CHECK:STDOUT: .a = imports.%import_ref.e18 +// CHECK:STDOUT: .Cycle = imports.%Main.Cycle +// CHECK:STDOUT: .a = imports.%Main.a // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Run = %Run.decl // CHECK:STDOUT: } @@ -123,22 +123,22 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.b93 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.b93 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.3a6 -// CHECK:STDOUT: .c = imports.%import_ref.455 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.3a6 +// CHECK:STDOUT: .c = imports.%Main.import_ref.455 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a.ref.loc7_3: ref %struct_type.b = name_ref a, imports.%import_ref.e18 +// CHECK:STDOUT: %a.ref.loc7_3: ref %struct_type.b = name_ref a, imports.%Main.a // CHECK:STDOUT: %.loc7_4: ref %ptr.257 = struct_access %a.ref.loc7_3, element0 -// CHECK:STDOUT: %a.ref.loc7_11: ref %struct_type.b = name_ref a, imports.%import_ref.e18 +// CHECK:STDOUT: %a.ref.loc7_11: ref %struct_type.b = name_ref a, imports.%Main.a // CHECK:STDOUT: %.loc7_12.1: ref %ptr.257 = struct_access %a.ref.loc7_11, element0 // CHECK:STDOUT: %.loc7_12.2: %ptr.257 = bind_value %.loc7_12.1 // CHECK:STDOUT: %.loc7_10: ref %Cycle = deref %.loc7_12.2 -// CHECK:STDOUT: %c.ref: %Cycle.elem = name_ref c, imports.%import_ref.455 [template = imports.%.354] +// CHECK:STDOUT: %c.ref: %Cycle.elem = name_ref c, imports.%Main.import_ref.455 [template = imports.%.354] // CHECK:STDOUT: %.loc7_15: ref %struct_type.b = class_element_access %.loc7_10, element0 // CHECK:STDOUT: %.loc7_17.1: ref %ptr.257 = struct_access %.loc7_15, element0 // CHECK:STDOUT: %.loc7_17.2: %ptr.257 = bind_value %.loc7_17.1 diff --git a/toolchain/check/testdata/class/inheritance_access.carbon b/toolchain/check/testdata/class/inheritance_access.carbon index 99a75d01a29e..e77c43e684bf 100644 --- a/toolchain/check/testdata/class/inheritance_access.carbon +++ b/toolchain/check/testdata/class/inheritance_access.carbon @@ -248,7 +248,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -368,7 +368,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -470,7 +470,7 @@ class B { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_5.64b, %Convert.956 [template] @@ -492,8 +492,8 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -624,7 +624,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -947,7 +947,7 @@ class B { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_5.64b, %Convert.956 [template] @@ -968,8 +968,8 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1129,7 +1129,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1208,7 +1208,7 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 03d0e18e7636..a33139a63391 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -41,7 +41,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index e55deb488845..b064ebd8cb86 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -32,7 +32,7 @@ fn F() -> i32 { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,8 +46,8 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 7cdf2058de53..8db1c4a2bac2 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -45,7 +45,7 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/local.carbon b/toolchain/check/testdata/class/local.carbon index 03606446b89c..e340f5c606c9 100644 --- a/toolchain/check/testdata/class/local.carbon +++ b/toolchain/check/testdata/class/local.carbon @@ -42,7 +42,7 @@ class A { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.n.44a: type = struct_type {.n: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -53,8 +53,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index b68cfa2a829b..2c6e641251cd 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -81,7 +81,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.k.240: type = struct_type {.k: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -104,8 +104,8 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 96670c3a60c9..9cf549c145e0 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -42,7 +42,7 @@ fn G(o: Outer) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/no_prelude/export_name.carbon b/toolchain/check/testdata/class/no_prelude/export_name.carbon index ced9ac5912ec..7a0bf83c8578 100644 --- a/toolchain/check/testdata/class/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/class/no_prelude/export_name.carbon @@ -70,9 +70,9 @@ var c: C = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//base, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -80,14 +80,14 @@ var c: C = {}; // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- use_export.carbon @@ -100,14 +100,14 @@ var c: C = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//export, inst19 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export, inst20 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//export, inst19 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst20 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -116,15 +116,15 @@ var c: C = {}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/class/no_prelude/extern.carbon b/toolchain/check/testdata/class/no_prelude/extern.carbon index e21ffe685178..a23e7579aa96 100644 --- a/toolchain/check/testdata/class/no_prelude/extern.carbon +++ b/toolchain/check/testdata/class/no_prelude/extern.carbon @@ -496,12 +496,12 @@ extern class C; // CHECK:STDOUT: --- fail_import_extern_decl_then_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//extern_decl, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -509,12 +509,12 @@ extern class C; // CHECK:STDOUT: --- fail_import_decl_then_extern_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//decl, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//decl, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -522,12 +522,12 @@ extern class C; // CHECK:STDOUT: --- fail_import_extern_decl_then_def.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//extern_decl, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -535,12 +535,12 @@ extern class C; // CHECK:STDOUT: --- fail_import_ownership_conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//extern_decl, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -548,12 +548,12 @@ extern class C; // CHECK:STDOUT: --- fail_todo_import_extern_decl_copy.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//extern_decl, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//extern_decl, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -605,8 +605,8 @@ extern class C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//def, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//def, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -618,10 +618,10 @@ extern class C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_extern_decl_after_import_def.carbon @@ -633,8 +633,8 @@ extern class C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//def, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//def, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -646,9 +646,9 @@ extern class C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/no_prelude/implicit_import.carbon b/toolchain/check/testdata/class/no_prelude/implicit_import.carbon index 24211decf9eb..ce3894e9ff37 100644 --- a/toolchain/check/testdata/class/no_prelude/implicit_import.carbon +++ b/toolchain/check/testdata/class/no_prelude/implicit_import.carbon @@ -156,8 +156,8 @@ class B {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//redecl_after_def, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//redecl_after_def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//redecl_after_def, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//redecl_after_def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -170,10 +170,10 @@ class B {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- redef_after_def.carbon @@ -209,14 +209,14 @@ class B {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//redef_after_def, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//redef_after_def, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//redef_after_def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//redef_after_def, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//redef_after_def, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//redef_after_def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -224,10 +224,10 @@ class B {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "redef_after_def.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @.1 { @@ -266,14 +266,14 @@ class B {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//def_alias, C, unloaded -// CHECK:STDOUT: %import_ref.8bd: type = import_ref Main//def_alias, B, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.C = import_ref Main//def_alias, C, unloaded +// CHECK:STDOUT: %Main.B: type = import_ref Main//def_alias, B, loaded [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .B = imports.%import_ref.8bd +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import diff --git a/toolchain/check/testdata/class/no_prelude/import_access.carbon b/toolchain/check/testdata/class/no_prelude/import_access.carbon index e7d61f875396..8c394b8dbc49 100644 --- a/toolchain/check/testdata/class/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/class/no_prelude/import_access.carbon @@ -208,14 +208,14 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.c21: type = import_ref Test//def, Def, loaded [template = constants.%Def] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Test//def, loc4_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.4ce = import_ref Test//def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Test.Def: type = import_ref Test//def, Def, loaded [template = constants.%Def] +// CHECK:STDOUT: %Test.import_ref.8f2: = import_ref Test//def, loc4_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Test.import_ref.4ce = import_ref Test//def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Def [private] = imports.%import_ref.c21 +// CHECK:STDOUT: .Def [private] = imports.%Test.Def // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -225,15 +225,15 @@ private class Redecl {} // CHECK:STDOUT: %.loc4: %Def = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %Def = var c -// CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%import_ref.c21 [template = constants.%Def] +// CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%Test.Def [template = constants.%Def] // CHECK:STDOUT: %c: ref %Def = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Def [from "def.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Test.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4ce +// CHECK:STDOUT: .Self = imports.%Test.import_ref.4ce // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -319,14 +319,14 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.142: type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Test//forward_with_def, loc6_23, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.414 = import_ref Test//forward_with_def, inst14 [no loc], unloaded +// CHECK:STDOUT: %Test.ForwardWithDef: type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef] +// CHECK:STDOUT: %Test.import_ref.8f2: = import_ref Test//forward_with_def, loc6_23, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Test.import_ref.414 = import_ref Test//forward_with_def, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .ForwardWithDef [private] = imports.%import_ref.142 +// CHECK:STDOUT: .ForwardWithDef [private] = imports.%Test.ForwardWithDef // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -336,15 +336,15 @@ private class Redecl {} // CHECK:STDOUT: %.loc4: %ForwardWithDef = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %ForwardWithDef = var c -// CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%import_ref.142 [template = constants.%ForwardWithDef] +// CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [template = constants.%ForwardWithDef] // CHECK:STDOUT: %c: ref %ForwardWithDef = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardWithDef [from "forward_with_def.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Test.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.414 +// CHECK:STDOUT: .Self = imports.%Test.import_ref.414 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -432,7 +432,7 @@ private class Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: type = import_ref Test//forward, Forward, loaded [template = constants.%Forward] +// CHECK:STDOUT: %Test.Forward: type = import_ref Test//forward, Forward, loaded [template = constants.%Forward] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -448,7 +448,7 @@ private class Redecl {} // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %ptr = value_param runtime_param0 // CHECK:STDOUT: %.loc4: type = splice_block %ptr [template = constants.%ptr] { -// CHECK:STDOUT: %Forward.ref: type = name_ref Forward, imports.%import_ref [template = constants.%Forward] +// CHECK:STDOUT: %Forward.ref: type = name_ref Forward, imports.%Test.Forward [template = constants.%Forward] // CHECK:STDOUT: %ptr: type = ptr_type %Forward [template = constants.%ptr] // CHECK:STDOUT: } // CHECK:STDOUT: %c: %ptr = bind_name c, %c.param diff --git a/toolchain/check/testdata/class/no_prelude/indirect_import_member.carbon b/toolchain/check/testdata/class/no_prelude/indirect_import_member.carbon index b32bbbafbfeb..951bc67db093 100644 --- a/toolchain/check/testdata/class/no_prelude/indirect_import_member.carbon +++ b/toolchain/check/testdata/class/no_prelude/indirect_import_member.carbon @@ -135,12 +135,12 @@ var x: () = D.C.F(); // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//a, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//a, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -154,10 +154,10 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.2cf = import_ref Main//a, loc5_10, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.2cf = import_ref Main//a, loc5_10, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -165,26 +165,26 @@ var x: () = D.C.F(); // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .F = imports.%import_ref.2cf +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .F = imports.%Main.import_ref.2cf // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- d.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//c, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//c, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -199,15 +199,15 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//c, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded -// CHECK:STDOUT: %import_ref.230 = import_ref Main//c, inst21 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//c, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.230 = import_ref Main//c, inst21 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .D = %D.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -216,8 +216,8 @@ var x: () = D.C.F(); // CHECK:STDOUT: // CHECK:STDOUT: class @D { // CHECK:STDOUT: %package.ref: = name_ref package, package [template = package] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] -// CHECK:STDOUT: %C: type = bind_alias C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %C: type = bind_alias C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %complete_type: = complete_type_witness %empty_struct_type [template = constants.%complete_type] // CHECK:STDOUT: complete_type_witness = %complete_type // CHECK:STDOUT: @@ -227,22 +227,22 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .F = imports.%import_ref.230 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .F = imports.%Main.import_ref.230 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- f.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//e, D, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//e, D, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -259,15 +259,15 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//a, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.943: %F.type = import_ref Main//a, loc5_10, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.C: type = import_ref Main//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//a, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//a, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.943: %F.type = import_ref Main//a, loc5_10, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -284,19 +284,19 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .F = imports.%import_ref.943 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .F = imports.%Main.import_ref.943 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "a.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.943 [template = constants.%F] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.943 [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return @@ -314,15 +314,15 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//c, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded -// CHECK:STDOUT: %import_ref.5d3: %F.type = import_ref Main//c, inst21 [indirect], loaded [template = constants.%F] +// CHECK:STDOUT: %Main.C: type = import_ref Main//c, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.5d3: %F.type = import_ref Main//c, inst21 [indirect], loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -339,19 +339,19 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .F = imports.%import_ref.5d3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .F = imports.%Main.import_ref.5d3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "a.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.5d3 [template = constants.%F] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.5d3 [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return @@ -369,15 +369,15 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//c, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded -// CHECK:STDOUT: %import_ref.5d3: %F.type = import_ref Main//c, inst21 [indirect], loaded [template = constants.%F] +// CHECK:STDOUT: %Main.C: type = import_ref Main//c, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//c, inst19 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//c, inst20 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.5d3: %F.type = import_ref Main//c, inst21 [indirect], loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -394,19 +394,19 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .F = imports.%import_ref.5d3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .F = imports.%Main.import_ref.5d3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "a.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.5d3 [template = constants.%F] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.5d3 [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return @@ -425,18 +425,18 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b0a: type = import_ref Main//e, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//e, loc8_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref Main//e, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.bf1: type = import_ref Main//e, loc7_9, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f3: = import_ref Main//e, inst22 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.db8 = import_ref Main//e, inst23 [indirect], unloaded -// CHECK:STDOUT: %import_ref.c85: %F.type = import_ref Main//e, inst24 [indirect], loaded [template = constants.%F] +// CHECK:STDOUT: %Main.D: type = import_ref Main//e, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//e, loc8_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.cab = import_ref Main//e, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.bf1: type = import_ref Main//e, loc7_9, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f3: = import_ref Main//e, inst22 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.db8 = import_ref Main//e, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.c85: %F.type = import_ref Main//e, inst24 [indirect], loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.b0a +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -453,28 +453,28 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "e.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab -// CHECK:STDOUT: .C = imports.%import_ref.bf1 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cab +// CHECK:STDOUT: .C = imports.%Main.import_ref.bf1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "e.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.db8 -// CHECK:STDOUT: .F = imports.%import_ref.c85 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.db8 +// CHECK:STDOUT: .F = imports.%Main.import_ref.c85 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "a.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.bf1 [template = constants.%C] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.c85 [template = constants.%F] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.import_ref.bf1 [template = constants.%C] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.c85 [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return @@ -493,18 +493,18 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b0a: type = import_ref Main//e, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//e, loc8_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref Main//e, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.bf1: type = import_ref Main//e, loc7_9, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f3: = import_ref Main//e, inst22 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.db8 = import_ref Main//e, inst23 [indirect], unloaded -// CHECK:STDOUT: %import_ref.c85: %F.type = import_ref Main//e, inst24 [indirect], loaded [template = constants.%F] +// CHECK:STDOUT: %Main.D: type = import_ref Main//e, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//e, loc8_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.cab = import_ref Main//e, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.bf1: type = import_ref Main//e, loc7_9, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f3: = import_ref Main//e, inst22 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.db8 = import_ref Main//e, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.c85: %F.type = import_ref Main//e, inst24 [indirect], loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.b0a +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -521,28 +521,28 @@ var x: () = D.C.F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "e.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab -// CHECK:STDOUT: .C = imports.%import_ref.bf1 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cab +// CHECK:STDOUT: .C = imports.%Main.import_ref.bf1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "e.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.db8 -// CHECK:STDOUT: .F = imports.%import_ref.c85 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.db8 +// CHECK:STDOUT: .F = imports.%Main.import_ref.c85 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "a.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.bf1 [template = constants.%C] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.c85 [template = constants.%F] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.import_ref.bf1 [template = constants.%C] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.import_ref.c85 [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/class/no_prelude/no_definition_in_impl_file.carbon b/toolchain/check/testdata/class/no_prelude/no_definition_in_impl_file.carbon index 159883668d55..085af0d8ae1f 100644 --- a/toolchain/check/testdata/class/no_prelude/no_definition_in_impl_file.carbon +++ b/toolchain/check/testdata/class/no_prelude/no_definition_in_impl_file.carbon @@ -125,12 +125,12 @@ class D; // CHECK:STDOUT: --- use_decl_in_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//decl_in_api_definition_in_impl, A, unloaded +// CHECK:STDOUT: %Main.A = import_ref Main//decl_in_api_definition_in_impl, A, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -154,12 +154,12 @@ class D; // CHECK:STDOUT: --- decl_only_in_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//decl_only_in_api, B, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//decl_only_in_api, B, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .B = imports.%import_ref +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import diff --git a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon index 689bd4d049d3..d405977279e7 100644 --- a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon @@ -588,16 +588,16 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.05a: type = import_ref Main//two_file, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//two_file, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .D = imports.%import_ref.05a +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: .Bar = %Bar.decl // CHECK:STDOUT: } @@ -608,7 +608,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc4, runtime_param [symbolic = constants.%a.patt] // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %a.loc4: %C = bind_symbolic_name a, 0, %a.param [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = class_decl @Bar [template = constants.%Bar.generic] { @@ -616,16 +616,16 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc5, runtime_param [symbolic = constants.%a.patt] // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.05a [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %a.loc5: %C = bind_symbolic_name a, 0, %a.param [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Foo(constants.%a: %C) { @@ -978,21 +978,21 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: .D = %D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %D: type = bind_alias D, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.generic] { // CHECK:STDOUT: %a.patt.loc6: %C = symbolic_binding_pattern a, 0 [symbolic = constants.%a.patt] // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc6, runtime_param [symbolic = constants.%a.patt] @@ -1004,10 +1004,10 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "alias_two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Foo(constants.%a: %C) { diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index ec7b9143654f..320fe281a0aa 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -42,7 +42,7 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index 70487827ebb5..611190da55b5 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -30,7 +30,7 @@ fn Class.F[self: Self](b: bool) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index f901a4e500ac..279a6a2e2311 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -34,7 +34,7 @@ fn Class.F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/reorder.carbon b/toolchain/check/testdata/class/reorder.carbon index 60bbcb41f41c..454133f882fb 100644 --- a/toolchain/check/testdata/class/reorder.carbon +++ b/toolchain/check/testdata/class/reorder.carbon @@ -32,7 +32,7 @@ class Class { // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -42,8 +42,8 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/reorder_qualified.carbon b/toolchain/check/testdata/class/reorder_qualified.carbon index a0a51470ae31..7c5908cdbab0 100644 --- a/toolchain/check/testdata/class/reorder_qualified.carbon +++ b/toolchain/check/testdata/class/reorder_qualified.carbon @@ -81,7 +81,7 @@ class A { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -110,8 +110,8 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 5fedbf685985..30c2093bd2a2 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -41,7 +41,7 @@ fn Run() { // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -59,8 +59,8 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index 074bb2d27167..1d24e19d0c23 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -60,7 +60,7 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -186,7 +186,7 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index e36b3c50d1d8..b2ab208a1211 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -53,7 +53,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: %complete_type.15c: = complete_type_witness %struct_type.base.b1e [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -66,8 +66,8 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index a7cbb49803f5..5d6f5ca379bf 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -40,7 +40,7 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 0447a9aae2d4..f052fd5a4554 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -33,7 +33,7 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/syntactic_merge_literal.carbon b/toolchain/check/testdata/class/syntactic_merge_literal.carbon index db43ce589f02..99d87d019e92 100644 --- a/toolchain/check/testdata/class/syntactic_merge_literal.carbon +++ b/toolchain/check/testdata/class/syntactic_merge_literal.carbon @@ -45,7 +45,7 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_1000.ff9: Core.IntLiteral = int_value 1000 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1000.ff9, %Convert.956 [template] @@ -61,8 +61,8 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -183,7 +183,7 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_1000.ff9: Core.IntLiteral = int_value 1000 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1000.ff9, %Convert.956 [template] @@ -201,8 +201,8 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/todo_access_modifiers.carbon b/toolchain/check/testdata/class/todo_access_modifiers.carbon index be1d6e5763a3..80e74f3f9498 100644 --- a/toolchain/check/testdata/class/todo_access_modifiers.carbon +++ b/toolchain/check/testdata/class/todo_access_modifiers.carbon @@ -36,7 +36,7 @@ class Access { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/virtual_modifiers.carbon b/toolchain/check/testdata/class/virtual_modifiers.carbon index 46078101ea78..bd1efabff9f5 100644 --- a/toolchain/check/testdata/class/virtual_modifiers.carbon +++ b/toolchain/check/testdata/class/virtual_modifiers.carbon @@ -252,13 +252,13 @@ class Derived { // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Modifiers: = namespace file.%Modifiers.import, [template] { -// CHECK:STDOUT: .Base = %import_ref.917 +// CHECK:STDOUT: .Base = %Modifiers.Base // CHECK:STDOUT: import Modifiers//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.917: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] -// CHECK:STDOUT: %import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type.513] -// CHECK:STDOUT: %import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded +// CHECK:STDOUT: %Modifiers.Base: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] +// CHECK:STDOUT: %Modifiers.import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type.513] +// CHECK:STDOUT: %Modifiers.import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded +// CHECK:STDOUT: %Modifiers.import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -274,7 +274,7 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %Modifiers.ref: = name_ref Modifiers, imports.%Modifiers [template = imports.%Modifiers] -// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%import_ref.917 [template = constants.%Base] +// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%Modifiers.Base [template = constants.%Base] // CHECK:STDOUT: %.loc7: %Derived.elem = base_decl %Base.ref, element0 [template] // CHECK:STDOUT: %H.decl: %H.type.dba = fn_decl @H.1 [template = constants.%H.bce] {} {} // CHECK:STDOUT: %.loc9: = vtable (%H.decl) [template = constants.%.dce] @@ -289,11 +289,11 @@ class Derived { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base [from "modifiers.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.05e +// CHECK:STDOUT: complete_type_witness = imports.%Modifiers.import_ref.05e // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1f3 -// CHECK:STDOUT: .H = imports.%import_ref.2cc +// CHECK:STDOUT: .Self = imports.%Modifiers.import_ref.1f3 +// CHECK:STDOUT: .H = imports.%Modifiers.import_ref.2cc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl fn @H.1(); @@ -324,13 +324,13 @@ class Derived { // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Modifiers: = namespace file.%Modifiers.import, [template] { -// CHECK:STDOUT: .Base = %import_ref.917 +// CHECK:STDOUT: .Base = %Modifiers.Base // CHECK:STDOUT: import Modifiers//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.917: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] -// CHECK:STDOUT: %import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type.513] -// CHECK:STDOUT: %import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded +// CHECK:STDOUT: %Modifiers.Base: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] +// CHECK:STDOUT: %Modifiers.import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type.513] +// CHECK:STDOUT: %Modifiers.import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded +// CHECK:STDOUT: %Modifiers.import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -347,7 +347,7 @@ class Derived { // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} {} // CHECK:STDOUT: %Modifiers.ref: = name_ref Modifiers, imports.%Modifiers [template = imports.%Modifiers] -// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%import_ref.917 [template = constants.%Base] +// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%Modifiers.Base [template = constants.%Base] // CHECK:STDOUT: %.loc8: %Derived.elem = base_decl %Base.ref, element0 [template] // CHECK:STDOUT: %.loc9: = vtable (constants.%H, %F.decl) [template = constants.%.02f] // CHECK:STDOUT: %complete_type: = complete_type_witness %struct_type.base [template = constants.%complete_type.0e2] @@ -361,11 +361,11 @@ class Derived { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base [from "modifiers.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.05e +// CHECK:STDOUT: complete_type_witness = imports.%Modifiers.import_ref.05e // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1f3 -// CHECK:STDOUT: .H = imports.%import_ref.2cc +// CHECK:STDOUT: .Self = imports.%Modifiers.import_ref.1f3 +// CHECK:STDOUT: .H = imports.%Modifiers.import_ref.2cc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: virtual fn @F(); @@ -390,13 +390,13 @@ class Derived { // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Modifiers: = namespace file.%Modifiers.import, [template] { -// CHECK:STDOUT: .Base = %import_ref.917 +// CHECK:STDOUT: .Base = %Modifiers.Base // CHECK:STDOUT: import Modifiers//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.917: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] -// CHECK:STDOUT: %import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded -// CHECK:STDOUT: %import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded +// CHECK:STDOUT: %Modifiers.Base: type = import_ref Modifiers//default, Base, loaded [template = constants.%Base] +// CHECK:STDOUT: %Modifiers.import_ref.05e: = import_ref Modifiers//default, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Modifiers.import_ref.1f3 = import_ref Modifiers//default, inst16 [no loc], unloaded +// CHECK:STDOUT: %Modifiers.import_ref.2cc = import_ref Modifiers//default, loc5_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -411,11 +411,11 @@ class Derived { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base [from "modifiers.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.05e +// CHECK:STDOUT: complete_type_witness = imports.%Modifiers.import_ref.05e // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1f3 -// CHECK:STDOUT: .H = imports.%import_ref.2cc +// CHECK:STDOUT: .Self = imports.%Modifiers.import_ref.1f3 +// CHECK:STDOUT: .H = imports.%Modifiers.import_ref.2cc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { @@ -434,7 +434,7 @@ class Derived { // CHECK:STDOUT: assign %v.var, %.loc7_3.2 // CHECK:STDOUT: %.loc7_19: type = splice_block %Base.ref [template = constants.%Base] { // CHECK:STDOUT: %Modifiers.ref: = name_ref Modifiers, imports.%Modifiers [template = imports.%Modifiers] -// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%import_ref.917 [template = constants.%Base] +// CHECK:STDOUT: %Base.ref: type = name_ref Base, imports.%Modifiers.Base [template = constants.%Base] // CHECK:STDOUT: } // CHECK:STDOUT: %v: ref %Base = bind_name v, %v.var // CHECK:STDOUT: return @@ -658,7 +658,7 @@ class Derived { // CHECK:STDOUT: %F.c41: %F.type.b25 = struct_value () [template] // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.b30: = bound_method %int_3.1ba, %Convert.956 [template] @@ -678,8 +678,8 @@ class Derived { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/basic.carbon b/toolchain/check/testdata/const/basic.carbon index aebfdaa06052..8f572c8c5322 100644 --- a/toolchain/check/testdata/const/basic.carbon +++ b/toolchain/check/testdata/const/basic.carbon @@ -34,7 +34,7 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 02738f2f847f..e5a0191a056d 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -31,7 +31,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index 1f0a7f4b4f4e..5d456f2e3178 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -39,8 +39,8 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index 8efe6b858ea3..0a62c364f2c9 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -39,7 +39,7 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -111,11 +111,11 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bde = import_ref Implicit//default, F, unloaded -// CHECK:STDOUT: %import_ref.ae7: ref %const = import_ref Implicit//default, a_ref, loaded -// CHECK:STDOUT: %import_ref.1ef: ref %ptr = import_ref Implicit//default, a_ptr_ref, loaded +// CHECK:STDOUT: %Implicit.F = import_ref Implicit//default, F, unloaded +// CHECK:STDOUT: %Implicit.a_ref: ref %const = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.a_ptr_ref: ref %ptr = import_ref Implicit//default, a_ptr_ref, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -123,9 +123,9 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref.bde -// CHECK:STDOUT: .a_ref = imports.%import_ref.ae7 -// CHECK:STDOUT: .a_ptr_ref = imports.%import_ref.1ef +// CHECK:STDOUT: .F = imports.%Implicit.F +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .a_ptr_ref = imports.%Implicit.a_ptr_ref // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .a_ptr = %a_ptr @@ -161,10 +161,10 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref %const = name_ref a_ref, imports.%import_ref.ae7 +// CHECK:STDOUT: %a_ref.ref: ref %const = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: %addr: %ptr = addr_of %a_ref.ref // CHECK:STDOUT: assign file.%a.var, %addr -// CHECK:STDOUT: %a_ptr_ref.ref: ref %ptr = name_ref a_ptr_ref, imports.%import_ref.1ef +// CHECK:STDOUT: %a_ptr_ref.ref: ref %ptr = name_ref a_ptr_ref, imports.%Implicit.a_ptr_ref // CHECK:STDOUT: %.loc7: %ptr = bind_value %a_ptr_ref.ref // CHECK:STDOUT: assign file.%a_ptr.var, %.loc7 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/deduce/array.carbon b/toolchain/check/testdata/deduce/array.carbon index 875efe7cc796..9add0f9e9409 100644 --- a/toolchain/check/testdata/deduce/array.carbon +++ b/toolchain/check/testdata/deduce/array.carbon @@ -139,7 +139,7 @@ fn G() -> i32 { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -159,8 +159,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -316,7 +316,7 @@ fn G() -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %require_complete.d82: = require_complete_type %array_type.6a2 [symbolic] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.41f: = bound_method %N, %Convert.956 [symbolic] @@ -341,13 +341,13 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f0 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f0: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -372,7 +372,7 @@ fn G() -> i32 { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc6_26.1: type = splice_block %.loc6_26.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f0 [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc6_26.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc6_26.3: type = converted %int_literal.make_type, %.loc6_26.2 [template = Core.IntLiteral] @@ -524,11 +524,11 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -553,7 +553,7 @@ fn G() -> i32 { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc6_36.1: type = splice_block %.loc6_36.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc6_36.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc6_36.3: type = converted %int_literal.make_type, %.loc6_36.2 [template = Core.IntLiteral] @@ -671,7 +671,7 @@ fn G() -> i32 { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -692,8 +692,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -850,7 +850,7 @@ fn G() -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %require_complete.d82: = require_complete_type %array_type.6a2 [symbolic] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.41f: = bound_method %N, %Convert.956 [symbolic] @@ -876,13 +876,13 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f0 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f0: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -909,7 +909,7 @@ fn G() -> i32 { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc7_26.1: type = splice_block %.loc7_26.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f0 [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc7_26.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc7_26.3: type = converted %int_literal.make_type, %.loc7_26.2 [template = Core.IntLiteral] @@ -1047,7 +1047,7 @@ fn G() -> i32 { // CHECK:STDOUT: %N.51e: %i32 = bind_symbolic_name N, 0 [symbolic] // CHECK:STDOUT: %N.patt.8e2: %i32 = symbolic_binding_pattern N, 0 [symbolic] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %N.51e, %Convert.960 [symbolic] @@ -1071,8 +1071,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/generic_type.carbon b/toolchain/check/testdata/deduce/generic_type.carbon index 54e9980b7856..2529bc1bf957 100644 --- a/toolchain/check/testdata/deduce/generic_type.carbon +++ b/toolchain/check/testdata/deduce/generic_type.carbon @@ -750,7 +750,7 @@ fn G() -> i32 { // CHECK:STDOUT: %G: %G.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -763,8 +763,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/deduce/int_float.carbon b/toolchain/check/testdata/deduce/int_float.carbon index 58136d7f5a9d..cb9cd57b8b49 100644 --- a/toolchain/check/testdata/deduce/int_float.carbon +++ b/toolchain/check/testdata/deduce/int_float.carbon @@ -61,13 +61,13 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] -// CHECK:STDOUT: %import_ref.485: %Int.type = import_ref Core//prelude/types/int, Int, loaded [template = constants.%Int.generic] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/types/int, Int, loaded [template = constants.%Int.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -86,14 +86,14 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %return.param_patt: Core.IntLiteral = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { // CHECK:STDOUT: %Core.ref.loc4_48: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref.loc4_52: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref.loc4_52: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type.loc4_64: init type = call %IntLiteral.ref.loc4_52() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_64.1: type = value_of_initializer %int_literal.make_type.loc4_64 [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_64.2: type = converted %int_literal.make_type.loc4_64, %.loc4_64.1 [template = Core.IntLiteral] // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc4_26.1: type = splice_block %.loc4_26.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref.loc4_10: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref.loc4_14: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref.loc4_14: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type.loc4_26: init type = call %IntLiteral.ref.loc4_14() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_26.2: type = value_of_initializer %int_literal.make_type.loc4_26 [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_26.3: type = converted %int_literal.make_type.loc4_26, %.loc4_26.2 [template = Core.IntLiteral] @@ -102,7 +102,7 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %n.param: @F.%Int.loc4_42.2 (%Int) = value_param runtime_param0 // CHECK:STDOUT: %.loc4_42: type = splice_block %Int.loc4_42.1 [symbolic = %Int.loc4_42.2 (constants.%Int)] { // CHECK:STDOUT: %Core.ref.loc4_32: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Int.ref: %Int.type = name_ref Int, imports.%import_ref.485 [template = constants.%Int.generic] +// CHECK:STDOUT: %Int.ref: %Int.type = name_ref Int, imports.%Core.Int [template = constants.%Int.generic] // CHECK:STDOUT: %N.ref.loc4: Core.IntLiteral = name_ref N, %N.loc4_6.1 [symbolic = %N.loc4_6.2 (constants.%N)] // CHECK:STDOUT: %Int.loc4_42.1: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc4_42.2 (constants.%Int)] // CHECK:STDOUT: } @@ -117,7 +117,7 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %return.param_patt: Core.IntLiteral = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc8_33.1: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc8_33.2: type = converted %int_literal.make_type, %.loc8_33.1 [template = Core.IntLiteral] @@ -191,13 +191,13 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] -// CHECK:STDOUT: %import_ref.1d6: %Float.type = import_ref Core//prelude/types, Float, loaded [template = constants.%Float] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.Float: %Float.type = import_ref Core//prelude/types, Float, loaded [template = constants.%Float] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -216,14 +216,14 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %return.param_patt: Core.IntLiteral = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { // CHECK:STDOUT: %Core.ref.loc9_50: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref.loc9_54: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref.loc9_54: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type.loc9_66: init type = call %IntLiteral.ref.loc9_54() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc9_66.1: type = value_of_initializer %int_literal.make_type.loc9_66 [template = Core.IntLiteral] // CHECK:STDOUT: %.loc9_66.2: type = converted %int_literal.make_type.loc9_66, %.loc9_66.1 [template = Core.IntLiteral] // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc9_26.1: type = splice_block %.loc9_26.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref.loc9_10: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref.loc9_14: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref.loc9_14: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type.loc9_26: init type = call %IntLiteral.ref.loc9_14() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc9_26.2: type = value_of_initializer %int_literal.make_type.loc9_26 [template = Core.IntLiteral] // CHECK:STDOUT: %.loc9_26.3: type = converted %int_literal.make_type.loc9_26, %.loc9_26.2 [template = Core.IntLiteral] @@ -232,7 +232,7 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %n.param: = value_param runtime_param0 // CHECK:STDOUT: %.1: = splice_block [template = ] { // CHECK:STDOUT: %Core.ref.loc9_32: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%import_ref.1d6 [template = constants.%Float] +// CHECK:STDOUT: %Float.ref: %Float.type = name_ref Float, imports.%Core.Float [template = constants.%Float] // CHECK:STDOUT: %N.ref.loc9: Core.IntLiteral = name_ref N, %N.loc9_6.1 [symbolic = %N.loc9_6.2 (constants.%N)] // CHECK:STDOUT: %float.make_type: init type = call %Float.ref(%N.ref.loc9) // CHECK:STDOUT: %.loc9_44.1: type = value_of_initializer %float.make_type @@ -249,7 +249,7 @@ fn G(a: f64) -> Core.IntLiteral() { // CHECK:STDOUT: %return.param_patt: Core.IntLiteral = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc13_33.1: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc13_33.2: type = converted %int_literal.make_type, %.loc13_33.1 [template = Core.IntLiteral] diff --git a/toolchain/check/testdata/deduce/tuple.carbon b/toolchain/check/testdata/deduce/tuple.carbon index 4e11b0be0465..e9ef19b35daf 100644 --- a/toolchain/check/testdata/deduce/tuple.carbon +++ b/toolchain/check/testdata/deduce/tuple.carbon @@ -247,7 +247,7 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -265,8 +265,8 @@ fn G(pair: (C, D)) -> D { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/eval/aggregate.carbon b/toolchain/check/testdata/eval/aggregate.carbon index 54a16590b738..74761d636834 100644 --- a/toolchain/check/testdata/eval/aggregate.carbon +++ b/toolchain/check/testdata/eval/aggregate.carbon @@ -27,7 +27,7 @@ var struct_access: [i32; 1] = (0,) as [i32; {.a = 3, .b = 1}.b]; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -64,8 +64,8 @@ var struct_access: [i32; 1] = (0,) as [i32; {.a = 3, .b = 1}.b]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/eval/fail_aggregate.carbon b/toolchain/check/testdata/eval/fail_aggregate.carbon index 7fcec6d4d40f..ee63fa048332 100644 --- a/toolchain/check/testdata/eval/fail_aggregate.carbon +++ b/toolchain/check/testdata/eval/fail_aggregate.carbon @@ -32,7 +32,7 @@ var array_index: [i32; 1] = (0,) as [i32; ((5, 7, 1, 9) as [i32; 4])[2]]; // CHECK:STDOUT: %int_4: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %array_type.f32: type = array_type %int_4, %i32 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.4e6: = bound_method %int_5.64b, %Convert.956 [template] @@ -57,8 +57,8 @@ var array_index: [i32; 1] = (0,) as [i32; ((5, 7, 1, 9) as [i32; 4])[2]]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/eval/symbolic.carbon b/toolchain/check/testdata/eval/symbolic.carbon index 567272315c7d..f94e672b0517 100644 --- a/toolchain/check/testdata/eval/symbolic.carbon +++ b/toolchain/check/testdata/eval/symbolic.carbon @@ -43,7 +43,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %G.type: type = fn_type @G [template] // CHECK:STDOUT: %G: %G.type = struct_value () [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %N.51e, %Convert.960 [symbolic] @@ -55,8 +55,8 @@ fn G(N:! i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon index 5da411bf3f30..4f86bfcc63c9 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -38,7 +38,7 @@ fn H() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/call.carbon b/toolchain/check/testdata/function/builtin/call.carbon index 565479ebd0ef..e64f399d4d71 100644 --- a/toolchain/check/testdata/function/builtin/call.carbon +++ b/toolchain/check/testdata/function/builtin/call.carbon @@ -27,7 +27,7 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -37,7 +37,7 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %Convert.specific_fn.787: = specific_function %Convert.bound.ef9, @Convert.2(%int_32) [template] // CHECK:STDOUT: %int_2.ef8: %i32 = int_value 2 [template] // CHECK:STDOUT: %int_3.822: %i32 = int_value 3 [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound.2d6: = bound_method %int_3.822, %Convert.960 [template] @@ -50,8 +50,8 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/definition.carbon b/toolchain/check/testdata/function/builtin/definition.carbon index a22e24ad96d9..ad2ce8250c82 100644 --- a/toolchain/check/testdata/function/builtin/definition.carbon +++ b/toolchain/check/testdata/function/builtin/definition.carbon @@ -21,7 +21,7 @@ fn Add(a: i32, b: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/fail_redefined.carbon b/toolchain/check/testdata/function/builtin/fail_redefined.carbon index 516b14301500..fb2971750a3b 100644 --- a/toolchain/check/testdata/function/builtin/fail_redefined.carbon +++ b/toolchain/check/testdata/function/builtin/fail_redefined.carbon @@ -59,7 +59,7 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/method.carbon b/toolchain/check/testdata/function/builtin/method.carbon index 63cc79195990..97e45e569e12 100644 --- a/toolchain/check/testdata/function/builtin/method.carbon +++ b/toolchain/check/testdata/function/builtin/method.carbon @@ -37,7 +37,7 @@ var arr: [i32; (1 as i32).(I.F)(2)]; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.2, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.4(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.4(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.4(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound.c1b: = bound_method %int_1.5b8, %Convert.197 [template] @@ -46,14 +46,14 @@ var arr: [i32; (1 as i32).(I.F)(2)]; // CHECK:STDOUT: %F.bound: = bound_method %int_1.5d2, %F.9ec [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.2, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ef9: = bound_method %int_2.ecc, %Convert.956 [template] // CHECK:STDOUT: %Convert.specific_fn.787: = specific_function %Convert.bound.ef9, @Convert.3(%int_32) [template] // CHECK:STDOUT: %int_2.ef8: %i32 = int_value 2 [template] // CHECK:STDOUT: %int_3.822: %i32 = int_value 3 [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.4, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound.2d6: = bound_method %int_3.822, %Convert.960 [template] @@ -64,9 +64,9 @@ var arr: [i32; (1 as i32).(I.F)(2)]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 333100932e26..cdb28c177b6f 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 @@ -583,13 +583,13 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Convert.95f: %Convert.type.843 = struct_value () [symbolic] // CHECK:STDOUT: %Self.as_type.04d: type = facet_access_type %Self.65a [symbolic] // CHECK:STDOUT: %Convert.assoc_type.1e9: type = assoc_entity_type %As.type.eed, %Convert.type.843 [symbolic] -// CHECK:STDOUT: %assoc0.4ac002.1: %Convert.assoc_type.1e9 = assoc_entity element0, imports.%import_ref.4e8b20.1 [symbolic] +// CHECK:STDOUT: %assoc0.4ac002.1: %Convert.assoc_type.1e9 = assoc_entity element0, imports.%Core.import_ref.4e8b20.1 [symbolic] // CHECK:STDOUT: %As.type.a6d: type = facet_type <@As, @As(%i32.builtin)> [template] // CHECK:STDOUT: %Convert.type.378: type = fn_type @Convert.1, @As(%i32.builtin) [template] // CHECK:STDOUT: %Convert.e51: %Convert.type.378 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.b93: type = assoc_entity_type %As.type.a6d, %Convert.type.378 [template] -// CHECK:STDOUT: %assoc0.9da: %Convert.assoc_type.b93 = assoc_entity element0, imports.%import_ref.4e8b20.1 [template] -// CHECK:STDOUT: %assoc0.4ac002.2: %Convert.assoc_type.1e9 = assoc_entity element0, imports.%import_ref.4e8b20.2 [symbolic] +// CHECK:STDOUT: %assoc0.9da: %Convert.assoc_type.b93 = assoc_entity element0, imports.%Core.import_ref.4e8b20.1 [template] +// CHECK:STDOUT: %assoc0.4ac002.2: %Convert.assoc_type.1e9 = assoc_entity element0, imports.%Core.import_ref.4e8b20.2 [symbolic] // CHECK:STDOUT: %Add.type: type = facet_type <@Add> [template] // CHECK:STDOUT: %Self.a99: %Add.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %ImplicitAs.type.d62: type = facet_type <@ImplicitAs, @ImplicitAs(%T)> [symbolic] @@ -599,17 +599,17 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Convert.42e: %Convert.type.275 = struct_value () [symbolic] // CHECK:STDOUT: %Self.as_type.40a: type = facet_access_type %Self.519 [symbolic] // CHECK:STDOUT: %Convert.assoc_type.c0e: type = assoc_entity_type %ImplicitAs.type.d62, %Convert.type.275 [symbolic] -// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.1 [symbolic] +// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic] // CHECK:STDOUT: %Convert.type.059: type = fn_type @Convert.2, @ImplicitAs(%i32.builtin) [template] // CHECK:STDOUT: %Convert.4d7: %Convert.type.059 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.40f: type = assoc_entity_type %ImplicitAs.type.61e, %Convert.type.059 [template] -// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%import_ref.207961.2 [template] +// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%Core.import_ref.207961.2 [template] // CHECK:STDOUT: %ImplicitAs.type.2fd: type = facet_type <@ImplicitAs, @ImplicitAs(Core.IntLiteral)> [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.2, @ImplicitAs(Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.0e2: %Convert.type.71e = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.94e: type = assoc_entity_type %ImplicitAs.type.2fd, %Convert.type.71e [template] -// CHECK:STDOUT: %assoc0.3db: %Convert.assoc_type.94e = assoc_entity element0, imports.%import_ref.207961.3 [template] -// CHECK:STDOUT: %impl_witness.d9b: = impl_witness (imports.%import_ref.73a) [template] +// CHECK:STDOUT: %assoc0.3db: %Convert.assoc_type.94e = assoc_entity element0, imports.%Core.import_ref.207961.3 [template] +// CHECK:STDOUT: %impl_witness.d9b: = impl_witness (imports.%Core.import_ref.73a) [template] // CHECK:STDOUT: %Convert.type.953: type = fn_type @Convert.3 [template] // CHECK:STDOUT: %Convert.5bc: %Convert.type.953 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.b34: = bound_method %int_1.5b8, %Convert.5bc [template] @@ -620,14 +620,14 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Op.type.545: type = fn_type @Op.1 [template] // CHECK:STDOUT: %Self.as_type.da9: type = facet_access_type %Self.a99 [symbolic] // CHECK:STDOUT: %Op.assoc_type: type = assoc_entity_type %Add.type, %Op.type.545 [template] -// CHECK:STDOUT: %assoc0.8e5: %Op.assoc_type = assoc_entity element0, imports.%import_ref.047 [template] -// CHECK:STDOUT: %impl_witness.bd0: = impl_witness (imports.%import_ref.db4) [template] +// CHECK:STDOUT: %assoc0.8e5: %Op.assoc_type = assoc_entity element0, imports.%Core.import_ref.047 [template] +// CHECK:STDOUT: %impl_witness.bd0: = impl_witness (imports.%Core.import_ref.db4) [template] // CHECK:STDOUT: %Op.type.240: type = fn_type @Op.2 [template] // CHECK:STDOUT: %Op.0e2: %Op.type.240 = struct_value () [template] // CHECK:STDOUT: %Op.bound.393: = bound_method %int_1.f38, %Op.0e2 [template] // CHECK:STDOUT: %int_3.a0f: %i32.builtin = int_value 3 [template] -// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.4 [symbolic] -// CHECK:STDOUT: %impl_witness.8f3: = impl_witness (imports.%import_ref.4f9) [template] +// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.4 [symbolic] +// CHECK:STDOUT: %impl_witness.8f3: = impl_witness (imports.%Core.import_ref.4f9) [template] // CHECK:STDOUT: %Convert.type.0e4: type = fn_type @Convert.4 [template] // CHECK:STDOUT: %Convert.b32: %Convert.type.0e4 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.65a: = bound_method %int_3.a0f, %Convert.b32 [template] @@ -641,7 +641,7 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %int_7: %i32.builtin = int_value 7 [template] // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, %i32.builtin) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] -// CHECK:STDOUT: %impl_witness.39c: = impl_witness (imports.%import_ref.f35) [template] +// CHECK:STDOUT: %impl_witness.39c: = impl_witness (imports.%Core.import_ref.f35) [template] // CHECK:STDOUT: %Convert.type.49f: type = fn_type @Convert.5 [template] // CHECK:STDOUT: %Convert.cb5: %Convert.type.49f = struct_value () [template] // CHECK:STDOUT: %Convert.bound.b6b: = bound_method %int_3.1ba, %Convert.cb5 [template] @@ -651,35 +651,35 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.3b9 -// CHECK:STDOUT: .As = %import_ref.16b -// CHECK:STDOUT: .Add = %import_ref.fe6 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As +// CHECK:STDOUT: .Add = %Core.Add +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.a7c = import_ref Core//default, inst85 [no loc], unloaded -// CHECK:STDOUT: %import_ref.638: @As.%Convert.assoc_type (%Convert.assoc_type.1e9) = import_ref Core//default, loc12_32, loaded [symbolic = @As.%assoc0 (constants.%assoc0.4ac002.2)] -// CHECK:STDOUT: %import_ref.313 = import_ref Core//default, Convert, unloaded -// CHECK:STDOUT: %import_ref.4e8b20.1 = import_ref Core//default, loc12_32, unloaded -// CHECK:STDOUT: %import_ref.595: = import_ref Core//default, loc19_17, loaded [template = constants.%impl_witness.bd0] -// CHECK:STDOUT: %import_ref.07c = import_ref Core//default, inst39 [no loc], unloaded -// CHECK:STDOUT: %import_ref.a6b: %Op.assoc_type = import_ref Core//default, loc8_41, loaded [template = constants.%assoc0.8e5] -// CHECK:STDOUT: %import_ref.044 = import_ref Core//default, Op, unloaded -// CHECK:STDOUT: %import_ref.c8c7cd.1: type = import_ref Core//default, loc19_6, loaded [template = constants.%i32.builtin] -// CHECK:STDOUT: %import_ref.bf0: type = import_ref Core//default, loc19_13, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.8aa: = import_ref Core//default, loc23_30, loaded [template = constants.%impl_witness.d9b] -// CHECK:STDOUT: %import_ref.8721d7.1: type = import_ref Core//default, loc23_17, loaded [template = Core.IntLiteral] -// CHECK:STDOUT: %import_ref.1e5: type = import_ref Core//default, loc23_28, loaded [template = constants.%As.type.a6d] -// CHECK:STDOUT: %import_ref.de9: = import_ref Core//default, loc27_38, loaded [template = constants.%impl_witness.39c] -// CHECK:STDOUT: %import_ref.ff5 = import_ref Core//default, inst128 [no loc], unloaded -// CHECK:STDOUT: %import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc16_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] -// CHECK:STDOUT: %import_ref.e69 = import_ref Core//default, Convert, unloaded -// CHECK:STDOUT: %import_ref.8721d7.2: type = import_ref Core//default, loc27_17, loaded [template = Core.IntLiteral] -// CHECK:STDOUT: %import_ref.4d9: type = import_ref Core//default, loc27_36, loaded [template = constants.%ImplicitAs.type.61e] -// CHECK:STDOUT: %import_ref.207961.1 = import_ref Core//default, loc16_32, unloaded -// CHECK:STDOUT: %import_ref.3b6: = import_ref Core//default, loc31_38, loaded [template = constants.%impl_witness.8f3] -// CHECK:STDOUT: %import_ref.c8c7cd.2: type = import_ref Core//default, loc31_6, loaded [template = constants.%i32.builtin] -// CHECK:STDOUT: %import_ref.efb: type = import_ref Core//default, loc31_36, loaded [template = constants.%ImplicitAs.type.2fd] +// CHECK:STDOUT: %Core.import_ref.a7c = import_ref Core//default, inst85 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.638: @As.%Convert.assoc_type (%Convert.assoc_type.1e9) = import_ref Core//default, loc12_32, loaded [symbolic = @As.%assoc0 (constants.%assoc0.4ac002.2)] +// CHECK:STDOUT: %Core.Convert.313 = import_ref Core//default, Convert, unloaded +// CHECK:STDOUT: %Core.import_ref.4e8b20.1 = import_ref Core//default, loc12_32, unloaded +// CHECK:STDOUT: %Core.import_ref.595: = import_ref Core//default, loc19_17, loaded [template = constants.%impl_witness.bd0] +// CHECK:STDOUT: %Core.import_ref.07c = import_ref Core//default, inst39 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.a6b: %Op.assoc_type = import_ref Core//default, loc8_41, loaded [template = constants.%assoc0.8e5] +// CHECK:STDOUT: %Core.Op = import_ref Core//default, Op, unloaded +// CHECK:STDOUT: %Core.import_ref.c8c7cd.1: type = import_ref Core//default, loc19_6, loaded [template = constants.%i32.builtin] +// CHECK:STDOUT: %Core.import_ref.bf0: type = import_ref Core//default, loc19_13, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Core.import_ref.8aa: = import_ref Core//default, loc23_30, loaded [template = constants.%impl_witness.d9b] +// CHECK:STDOUT: %Core.import_ref.8721d7.1: type = import_ref Core//default, loc23_17, loaded [template = Core.IntLiteral] +// CHECK:STDOUT: %Core.import_ref.1e5: type = import_ref Core//default, loc23_28, loaded [template = constants.%As.type.a6d] +// CHECK:STDOUT: %Core.import_ref.de9: = import_ref Core//default, loc27_38, loaded [template = constants.%impl_witness.39c] +// CHECK:STDOUT: %Core.import_ref.ff5 = import_ref Core//default, inst128 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc16_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] +// CHECK:STDOUT: %Core.Convert.e69 = import_ref Core//default, Convert, unloaded +// CHECK:STDOUT: %Core.import_ref.8721d7.2: type = import_ref Core//default, loc27_17, loaded [template = Core.IntLiteral] +// CHECK:STDOUT: %Core.import_ref.4d9: type = import_ref Core//default, loc27_36, loaded [template = constants.%ImplicitAs.type.61e] +// CHECK:STDOUT: %Core.import_ref.207961.1 = import_ref Core//default, loc16_32, unloaded +// CHECK:STDOUT: %Core.import_ref.3b6: = import_ref Core//default, loc31_38, loaded [template = constants.%impl_witness.8f3] +// CHECK:STDOUT: %Core.import_ref.c8c7cd.2: type = import_ref Core//default, loc31_6, loaded [template = constants.%i32.builtin] +// CHECK:STDOUT: %Core.import_ref.efb: type = import_ref Core//default, loc31_36, loaded [template = constants.%ImplicitAs.type.2fd] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -743,21 +743,21 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Convert.type: type = fn_type @Convert.1, @As(%T) [symbolic = %Convert.type (constants.%Convert.type.843)] // CHECK:STDOUT: %Convert: @As.%Convert.type (%Convert.type.843) = struct_value () [symbolic = %Convert (constants.%Convert.95f)] // CHECK:STDOUT: %Convert.assoc_type: type = assoc_entity_type @As.%As.type (%As.type.eed), @As.%Convert.type (%Convert.type.843) [symbolic = %Convert.assoc_type (constants.%Convert.assoc_type.1e9)] -// CHECK:STDOUT: %assoc0: @As.%Convert.assoc_type (%Convert.assoc_type.1e9) = assoc_entity element0, imports.%import_ref.4e8b20.1 [symbolic = %assoc0 (constants.%assoc0.4ac002.1)] +// CHECK:STDOUT: %assoc0: @As.%Convert.assoc_type (%Convert.assoc_type.1e9) = assoc_entity element0, imports.%Core.import_ref.4e8b20.1 [symbolic = %assoc0 (constants.%assoc0.4ac002.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.a7c -// CHECK:STDOUT: .Convert = imports.%import_ref.638 -// CHECK:STDOUT: witness = (imports.%import_ref.313) +// CHECK:STDOUT: .Self = imports.%Core.import_ref.a7c +// CHECK:STDOUT: .Convert = imports.%Core.import_ref.638 +// CHECK:STDOUT: witness = (imports.%Core.Convert.313) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Add [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.07c -// CHECK:STDOUT: .Op = imports.%import_ref.a6b -// CHECK:STDOUT: witness = (imports.%import_ref.044) +// CHECK:STDOUT: .Self = imports.%Core.import_ref.07c +// CHECK:STDOUT: .Op = imports.%Core.import_ref.a6b +// CHECK:STDOUT: witness = (imports.%Core.Op) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic interface @ImplicitAs(constants.%T: type) [from "core.carbon"] { @@ -770,34 +770,34 @@ var arr: [i32; (1 as i32) + (2 as i32)] = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %Convert.type: type = fn_type @Convert.2, @ImplicitAs(%T) [symbolic = %Convert.type (constants.%Convert.type.275)] // CHECK:STDOUT: %Convert: @ImplicitAs.%Convert.type (%Convert.type.275) = struct_value () [symbolic = %Convert (constants.%Convert.42e)] // CHECK:STDOUT: %Convert.assoc_type: type = assoc_entity_type @ImplicitAs.%ImplicitAs.type (%ImplicitAs.type.d62), @ImplicitAs.%Convert.type (%Convert.type.275) [symbolic = %Convert.assoc_type (constants.%Convert.assoc_type.c0e)] -// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] +// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ff5 -// CHECK:STDOUT: .Convert = imports.%import_ref.589 -// CHECK:STDOUT: witness = (imports.%import_ref.e69) +// CHECK:STDOUT: .Self = imports.%Core.import_ref.ff5 +// CHECK:STDOUT: .Convert = imports.%Core.import_ref.589 +// CHECK:STDOUT: witness = (imports.%Core.Convert.e69) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.c8c7cd.1 as imports.%import_ref.bf0 [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%Core.import_ref.c8c7cd.1 as imports.%Core.import_ref.bf0 [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.595 +// CHECK:STDOUT: witness = imports.%Core.import_ref.595 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.2: imports.%import_ref.8721d7.1 as imports.%import_ref.1e5 [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.2: imports.%Core.import_ref.8721d7.1 as imports.%Core.import_ref.1e5 [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.8aa +// CHECK:STDOUT: witness = imports.%Core.import_ref.8aa // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.3: imports.%import_ref.8721d7.2 as imports.%import_ref.4d9 [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.3: imports.%Core.import_ref.8721d7.2 as imports.%Core.import_ref.4d9 [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.de9 +// CHECK:STDOUT: witness = imports.%Core.import_ref.de9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.4: imports.%import_ref.c8c7cd.2 as imports.%import_ref.efb [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.4: imports.%Core.import_ref.c8c7cd.2 as imports.%Core.import_ref.efb [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.3b6 +// CHECK:STDOUT: witness = imports.%Core.import_ref.3b6 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int(%N.param_patt: Core.IntLiteral) -> type = "int.make_type_signed" [from "core.carbon"]; diff --git a/toolchain/check/testdata/function/builtin/no_prelude/import.carbon b/toolchain/check/testdata/function/builtin/no_prelude/import.carbon index d57e905fbee5..45d052644682 100644 --- a/toolchain/check/testdata/function/builtin/no_prelude/import.carbon +++ b/toolchain/check/testdata/function/builtin/no_prelude/import.carbon @@ -188,15 +188,15 @@ var arr: [i32; Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)))] = // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.3b9 -// CHECK:STDOUT: .AsIntLiteral = %import_ref.d91 -// CHECK:STDOUT: .TestAdd = %import_ref.a93 -// CHECK:STDOUT: .AsI32 = %import_ref.614 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .AsIntLiteral = %Core.AsIntLiteral +// CHECK:STDOUT: .TestAdd = %Core.TestAdd +// CHECK:STDOUT: .AsI32 = %Core.AsI32 // CHECK:STDOUT: import Core//core // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.d91: %AsIntLiteral.type = import_ref Core//core, AsIntLiteral, loaded [template = constants.%AsIntLiteral] -// CHECK:STDOUT: %import_ref.a93: %TestAdd.type = import_ref Core//core, TestAdd, loaded [template = constants.%TestAdd] -// CHECK:STDOUT: %import_ref.614: %AsI32.type = import_ref Core//core, AsI32, loaded [template = constants.%AsI32] +// CHECK:STDOUT: %Core.AsIntLiteral: %AsIntLiteral.type = import_ref Core//core, AsIntLiteral, loaded [template = constants.%AsIntLiteral] +// CHECK:STDOUT: %Core.TestAdd: %TestAdd.type = import_ref Core//core, TestAdd, loaded [template = constants.%TestAdd] +// CHECK:STDOUT: %Core.AsI32: %AsI32.type = import_ref Core//core, AsI32, loaded [template = constants.%AsI32] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -214,15 +214,15 @@ var arr: [i32; Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)))] = // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %int.make_type_signed: init type = call constants.%Int(%int_32) [template = constants.%i32.builtin] // CHECK:STDOUT: %Core.ref.loc4_16: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsIntLiteral.ref: %AsIntLiteral.type = name_ref AsIntLiteral, imports.%import_ref.d91 [template = constants.%AsIntLiteral] +// CHECK:STDOUT: %AsIntLiteral.ref: %AsIntLiteral.type = name_ref AsIntLiteral, imports.%Core.AsIntLiteral [template = constants.%AsIntLiteral] // CHECK:STDOUT: %Core.ref.loc4_34: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %TestAdd.ref: %TestAdd.type = name_ref TestAdd, imports.%import_ref.a93 [template = constants.%TestAdd] +// CHECK:STDOUT: %TestAdd.ref: %TestAdd.type = name_ref TestAdd, imports.%Core.TestAdd [template = constants.%TestAdd] // CHECK:STDOUT: %Core.ref.loc4_47: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsI32.ref.loc4_51: %AsI32.type = name_ref AsI32, imports.%import_ref.614 [template = constants.%AsI32] +// CHECK:STDOUT: %AsI32.ref.loc4_51: %AsI32.type = name_ref AsI32, imports.%Core.AsI32 [template = constants.%AsI32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int.convert_checked.loc4_59: init %i32.builtin = call %AsI32.ref.loc4_51(%int_1) [template = constants.%int_1.f38] // CHECK:STDOUT: %Core.ref.loc4_62: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsI32.ref.loc4_66: %AsI32.type = name_ref AsI32, imports.%import_ref.614 [template = constants.%AsI32] +// CHECK:STDOUT: %AsI32.ref.loc4_66: %AsI32.type = name_ref AsI32, imports.%Core.AsI32 [template = constants.%AsI32] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %int.convert_checked.loc4_74: init %i32.builtin = call %AsI32.ref.loc4_66(%int_2) [template = constants.%int_2.5a1] // CHECK:STDOUT: %.loc4_59.1: %i32.builtin = value_of_initializer %int.convert_checked.loc4_59 [template = constants.%int_1.f38] @@ -253,15 +253,15 @@ var arr: [i32; Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)))] = // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Core.ref.loc4_82: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsI32.ref.loc4_86: %AsI32.type = name_ref AsI32, imports.%import_ref.614 [template = constants.%AsI32] +// CHECK:STDOUT: %AsI32.ref.loc4_86: %AsI32.type = name_ref AsI32, imports.%Core.AsI32 [template = constants.%AsI32] // CHECK:STDOUT: %int_1.loc4_93: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int.convert_checked.loc4_94: init %i32.builtin = call %AsI32.ref.loc4_86(%int_1.loc4_93) [template = constants.%int_1.f38] // CHECK:STDOUT: %Core.ref.loc4_97: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsI32.ref.loc4_101: %AsI32.type = name_ref AsI32, imports.%import_ref.614 [template = constants.%AsI32] +// CHECK:STDOUT: %AsI32.ref.loc4_101: %AsI32.type = name_ref AsI32, imports.%Core.AsI32 [template = constants.%AsI32] // CHECK:STDOUT: %int_2.loc4_108: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %int.convert_checked.loc4_109: init %i32.builtin = call %AsI32.ref.loc4_101(%int_2.loc4_108) [template = constants.%int_2.5a1] // CHECK:STDOUT: %Core.ref.loc4_112: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AsI32.ref.loc4_116: %AsI32.type = name_ref AsI32, imports.%import_ref.614 [template = constants.%AsI32] +// CHECK:STDOUT: %AsI32.ref.loc4_116: %AsI32.type = name_ref AsI32, imports.%Core.AsI32 [template = constants.%AsI32] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [template = constants.%int_3.1ba] // CHECK:STDOUT: %int.convert_checked.loc4_124: init %i32.builtin = call %AsI32.ref.loc4_116(%int_3) [template = constants.%int_3.a0f] // CHECK:STDOUT: %.loc4_125.1: %tuple.type = tuple_literal (%int.convert_checked.loc4_94, %int.convert_checked.loc4_109, %int.convert_checked.loc4_124) diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index 4c1970207ab3..ecfa940894db 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -28,7 +28,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index 24f096da6fcb..2b6ce2a1339c 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -84,7 +84,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index 397cb7bb69ec..8fa8cd09fd87 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -39,8 +39,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index 84106fe378d0..6252456511da 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -38,9 +38,9 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 3cafd03a105a..53f281157f6a 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -27,7 +27,7 @@ fn Main() { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -37,8 +37,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index ef4900561f76..b0708d72daf7 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -31,7 +31,7 @@ fn Main() { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -47,8 +47,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 01f31042de4d..1bab212ff186 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -26,7 +26,7 @@ fn Main() { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -36,8 +36,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index 197157624412..31237cccbffd 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -27,7 +27,7 @@ fn Main() { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -37,8 +37,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index ded4c0bde565..e7b383650b72 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -27,7 +27,7 @@ fn Main() { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -40,8 +40,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index ac14c42e278d..a3de1deaa19f 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -28,7 +28,7 @@ fn Main() { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -41,8 +41,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon b/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon index ace1e8e05059..aba5fea3fa0a 100644 --- a/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon +++ b/toolchain/check/testdata/function/call/prefer_unqualified_lookup.carbon @@ -43,7 +43,7 @@ fn Class(F:! type).Inner.G() -> i32 { return F(); } // CHECK:STDOUT: %complete_type.357: = complete_type_witness %empty_struct_type [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -54,8 +54,8 @@ fn Class(F:! type).Inner.G() -> i32 { return F(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon index f0f0ba451c55..a5b55920959f 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -25,7 +25,7 @@ fn F(n: i32, a: [i32; n]*); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon index bb46c2aed642..5bf45c4cd529 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -28,7 +28,7 @@ fn F(n: i32, n: i32); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 00762ba3a5be..3a7db3a30611 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -278,7 +278,7 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -371,7 +371,7 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -454,7 +454,7 @@ import library "extern_api"; // CHECK:STDOUT: %B: %B.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -473,18 +473,18 @@ import library "extern_api"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a6e: %A.type = import_ref Main//api, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.54c: %B.type = import_ref Main//api, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.94c0: %C.type = import_ref Main//api, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.5f5: %D.type = import_ref Main//api, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .E = %import_ref.86f +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//api, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: %B.type = import_ref Main//api, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//api, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: %D.type = import_ref Main//api, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.NS: = import_ref Main//api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .E = %Main.E // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.86f: %E.type = import_ref Main//api, E, loaded [template = constants.%E] +// CHECK:STDOUT: %Main.E: %E.type = import_ref Main//api, E, loaded [template = constants.%E] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -492,10 +492,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.a6e -// CHECK:STDOUT: .B = imports.%import_ref.54c -// CHECK:STDOUT: .C = imports.%import_ref.94c0 -// CHECK:STDOUT: .D = imports.%import_ref.5f5 +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a @@ -571,10 +571,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%import_ref.a6e [template = constants.%A] +// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref() // CHECK:STDOUT: assign file.%a.var, %A.call -// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%import_ref.54c [template = constants.%B] +// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %int_1.loc7: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc7: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc7: = bound_method %int_1.loc7, %impl.elem0.loc7 [template = constants.%Convert.bound] @@ -584,7 +584,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc7_16.2: %i32 = converted %int_1.loc7, %.loc7_16.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %B.call: init %i32 = call %B.ref(%.loc7_16.2) // CHECK:STDOUT: assign file.%b.var, %B.call -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.94c0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %.loc8_25.1: %tuple.type.985 = tuple_literal (%int_1.loc8) // CHECK:STDOUT: %impl.elem0.loc8: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] @@ -597,11 +597,11 @@ import library "extern_api"; // CHECK:STDOUT: %.loc8_25.4: %tuple.type.a1c = converted %.loc8_25.1, %tuple [template = constants.%tuple] // CHECK:STDOUT: %C.call: init %struct_type.c = call %C.ref(%.loc8_25.4) // CHECK:STDOUT: assign file.%c.var, %C.call -// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%import_ref.5f5 [template = constants.%D] +// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%Main.D [template = constants.%D] // CHECK:STDOUT: %D.call: init %empty_tuple.type = call %D.ref() // CHECK:STDOUT: assign file.%d.var, %D.call // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%import_ref.86f [template = constants.%E] +// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%Main.E [template = constants.%E] // CHECK:STDOUT: %E.call: init %empty_tuple.type = call %E.ref() // CHECK:STDOUT: assign file.%e.var, %E.call // CHECK:STDOUT: return @@ -628,7 +628,7 @@ import library "extern_api"; // CHECK:STDOUT: %E: %E.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -639,13 +639,13 @@ import library "extern_api"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { +// CHECK:STDOUT: %Main.NS: = import_ref Main//api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { // CHECK:STDOUT: .E = file.%E.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -819,7 +819,7 @@ import library "extern_api"; // CHECK:STDOUT: %E: %E.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -830,13 +830,13 @@ import library "extern_api"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//extern_api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { +// CHECK:STDOUT: %Main.NS: = import_ref Main//extern_api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { // CHECK:STDOUT: .E = file.%E.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1001,7 +1001,7 @@ import library "extern_api"; // CHECK:STDOUT: %B: %B.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -1020,18 +1020,18 @@ import library "extern_api"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a6e: %A.type = import_ref Main//api, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.54c: %B.type = import_ref Main//api, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.94c0: %C.type = import_ref Main//api, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.5f5: %D.type = import_ref Main//api, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .E = %import_ref.86f +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//api, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: %B.type = import_ref Main//api, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//api, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: %D.type = import_ref Main//api, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.NS: = import_ref Main//api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .E = %Main.E // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.86f: %E.type = import_ref Main//api, E, loaded [template = constants.%E] +// CHECK:STDOUT: %Main.E: %E.type = import_ref Main//api, E, loaded [template = constants.%E] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1039,10 +1039,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.a6e -// CHECK:STDOUT: .B = imports.%import_ref.54c -// CHECK:STDOUT: .C = imports.%import_ref.94c0 -// CHECK:STDOUT: .D = imports.%import_ref.5f5 +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a @@ -1118,10 +1118,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%import_ref.a6e [template = constants.%A] +// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref() // CHECK:STDOUT: assign file.%a.var, %A.call -// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%import_ref.54c [template = constants.%B] +// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %int_1.loc53: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc53: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc53: = bound_method %int_1.loc53, %impl.elem0.loc53 [template = constants.%Convert.bound] @@ -1131,7 +1131,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc53_16.2: %i32 = converted %int_1.loc53, %.loc53_16.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %B.call: init %i32 = call %B.ref(%.loc53_16.2) // CHECK:STDOUT: assign file.%b.var, %B.call -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.94c0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %int_1.loc54: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %.loc54_25.1: %tuple.type.985 = tuple_literal (%int_1.loc54) // CHECK:STDOUT: %impl.elem0.loc54: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] @@ -1144,11 +1144,11 @@ import library "extern_api"; // CHECK:STDOUT: %.loc54_25.4: %tuple.type.a1c = converted %.loc54_25.1, %tuple [template = constants.%tuple] // CHECK:STDOUT: %C.call: init %struct_type.c = call %C.ref(%.loc54_25.4) // CHECK:STDOUT: assign file.%c.var, %C.call -// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%import_ref.5f5 [template = constants.%D] +// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%Main.D [template = constants.%D] // CHECK:STDOUT: %D.call: init %empty_tuple.type = call %D.ref() // CHECK:STDOUT: assign file.%d.var, %D.call // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%import_ref.86f [template = constants.%E] +// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%Main.E [template = constants.%E] // CHECK:STDOUT: %E.call: init %empty_tuple.type = call %E.ref() // CHECK:STDOUT: assign file.%e.var, %E.call // CHECK:STDOUT: return @@ -1166,7 +1166,7 @@ import library "extern_api"; // CHECK:STDOUT: %B: %B.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -1185,18 +1185,18 @@ import library "extern_api"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a6e: %A.type = import_ref Main//extern_api, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.54c: %B.type = import_ref Main//extern_api, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.94c0: %C.type = import_ref Main//extern_api, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.5f5: %D.type = import_ref Main//extern_api, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//extern_api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .E = %import_ref.86f +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//extern_api, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: %B.type = import_ref Main//extern_api, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//extern_api, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: %D.type = import_ref Main//extern_api, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.NS: = import_ref Main//extern_api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .E = %Main.E // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.86f: %E.type = import_ref Main//extern_api, E, loaded [template = constants.%E] +// CHECK:STDOUT: %Main.E: %E.type = import_ref Main//extern_api, E, loaded [template = constants.%E] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1204,10 +1204,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.a6e -// CHECK:STDOUT: .B = imports.%import_ref.54c -// CHECK:STDOUT: .C = imports.%import_ref.94c0 -// CHECK:STDOUT: .D = imports.%import_ref.5f5 +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a @@ -1283,10 +1283,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%import_ref.a6e [template = constants.%A] +// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref() // CHECK:STDOUT: assign file.%a.var, %A.call -// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%import_ref.54c [template = constants.%B] +// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %int_1.loc53: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc53: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc53: = bound_method %int_1.loc53, %impl.elem0.loc53 [template = constants.%Convert.bound] @@ -1296,7 +1296,7 @@ import library "extern_api"; // CHECK:STDOUT: %.loc53_16.2: %i32 = converted %int_1.loc53, %.loc53_16.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %B.call: init %i32 = call %B.ref(%.loc53_16.2) // CHECK:STDOUT: assign file.%b.var, %B.call -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.94c0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %int_1.loc54: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %.loc54_25.1: %tuple.type.985 = tuple_literal (%int_1.loc54) // CHECK:STDOUT: %impl.elem0.loc54: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] @@ -1309,11 +1309,11 @@ import library "extern_api"; // CHECK:STDOUT: %.loc54_25.4: %tuple.type.a1c = converted %.loc54_25.1, %tuple [template = constants.%tuple] // CHECK:STDOUT: %C.call: init %struct_type.c = call %C.ref(%.loc54_25.4) // CHECK:STDOUT: assign file.%c.var, %C.call -// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%import_ref.5f5 [template = constants.%D] +// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%Main.D [template = constants.%D] // CHECK:STDOUT: %D.call: init %empty_tuple.type = call %D.ref() // CHECK:STDOUT: assign file.%d.var, %D.call // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%import_ref.86f [template = constants.%E] +// CHECK:STDOUT: %E.ref: %E.type = name_ref E, imports.%Main.E [template = constants.%E] // CHECK:STDOUT: %E.call: init %empty_tuple.type = call %E.ref() // CHECK:STDOUT: assign file.%e.var, %E.call // CHECK:STDOUT: return @@ -1322,13 +1322,13 @@ import library "extern_api"; // CHECK:STDOUT: --- unloaded.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0c3 = import_ref Main//api, A, unloaded -// CHECK:STDOUT: %import_ref.8cc = import_ref Main//api, B, unloaded -// CHECK:STDOUT: %import_ref.b05 = import_ref Main//api, C, unloaded -// CHECK:STDOUT: %import_ref.caf = import_ref Main//api, D, unloaded -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .E = %import_ref.4ad +// CHECK:STDOUT: %Main.A = import_ref Main//api, A, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//api, B, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//api, C, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//api, D, unloaded +// CHECK:STDOUT: %Main.NS: = import_ref Main//api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .E = %Main.E // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude @@ -1338,10 +1338,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.0c3 -// CHECK:STDOUT: .B = imports.%import_ref.8cc -// CHECK:STDOUT: .C = imports.%import_ref.b05 -// CHECK:STDOUT: .D = imports.%import_ref.caf +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } @@ -1352,13 +1352,13 @@ import library "extern_api"; // CHECK:STDOUT: --- unloaded_extern.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0c3 = import_ref Main//extern_api, A, unloaded -// CHECK:STDOUT: %import_ref.8cc = import_ref Main//extern_api, B, unloaded -// CHECK:STDOUT: %import_ref.b05 = import_ref Main//extern_api, C, unloaded -// CHECK:STDOUT: %import_ref.caf = import_ref Main//extern_api, D, unloaded -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//extern_api, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .E = %import_ref.4ad +// CHECK:STDOUT: %Main.A = import_ref Main//extern_api, A, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//extern_api, B, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//extern_api, C, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//extern_api, D, unloaded +// CHECK:STDOUT: %Main.NS: = import_ref Main//extern_api, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .E = %Main.E // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude @@ -1368,10 +1368,10 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.0c3 -// CHECK:STDOUT: .B = imports.%import_ref.8cc -// CHECK:STDOUT: .C = imports.%import_ref.b05 -// CHECK:STDOUT: .D = imports.%import_ref.caf +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/no_prelude/export_name.carbon b/toolchain/check/testdata/function/declaration/no_prelude/export_name.carbon index 2dd8e7b5c5c5..246781874254 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/export_name.carbon @@ -62,7 +62,7 @@ var f: () = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %F.type = import_ref Main//base, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.F: %F.type = import_ref Main//base, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -70,7 +70,7 @@ var f: () = F(); // CHECK:STDOUT: .F = %F // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %F: %F.type = export F, imports.%import_ref [template = constants.%F] +// CHECK:STDOUT: %F: %F.type = export F, imports.%Main.F [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() [from "base.carbon"]; @@ -84,12 +84,12 @@ var f: () = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %F.type = import_ref Main//export, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.F: %F.type = import_ref Main//export, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .f = %f // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -109,7 +109,7 @@ var f: () = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%f.var, %F.call // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon b/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon index 7126f935e371..2ec3aa47b831 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon @@ -106,12 +106,12 @@ extern library "basic" fn F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %F.type = import_ref Main//basic, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.F: %F.type = import_ref Main//basic, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .x = %x // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -131,7 +131,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: assign file.%x.var, %F.call // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/declaration/no_prelude/extern_library.carbon b/toolchain/check/testdata/function/declaration/no_prelude/extern_library.carbon index bff87d6c4bae..c3ba42195378 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/extern_library.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/extern_library.carbon @@ -271,12 +271,12 @@ extern library "extern_library_owner" fn F() {} // CHECK:STDOUT: --- fail_extern_library_collision.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bde = import_ref Main//extern_library, F, unloaded +// CHECK:STDOUT: %Main.F = import_ref Main//extern_library, F, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/no_prelude/fail_import_incomplete_return.carbon b/toolchain/check/testdata/function/declaration/no_prelude/fail_import_incomplete_return.carbon index 9e90661ba12a..309518f8bf5d 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/fail_import_incomplete_return.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/fail_import_incomplete_return.carbon @@ -198,26 +198,26 @@ fn CallFAndGIncomplete() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//incomplete_return, C, unloaded -// CHECK:STDOUT: %import_ref.e8f = import_ref Main//incomplete_return, D, unloaded -// CHECK:STDOUT: %import_ref.c3e: %ReturnCUnused.type = import_ref Main//incomplete_return, ReturnCUnused, loaded [template = constants.%ReturnCUnused] -// CHECK:STDOUT: %import_ref.073: %ReturnCUsed.type = import_ref Main//incomplete_return, ReturnCUsed, loaded [template = constants.%ReturnCUsed] -// CHECK:STDOUT: %import_ref.c58: %ReturnDUnused.type = import_ref Main//incomplete_return, ReturnDUnused, loaded [template = constants.%ReturnDUnused] -// CHECK:STDOUT: %import_ref.e1f: %ReturnDUsed.type = import_ref Main//incomplete_return, ReturnDUsed, loaded [template = constants.%ReturnDUsed] -// CHECK:STDOUT: %import_ref.2ce = import_ref Main//incomplete_return, Call, unloaded -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//incomplete_return, loc37_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref Main//incomplete_return, inst16 [no loc], unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//incomplete_return, C, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//incomplete_return, D, unloaded +// CHECK:STDOUT: %Main.ReturnCUnused: %ReturnCUnused.type = import_ref Main//incomplete_return, ReturnCUnused, loaded [template = constants.%ReturnCUnused] +// CHECK:STDOUT: %Main.ReturnCUsed: %ReturnCUsed.type = import_ref Main//incomplete_return, ReturnCUsed, loaded [template = constants.%ReturnCUsed] +// CHECK:STDOUT: %Main.ReturnDUnused: %ReturnDUnused.type = import_ref Main//incomplete_return, ReturnDUnused, loaded [template = constants.%ReturnDUnused] +// CHECK:STDOUT: %Main.ReturnDUsed: %ReturnDUsed.type = import_ref Main//incomplete_return, ReturnDUsed, loaded [template = constants.%ReturnDUsed] +// CHECK:STDOUT: %Main.Call = import_ref Main//incomplete_return, Call, unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//incomplete_return, loc37_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.cab = import_ref Main//incomplete_return, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .D = imports.%import_ref.e8f -// CHECK:STDOUT: .ReturnCUnused = imports.%import_ref.c3e -// CHECK:STDOUT: .ReturnCUsed = imports.%import_ref.073 -// CHECK:STDOUT: .ReturnDUnused = imports.%import_ref.c58 -// CHECK:STDOUT: .ReturnDUsed = imports.%import_ref.e1f -// CHECK:STDOUT: .Call = imports.%import_ref.2ce +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .ReturnCUnused = imports.%Main.ReturnCUnused +// CHECK:STDOUT: .ReturnCUsed = imports.%Main.ReturnCUsed +// CHECK:STDOUT: .ReturnDUnused = imports.%Main.ReturnDUnused +// CHECK:STDOUT: .ReturnDUsed = imports.%Main.ReturnDUsed +// CHECK:STDOUT: .Call = imports.%Main.Call // CHECK:STDOUT: .CallFAndGIncomplete = %CallFAndGIncomplete.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -227,23 +227,23 @@ fn CallFAndGIncomplete() { // CHECK:STDOUT: class @C [from "fail_incomplete_return.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "fail_incomplete_return.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cab // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @CallFAndGIncomplete() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %ReturnCUnused.ref: %ReturnCUnused.type = name_ref ReturnCUnused, imports.%import_ref.c3e [template = constants.%ReturnCUnused] +// CHECK:STDOUT: %ReturnCUnused.ref: %ReturnCUnused.type = name_ref ReturnCUnused, imports.%Main.ReturnCUnused [template = constants.%ReturnCUnused] // CHECK:STDOUT: %ReturnCUnused.call: init = call %ReturnCUnused.ref() -// CHECK:STDOUT: %ReturnCUsed.ref: %ReturnCUsed.type = name_ref ReturnCUsed, imports.%import_ref.073 [template = constants.%ReturnCUsed] +// CHECK:STDOUT: %ReturnCUsed.ref: %ReturnCUsed.type = name_ref ReturnCUsed, imports.%Main.ReturnCUsed [template = constants.%ReturnCUsed] // CHECK:STDOUT: %ReturnCUsed.call: init = call %ReturnCUsed.ref() -// CHECK:STDOUT: %ReturnDUnused.ref: %ReturnDUnused.type = name_ref ReturnDUnused, imports.%import_ref.c58 [template = constants.%ReturnDUnused] +// CHECK:STDOUT: %ReturnDUnused.ref: %ReturnDUnused.type = name_ref ReturnDUnused, imports.%Main.ReturnDUnused [template = constants.%ReturnDUnused] // CHECK:STDOUT: %.loc33_17.1: ref %D = temporary_storage // CHECK:STDOUT: %ReturnDUnused.call: init %D = call %ReturnDUnused.ref() to %.loc33_17.1 // CHECK:STDOUT: %.loc33_17.2: ref %D = temporary %.loc33_17.1, %ReturnDUnused.call -// CHECK:STDOUT: %ReturnDUsed.ref: %ReturnDUsed.type = name_ref ReturnDUsed, imports.%import_ref.e1f [template = constants.%ReturnDUsed] +// CHECK:STDOUT: %ReturnDUsed.ref: %ReturnDUsed.type = name_ref ReturnDUsed, imports.%Main.ReturnDUsed [template = constants.%ReturnDUsed] // CHECK:STDOUT: %.loc34_15.1: ref %D = temporary_storage // CHECK:STDOUT: %ReturnDUsed.call: init %D = call %ReturnDUsed.ref() to %.loc34_15.1 // CHECK:STDOUT: %.loc34_15.2: ref %D = temporary %.loc34_15.1, %ReturnDUsed.call 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 ae96692ca1c7..8b7610a99f76 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/name_poisoning.carbon @@ -1025,17 +1025,17 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//poison, C, unloaded -// CHECK:STDOUT: %import_ref.a98: = import_ref Main//poison, N, loaded -// CHECK:STDOUT: %N: = namespace %import_ref.a98, [template] { -// CHECK:STDOUT: .F1 = %import_ref.cd4 +// CHECK:STDOUT: %Main.C = import_ref Main//poison, C, unloaded +// CHECK:STDOUT: %Main.N: = import_ref Main//poison, N, loaded +// CHECK:STDOUT: %N: = namespace %Main.N, [template] { +// CHECK:STDOUT: .F1 = %Main.F1 // CHECK:STDOUT: .C = file.%C.decl // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .N = imports.%N // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -1059,17 +1059,17 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//poison, C, unloaded -// CHECK:STDOUT: %import_ref.a98: = import_ref Main//poison, N, loaded -// CHECK:STDOUT: %N: = namespace %import_ref.a98, [template] { -// CHECK:STDOUT: .F1 = %import_ref.cd4 +// CHECK:STDOUT: %Main.C = import_ref Main//poison, C, unloaded +// CHECK:STDOUT: %Main.N: = import_ref Main//poison, N, loaded +// CHECK:STDOUT: %N: = namespace %Main.N, [template] { +// CHECK:STDOUT: .F1 = %Main.F1 // CHECK:STDOUT: .C = file.%C.decl // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .N = imports.%N // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import diff --git a/toolchain/check/testdata/function/declaration/no_prelude/no_definition_in_impl_file.carbon b/toolchain/check/testdata/function/declaration/no_prelude/no_definition_in_impl_file.carbon index d0f932143eb6..8375cc26d8ba 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/no_definition_in_impl_file.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/no_definition_in_impl_file.carbon @@ -122,12 +122,12 @@ fn D(); // CHECK:STDOUT: --- use_decl_in_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//decl_in_api_definition_in_impl, A, unloaded +// CHECK:STDOUT: %Main.A = import_ref Main//decl_in_api_definition_in_impl, A, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -152,12 +152,12 @@ fn D(); // CHECK:STDOUT: --- decl_only_in_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//decl_only_in_api, B, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//decl_only_in_api, B, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .B = imports.%import_ref +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import diff --git a/toolchain/check/testdata/function/declaration/param_same_name.carbon b/toolchain/check/testdata/function/declaration/param_same_name.carbon index 5182f1ab129d..bf0b7a2f09a3 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -25,7 +25,7 @@ fn G(a: i32); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index 2786b458414a..d57c64c072ba 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -131,7 +131,7 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -248,7 +248,7 @@ fn D() {} // CHECK:STDOUT: %B: %B.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -263,13 +263,13 @@ fn D() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a6e: %A.type = import_ref Main//fns, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.54c: %B.type = import_ref Main//fns, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.94c0: %C.type = import_ref Main//fns, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.caf = import_ref Main//fns, D, unloaded +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//fns, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: %B.type = import_ref Main//fns, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//fns, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D = import_ref Main//fns, D, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -277,10 +277,10 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.a6e -// CHECK:STDOUT: .B = imports.%import_ref.54c -// CHECK:STDOUT: .C = imports.%import_ref.94c0 -// CHECK:STDOUT: .D = imports.%import_ref.caf +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b @@ -329,10 +329,10 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%import_ref.a6e [template = constants.%A] +// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref() // CHECK:STDOUT: assign file.%a.var, %A.call -// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%import_ref.54c [template = constants.%B] +// CHECK:STDOUT: %B.ref: %B.type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %int_1.loc7: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc7: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] // CHECK:STDOUT: %Convert.bound.loc7: = bound_method %int_1.loc7, %impl.elem0.loc7 [template = constants.%Convert.bound] @@ -342,7 +342,7 @@ fn D() {} // CHECK:STDOUT: %.loc7_16.2: %i32 = converted %int_1.loc7, %.loc7_16.1 [template = constants.%int_1.5d2] // CHECK:STDOUT: %B.call: init %i32 = call %B.ref(%.loc7_16.2) // CHECK:STDOUT: assign file.%b.var, %B.call -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.94c0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %.loc8_25.1: %tuple.type.985 = tuple_literal (%int_1.loc8) // CHECK:STDOUT: %impl.elem0.loc8: %Convert.type.1b6 = impl_witness_access constants.%impl_witness.d39, element0 [template = constants.%Convert.956] @@ -372,11 +372,11 @@ fn D() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a6e: %A.type = import_ref Main//fns, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.b05 = import_ref Main//fns, C, unloaded -// CHECK:STDOUT: %import_ref.caf = import_ref Main//fns, D, unloaded +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//fns, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.C = import_ref Main//fns, C, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//fns, D, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -384,10 +384,10 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.a6e +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: .B = %B.decl -// CHECK:STDOUT: .C = imports.%import_ref.b05 -// CHECK:STDOUT: .D = imports.%import_ref.caf +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -454,9 +454,9 @@ fn D() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0c3 = import_ref Main//fns, A, unloaded -// CHECK:STDOUT: %import_ref.8cc = import_ref Main//fns, B, unloaded -// CHECK:STDOUT: %import_ref.b05 = import_ref Main//fns, C, unloaded +// CHECK:STDOUT: %Main.A = import_ref Main//fns, A, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//fns, B, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//fns, C, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -465,9 +465,9 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.0c3 -// CHECK:STDOUT: .B = imports.%import_ref.8cc -// CHECK:STDOUT: .C = imports.%import_ref.b05 +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .D = %D.decl.loc14 // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/import_access.carbon b/toolchain/check/testdata/function/definition/import_access.carbon index f004141963d0..cdad96d939d3 100644 --- a/toolchain/check/testdata/function/definition/import_access.carbon +++ b/toolchain/check/testdata/function/definition/import_access.carbon @@ -227,7 +227,7 @@ private fn Redecl() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %Def.type = import_ref Test//def, Def, loaded [template = constants.%Def] +// CHECK:STDOUT: %Test.Def: %Def.type = import_ref Test//def, Def, loaded [template = constants.%Def] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -236,7 +236,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Def [private] = imports.%import_ref +// CHECK:STDOUT: .Def [private] = imports.%Test.Def // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f // CHECK:STDOUT: } @@ -259,7 +259,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Def.ref: %Def.type = name_ref Def, imports.%import_ref [template = constants.%Def] +// CHECK:STDOUT: %Def.ref: %Def.type = name_ref Def, imports.%Test.Def [template = constants.%Def] // CHECK:STDOUT: %Def.call: init %empty_tuple.type = call %Def.ref() // CHECK:STDOUT: assign file.%f.var, %Def.call // CHECK:STDOUT: return @@ -357,7 +357,7 @@ private fn Redecl() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %ForwardWithDef.type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef] +// CHECK:STDOUT: %Test.ForwardWithDef: %ForwardWithDef.type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -366,7 +366,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .ForwardWithDef [private] = imports.%import_ref +// CHECK:STDOUT: .ForwardWithDef [private] = imports.%Test.ForwardWithDef // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .f = %f // CHECK:STDOUT: } @@ -389,7 +389,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %ForwardWithDef.ref: %ForwardWithDef.type = name_ref ForwardWithDef, imports.%import_ref [template = constants.%ForwardWithDef] +// CHECK:STDOUT: %ForwardWithDef.ref: %ForwardWithDef.type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [template = constants.%ForwardWithDef] // CHECK:STDOUT: %ForwardWithDef.call: init %empty_tuple.type = call %ForwardWithDef.ref() // CHECK:STDOUT: assign file.%f.var, %ForwardWithDef.call // CHECK:STDOUT: return @@ -487,7 +487,7 @@ private fn Redecl() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %Forward.type = import_ref Test//forward, Forward, loaded [template = constants.%Forward] +// CHECK:STDOUT: %Test.Forward: %Forward.type = import_ref Test//forward, Forward, loaded [template = constants.%Forward] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -523,7 +523,7 @@ private fn Redecl() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Forward.ref: %Forward.type = name_ref Forward, imports.%import_ref [template = constants.%Forward] +// CHECK:STDOUT: %Forward.ref: %Forward.type = name_ref Forward, imports.%Test.Forward [template = constants.%Forward] // CHECK:STDOUT: %Forward.call: init %empty_tuple.type = call %Forward.ref() // CHECK:STDOUT: assign file.%f.var, %Forward.call // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/function/definition/no_prelude/extern_library.carbon b/toolchain/check/testdata/function/definition/no_prelude/extern_library.carbon index 37b97590f2e3..819ecae695cd 100644 --- a/toolchain/check/testdata/function/definition/no_prelude/extern_library.carbon +++ b/toolchain/check/testdata/function/definition/no_prelude/extern_library.carbon @@ -274,12 +274,12 @@ extern fn F() {} // CHECK:STDOUT: --- indirect_two_file.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//indirect_two_file_extern, F, unloaded +// CHECK:STDOUT: %Main.F = import_ref Main//indirect_two_file_extern, F, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/no_prelude/implicit_import.carbon b/toolchain/check/testdata/function/definition/no_prelude/implicit_import.carbon index 1ab7d44c3e9a..c4ba10c20354 100644 --- a/toolchain/check/testdata/function/definition/no_prelude/implicit_import.carbon +++ b/toolchain/check/testdata/function/definition/no_prelude/implicit_import.carbon @@ -310,12 +310,12 @@ fn B() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %A.type = import_ref Main//redef_after_def, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.A: %A.type = import_ref Main//redef_after_def, A, loaded [template = constants.%A] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -358,14 +358,14 @@ fn B() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0c3 = import_ref Main//def_alias, A, unloaded -// CHECK:STDOUT: %import_ref.9d1: %A.type = import_ref Main//def_alias, B, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.A = import_ref Main//def_alias, A, unloaded +// CHECK:STDOUT: %Main.B: %A.type = import_ref Main//def_alias, B, loaded [template = constants.%A] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.0c3 -// CHECK:STDOUT: .B = imports.%import_ref.9d1 +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import diff --git a/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon index 88ac06739939..02f76e34631c 100644 --- a/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon @@ -453,16 +453,16 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.05a: type = import_ref Main//two_file, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//two_file, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .D = imports.%import_ref.05a +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: .Bar = %Bar.decl // CHECK:STDOUT: } @@ -473,7 +473,7 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param0 -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [template = constants.%Bar] { @@ -481,16 +481,16 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param0 -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.05a [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a.param_patt: %C) [from "two_file.carbon"] { @@ -790,21 +790,21 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: .D = %D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %D: type = bind_alias D, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { // CHECK:STDOUT: %a.patt: %C = binding_pattern a // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt, runtime_param0 @@ -816,10 +816,10 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "alias_two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a.param_patt: %C) [from "alias_two_file.carbon"] { diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 6a10eab9d166..75281e0e150b 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -21,7 +21,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index 0c1a79d19481..c50c2c07cf2c 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -21,7 +21,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index a41c92e67407..c6f70a2d357c 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -21,7 +21,7 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 19f8c5aa2c7e..067998e47f0b 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -21,7 +21,7 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/deduce.carbon b/toolchain/check/testdata/function/generic/deduce.carbon index ce3706a3e413..fb6405e528ea 100644 --- a/toolchain/check/testdata/function/generic/deduce.carbon +++ b/toolchain/check/testdata/function/generic/deduce.carbon @@ -218,7 +218,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -657,7 +657,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -786,7 +786,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: %tuple.type.4c8: type = tuple_type (Core.IntLiteral, %i32) [template] // CHECK:STDOUT: %TupleParam.specific_fn: = specific_function %TupleParam, @TupleParam(Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -798,8 +798,8 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -901,7 +901,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: %struct_type.a.b.a13: type = struct_type {.a: Core.IntLiteral, .b: %i32} [template] // CHECK:STDOUT: %StructParam.specific_fn: = specific_function %StructParam, @StructParam(Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -913,8 +913,8 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1015,7 +1015,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1100,7 +1100,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1183,7 +1183,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1265,7 +1265,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/no_prelude/import_specific.carbon b/toolchain/check/testdata/function/generic/no_prelude/import_specific.carbon index fd79af23e2da..d693d9ec099c 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/import_specific.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/import_specific.carbon @@ -132,14 +132,14 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Main//library, F, loaded [template = constants.%F] -// CHECK:STDOUT: %import_ref.ad0: %G.type = import_ref Main//library, G, loaded [template = constants.%G] +// CHECK:STDOUT: %Main.F: %F.type = import_ref Main//library, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Main.G: %G.type = import_ref Main//library, G, loaded [template = constants.%G] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref.b37 -// CHECK:STDOUT: .G = imports.%import_ref.ad0 +// CHECK:STDOUT: .F = imports.%Main.F +// CHECK:STDOUT: .G = imports.%Main.G // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .H = %H.decl // CHECK:STDOUT: } @@ -158,11 +158,11 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: fn @H() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [template = constants.%F] // CHECK:STDOUT: %C.ref.loc10: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %F.specific_fn: = specific_function %F.ref, @F(constants.%C) [template = constants.%F.specific_fn.04a] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.specific_fn() -// CHECK:STDOUT: %G.ref: %G.type = name_ref G, imports.%import_ref.ad0 [template = constants.%G] +// CHECK:STDOUT: %G.ref: %G.type = name_ref G, imports.%Main.G [template = constants.%G] // CHECK:STDOUT: %C.ref.loc12: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %G.specific_fn: = specific_function %G.ref, @G(constants.%C) [template = constants.%G.specific_fn] // CHECK:STDOUT: %G.call: init %empty_tuple.type = call %G.specific_fn() diff --git a/toolchain/check/testdata/function/generic/param_in_type.carbon b/toolchain/check/testdata/function/generic/param_in_type.carbon index 0acb08babeb8..c178d631708e 100644 --- a/toolchain/check/testdata/function/generic/param_in_type.carbon +++ b/toolchain/check/testdata/function/generic/param_in_type.carbon @@ -18,7 +18,7 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: %N.51e: %i32 = bind_symbolic_name N, 0 [symbolic] // CHECK:STDOUT: %N.patt.8e2: %i32 = symbolic_binding_pattern N, 0 [symbolic] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %N.51e, %Convert.960 [symbolic] @@ -32,8 +32,8 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/resolve_used.carbon b/toolchain/check/testdata/function/generic/resolve_used.carbon index 282be33a1c34..41498f03ce93 100644 --- a/toolchain/check/testdata/function/generic/resolve_used.carbon +++ b/toolchain/check/testdata/function/generic/resolve_used.carbon @@ -58,13 +58,13 @@ fn CallNegative() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IntLiteral = %import_ref.72f -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .IntLiteral = %Core.IntLiteral +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.72f: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] -// CHECK:STDOUT: %import_ref.485: %Int.type = import_ref Core//prelude/types/int, Int, loaded [template = constants.%Int.generic] +// CHECK:STDOUT: %Core.IntLiteral: %IntLiteral.type = import_ref Core//prelude/types/int_literal, IntLiteral, loaded [template = constants.%IntLiteral] +// CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/types/int, Int, loaded [template = constants.%Int.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -81,7 +81,7 @@ fn CallNegative() { // CHECK:STDOUT: %N.param: Core.IntLiteral = value_param runtime_param // CHECK:STDOUT: %.loc4_39.1: type = splice_block %.loc4_39.3 [template = Core.IntLiteral] { // CHECK:STDOUT: %Core.ref.loc4: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%import_ref.72f [template = constants.%IntLiteral] +// CHECK:STDOUT: %IntLiteral.ref: %IntLiteral.type = name_ref IntLiteral, imports.%Core.IntLiteral [template = constants.%IntLiteral] // CHECK:STDOUT: %int_literal.make_type: init type = call %IntLiteral.ref() [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_39.2: type = value_of_initializer %int_literal.make_type [template = Core.IntLiteral] // CHECK:STDOUT: %.loc4_39.3: type = converted %int_literal.make_type, %.loc4_39.2 [template = Core.IntLiteral] @@ -108,7 +108,7 @@ fn CallNegative() { // CHECK:STDOUT: %v.var: ref @ErrorIfNIsZero.%Int.loc15_20.2 (%Int) = var v // CHECK:STDOUT: %.loc15_20: type = splice_block %Int.loc15_20.1 [symbolic = %Int.loc15_20.2 (constants.%Int)] { // CHECK:STDOUT: %Core.ref.loc15: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Int.ref: %Int.type = name_ref Int, imports.%import_ref.485 [template = constants.%Int.generic] +// CHECK:STDOUT: %Int.ref: %Int.type = name_ref Int, imports.%Core.Int [template = constants.%Int.generic] // CHECK:STDOUT: %N.ref: Core.IntLiteral = name_ref N, %N.loc4_19.1 [symbolic = %N.loc4_19.2 (constants.%N)] // CHECK:STDOUT: %Int.loc15_20.1: type = class_type @Int, @Int(constants.%N) [symbolic = %Int.loc15_20.2 (constants.%Int)] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index 4892f7f4f98f..606695372570 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -64,7 +64,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/undefined.carbon b/toolchain/check/testdata/function/generic/undefined.carbon index 779f7d31a333..6e7852c99db6 100644 --- a/toolchain/check/testdata/function/generic/undefined.carbon +++ b/toolchain/check/testdata/function/generic/undefined.carbon @@ -67,7 +67,7 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: %complete_type.f8a: = complete_type_witness %i32.builtin [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.197 [template] @@ -78,8 +78,8 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -181,7 +181,7 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: %complete_type.f8a: = complete_type_witness %i32.builtin [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.197 [template] @@ -193,8 +193,8 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -311,7 +311,7 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: %CallUndefined: %CallUndefined.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.1, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.197 [template] @@ -322,8 +322,8 @@ fn CallUndefined() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/local.carbon b/toolchain/check/testdata/generic/local.carbon index 51564f17226c..7594b1e81070 100644 --- a/toolchain/check/testdata/generic/local.carbon +++ b/toolchain/check/testdata/generic/local.carbon @@ -68,7 +68,7 @@ class C(C:! type) { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.x.c96: type = struct_type {.x: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -79,8 +79,8 @@ class C(C:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/decl.carbon b/toolchain/check/testdata/global/decl.carbon index 43ef14d2188b..c128650a2df5 100644 --- a/toolchain/check/testdata/global/decl.carbon +++ b/toolchain/check/testdata/global/decl.carbon @@ -18,7 +18,7 @@ var a: i32; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/simple_init.carbon b/toolchain/check/testdata/global/simple_init.carbon index 7d47c485687e..143bf0e6a887 100644 --- a/toolchain/check/testdata/global/simple_init.carbon +++ b/toolchain/check/testdata/global/simple_init.carbon @@ -16,7 +16,7 @@ var a: i32 = 0; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -26,8 +26,8 @@ var a: i32 = 0; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/simple_with_fun.carbon b/toolchain/check/testdata/global/simple_with_fun.carbon index b9b2b682cb66..a459a5a197a1 100644 --- a/toolchain/check/testdata/global/simple_with_fun.carbon +++ b/toolchain/check/testdata/global/simple_with_fun.carbon @@ -23,7 +23,7 @@ var a: i32 = test_a(); // CHECK:STDOUT: %test_a: %test_a.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -33,8 +33,8 @@ var a: i32 = test_a(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 8bdda3ced28d..260d639e7cfe 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -39,7 +39,7 @@ fn If(b: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index 18772de3c492..b0acfae8c820 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -51,7 +51,7 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: %If1: %If1.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -69,9 +69,9 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 84382b136b00..0f2e0dbf8b10 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -31,7 +31,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: %VarScope: %VarScope.type = struct_value () [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -41,9 +41,9 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index e95996df7112..2fa430ebaed2 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -34,7 +34,7 @@ fn If(b: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index 2155e3140b72..90837a0dda21 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -28,7 +28,7 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: %If: %If.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -42,9 +42,9 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index ff0002216668..a95853057897 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -27,7 +27,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -38,9 +38,9 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index cc542a59bbb9..07a15cb8c8d6 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -40,7 +40,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %A: %A.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -67,8 +67,8 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index be1dd61a4efc..4510fa207434 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -24,7 +24,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %A: %A.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -44,9 +44,9 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon index 83a26aee75d9..2d7bd7127c1d 100644 --- a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon +++ b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon @@ -70,9 +70,9 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon index d6cf535fe59e..17c3defe790e 100644 --- a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon +++ b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon @@ -54,8 +54,8 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -129,7 +129,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 6e5bc3ee1359..25a3635b537f 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -23,7 +23,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -45,9 +45,9 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index c9c286b96d36..27a322f7be5a 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -32,7 +32,7 @@ fn F(cond: bool) { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,9 +46,9 @@ fn F(cond: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/compound.carbon b/toolchain/check/testdata/impl/compound.carbon index 7d0fd2f03458..25dfbb7619ea 100644 --- a/toolchain/check/testdata/impl/compound.carbon +++ b/toolchain/check/testdata/impl/compound.carbon @@ -70,7 +70,7 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/declaration.carbon b/toolchain/check/testdata/impl/declaration.carbon index fcde15ee9f9e..f438e910a14a 100644 --- a/toolchain/check/testdata/impl/declaration.carbon +++ b/toolchain/check/testdata/impl/declaration.carbon @@ -26,7 +26,7 @@ impl i32 as I {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/empty.carbon b/toolchain/check/testdata/impl/empty.carbon index 17b83b929fac..13f0062ecd05 100644 --- a/toolchain/check/testdata/impl/empty.carbon +++ b/toolchain/check/testdata/impl/empty.carbon @@ -26,7 +26,7 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/extend_impl_generic.carbon b/toolchain/check/testdata/impl/extend_impl_generic.carbon index 2c66f9853431..2f1cd3bda9c1 100644 --- a/toolchain/check/testdata/impl/extend_impl_generic.carbon +++ b/toolchain/check/testdata/impl/extend_impl_generic.carbon @@ -81,7 +81,7 @@ class X(U:! type) { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.x.c96: type = struct_type {.x: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -94,8 +94,8 @@ class X(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_call_invalid.carbon b/toolchain/check/testdata/impl/fail_call_invalid.carbon index 7bff5cff8018..be71d2cc8f3f 100644 --- a/toolchain/check/testdata/impl/fail_call_invalid.carbon +++ b/toolchain/check/testdata/impl/fail_call_invalid.carbon @@ -46,7 +46,7 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon index 4c6730119b7c..185b8f711ce6 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon @@ -28,7 +28,7 @@ extend impl i32 as I {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 76f085334581..deea1d8ea31d 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -61,7 +61,7 @@ class E { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon index 20e25dbc3cb4..72d8f8e69dcb 100644 --- a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon @@ -36,7 +36,7 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 540f4fe8a950..8edb325eb14c 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon @@ -331,8 +331,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon index 4dd3db7fa213..79e2abbd2464 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon @@ -54,8 +54,8 @@ impl f64 as type where .Self impls type {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -88,7 +88,7 @@ impl f64 as type where .Self impls type {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -123,7 +123,7 @@ impl f64 as type where .Self impls type {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_redefinition.carbon b/toolchain/check/testdata/impl/fail_redefinition.carbon index efe53fda0840..be57e668e263 100644 --- a/toolchain/check/testdata/impl/fail_redefinition.carbon +++ b/toolchain/check/testdata/impl/fail_redefinition.carbon @@ -33,7 +33,7 @@ impl i32 as I {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon index 3443045e63b6..033700a5d8f5 100644 --- a/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon +++ b/toolchain/check/testdata/impl/fail_self_type_mismatch.carbon @@ -56,7 +56,7 @@ impl i32 as I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 a8dff3086fc2..912bda7af792 100644 --- a/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon +++ b/toolchain/check/testdata/impl/fail_todo_use_assoc_const.carbon @@ -116,7 +116,7 @@ impl () as I where .N = 2 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -329,7 +329,7 @@ impl () as I where .N = 2 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -443,7 +443,7 @@ impl () as I where .N = 2 { // CHECK:STDOUT: %impl.elem0: %i32 = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -465,9 +465,9 @@ impl () as I where .N = 2 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 795af4c863ba..889c0f69e34d 100644 --- a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon @@ -61,7 +61,7 @@ impl C as I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/instance_method.carbon b/toolchain/check/testdata/impl/lookup/instance_method.carbon index f6947b14fef9..217b90208c79 100644 --- a/toolchain/check/testdata/impl/lookup/instance_method.carbon +++ b/toolchain/check/testdata/impl/lookup/instance_method.carbon @@ -49,7 +49,7 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon b/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon index ace64b502b8a..c0ac09489988 100644 --- a/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon +++ b/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon @@ -296,17 +296,17 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageA: = namespace file.%PackageA.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 -// CHECK:STDOUT: .HasF = %import_ref.91b +// CHECK:STDOUT: .C = %PackageA.C +// CHECK:STDOUT: .HasF = %PackageA.HasF // CHECK:STDOUT: import PackageA//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref PackageA//default, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.91b: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.798 = import_ref PackageA//default, loc5_9, unloaded -// CHECK:STDOUT: %import_ref.e80: %F.type.dbc = import_ref PackageA//default, F, loaded [template = constants.%F.a2b] +// CHECK:STDOUT: %PackageA.C: type = import_ref PackageA//default, C, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageA.import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded +// CHECK:STDOUT: %PackageA.HasF: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageA.import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %PackageA.import_ref.798 = import_ref PackageA//default, loc5_9, unloaded +// CHECK:STDOUT: %PackageA.F: %F.type.dbc = import_ref PackageA//default, F, loaded [template = constants.%F.a2b] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -320,14 +320,14 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} {} // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %PackageA.ref: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%PackageA.C [template = constants.%C] // CHECK:STDOUT: %HasG.ref: type = name_ref HasG, file.%HasG.decl [template = constants.%HasG.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc13: = impl_witness (@impl.1.%G.decl) [template = constants.%impl_witness.722] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %PackageA.ref: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%import_ref.91b [template = constants.%HasF.type] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%PackageA.HasF [template = constants.%HasF.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc18: = impl_witness (@impl.2.%F.decl) [template = constants.%impl_witness.a36] // CHECK:STDOUT: impl_decl @impl.3 [template] {} { @@ -350,9 +350,9 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.28c -// CHECK:STDOUT: .F = imports.%import_ref.798 -// CHECK:STDOUT: witness = (imports.%import_ref.e80) +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.28c +// CHECK:STDOUT: .F = imports.%PackageA.import_ref.798 +// CHECK:STDOUT: witness = (imports.%PackageA.F) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: %C.ref as %HasG.ref { @@ -388,10 +388,10 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "package_a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageA.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G.1(@HasG.%Self: %HasG.type) { @@ -442,28 +442,28 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self: %HasF.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type.dbc: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %HasF.type, %F.type.dbc [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.13e [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.148) [template] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%PackageA.import_ref.13e [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageA.import_ref.148) [template] // CHECK:STDOUT: %F.type.4e3: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.857: %F.type.4e3 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageA: = namespace file.%PackageA.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 -// CHECK:STDOUT: .HasF = %import_ref.91b +// CHECK:STDOUT: .C = %PackageA.C +// CHECK:STDOUT: .HasF = %PackageA.HasF // CHECK:STDOUT: import PackageA//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref PackageA//default, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.91b: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.5f1: %F.assoc_type = import_ref PackageA//default, loc5_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8fe = import_ref PackageA//default, F, unloaded -// CHECK:STDOUT: %import_ref.a71: = import_ref PackageA//default, loc11_16, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageA.C: type = import_ref PackageA//default, C, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageA.import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded +// CHECK:STDOUT: %PackageA.HasF: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageA.import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %PackageA.import_ref.5f1: %F.assoc_type = import_ref PackageA//default, loc5_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageA.F = import_ref PackageA//default, F, unloaded +// CHECK:STDOUT: %PackageA.import_ref.a71: = import_ref PackageA//default, loc11_16, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageA.import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -479,7 +479,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %c.param: %C = value_param runtime_param0 // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %PackageA.ref.loc6: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%PackageA.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } @@ -487,29 +487,29 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.28c -// CHECK:STDOUT: .F = imports.%import_ref.5f1 -// CHECK:STDOUT: witness = (imports.%import_ref.8fe) +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.28c +// CHECK:STDOUT: .F = imports.%PackageA.import_ref.5f1 +// CHECK:STDOUT: witness = (imports.%PackageA.F) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.29a as imports.%import_ref.e8c [from "package_a.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%PackageA.import_ref.29a as imports.%PackageA.import_ref.e8c [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.a71 +// CHECK:STDOUT: witness = imports.%PackageA.import_ref.a71 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "package_a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageA.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @TestCF(%c.param_patt: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %PackageA.ref.loc7: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%import_ref.91b [template = constants.%HasF.type] -// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%import_ref.5f1 [template = constants.%assoc0] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%PackageA.HasF [template = constants.%HasF.type] +// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%PackageA.import_ref.5f1 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %F.type.dbc = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.857] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -537,47 +537,47 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.cf3: %HasF.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type.dbc: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %HasF.type, %F.type.dbc [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.13e [template] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%PackageA.import_ref.13e [template] // CHECK:STDOUT: %C: type = class_type @C [template] // CHECK:STDOUT: %HasG.type: type = facet_type <@HasG> [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.0cd) [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageB.import_ref.0cd) [template] // CHECK:STDOUT: %F.type.394: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.1fc: %F.type.394 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageA: = namespace file.%PackageA.import, [template] { -// CHECK:STDOUT: .HasF = %import_ref.91b +// CHECK:STDOUT: .HasF = %PackageA.HasF // CHECK:STDOUT: import PackageA//default // CHECK:STDOUT: } // CHECK:STDOUT: %PackageB: = namespace file.%PackageB.import, [template] { -// CHECK:STDOUT: .D = %import_ref.b0a +// CHECK:STDOUT: .D = %PackageB.D // CHECK:STDOUT: import PackageB//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b0a: type = import_ref PackageB//default, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.91b: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.5f1: %F.assoc_type = import_ref PackageA//default, loc5_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8fe = import_ref PackageA//default, F, unloaded -// CHECK:STDOUT: %import_ref.0e8 = import_ref PackageA//default, loc11_16, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.fa0 = import_ref PackageB//default, loc13_25, unloaded -// CHECK:STDOUT: %import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.c30 = import_ref PackageB//default, loc7_9, unloaded -// CHECK:STDOUT: %import_ref.992 = import_ref PackageB//default, G, unloaded -// CHECK:STDOUT: %import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] -// CHECK:STDOUT: %import_ref.f2f: = import_ref PackageB//default, loc18_25, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.231 = import_ref PackageB//default, loc23_16, unloaded -// CHECK:STDOUT: %import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.D: type = import_ref PackageB//default, D, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.8f2: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageB.import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded +// CHECK:STDOUT: %PackageA.HasF: type = import_ref PackageA//default, HasF, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageA.import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %PackageA.import_ref.5f1: %F.assoc_type = import_ref PackageA//default, loc5_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageA.F = import_ref PackageA//default, F, unloaded +// CHECK:STDOUT: %PackageA.import_ref.0e8 = import_ref PackageA//default, loc11_16, unloaded +// CHECK:STDOUT: %PackageA.import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageA.import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded +// CHECK:STDOUT: %PackageA.import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageB.import_ref.fa0 = import_ref PackageB//default, loc13_25, unloaded +// CHECK:STDOUT: %PackageB.import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded +// CHECK:STDOUT: %PackageB.import_ref.c30 = import_ref PackageB//default, loc7_9, unloaded +// CHECK:STDOUT: %PackageB.G = import_ref PackageB//default, G, unloaded +// CHECK:STDOUT: %PackageB.import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageB.import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.import_ref.f2f: = import_ref PackageB//default, loc18_25, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageB.import_ref.231 = import_ref PackageB//default, loc23_16, unloaded +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -595,7 +595,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %d.param: %D = value_param runtime_param0 // CHECK:STDOUT: %.loc7: type = splice_block %D.ref [template = constants.%D] { // CHECK:STDOUT: %PackageB.ref: = name_ref PackageB, imports.%PackageB [template = imports.%PackageB] -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%PackageB.D [template = constants.%D] // CHECK:STDOUT: } // CHECK:STDOUT: %d: %D = bind_name d, %d.param // CHECK:STDOUT: } @@ -603,58 +603,58 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.28c -// CHECK:STDOUT: .F = imports.%import_ref.5f1 -// CHECK:STDOUT: witness = (imports.%import_ref.8fe) +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.28c +// CHECK:STDOUT: .F = imports.%PackageA.import_ref.5f1 +// CHECK:STDOUT: witness = (imports.%PackageA.F) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @HasG [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.5d8 -// CHECK:STDOUT: .G = imports.%import_ref.c30 -// CHECK:STDOUT: witness = (imports.%import_ref.992) +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.5d8 +// CHECK:STDOUT: .G = imports.%PackageB.import_ref.c30 +// CHECK:STDOUT: witness = (imports.%PackageB.G) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.29a as imports.%import_ref.e8c [from "package_a.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%PackageA.import_ref.29a as imports.%PackageA.import_ref.e8c [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.0e8 +// CHECK:STDOUT: witness = imports.%PackageA.import_ref.0e8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.2: imports.%import_ref.dfb as imports.%import_ref.cee586.1 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.2: imports.%PackageB.import_ref.dfb as imports.%PackageB.import_ref.cee586.1 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.fa0 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.fa0 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.3: imports.%import_ref.aa9f8a.1 as imports.%import_ref.831 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.3: imports.%PackageB.import_ref.aa9f8a.1 as imports.%PackageB.import_ref.831 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.f2f +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.f2f // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.4: imports.%import_ref.aa9f8a.2 as imports.%import_ref.cee586.2 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.4: imports.%PackageB.import_ref.aa9f8a.2 as imports.%PackageB.import_ref.cee586.2 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.231 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.231 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "package_b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%PackageB.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.cab // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "package_a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageA.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @TestDF(%d.param_patt: %D) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %d.ref: %D = name_ref d, %d // CHECK:STDOUT: %PackageA.ref: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%import_ref.91b [template = constants.%HasF.type] -// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%import_ref.5f1 [template = constants.%assoc0] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%PackageA.HasF [template = constants.%HasF.type] +// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%PackageA.import_ref.5f1 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %F.type.dbc = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.1fc] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -682,47 +682,47 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.fcb: %HasG.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %G.type.d9e: type = fn_type @G.1 [template] // CHECK:STDOUT: %G.assoc_type: type = assoc_entity_type %HasG.type, %G.type.d9e [template] -// CHECK:STDOUT: %assoc0: %G.assoc_type = assoc_entity element0, imports.%import_ref.d9c [template] +// CHECK:STDOUT: %assoc0: %G.assoc_type = assoc_entity element0, imports.%PackageB.import_ref.d9c [template] // CHECK:STDOUT: %HasF.type: type = facet_type <@HasF> [template] // CHECK:STDOUT: %D: type = class_type @D [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.9ec) [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageB.import_ref.9ec) [template] // CHECK:STDOUT: %G.type.18e: type = fn_type @G.2 [template] // CHECK:STDOUT: %G.dbb: %G.type.18e = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageA: = namespace file.%PackageA.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %PackageA.C // CHECK:STDOUT: import PackageA//default // CHECK:STDOUT: } // CHECK:STDOUT: %PackageB: = namespace file.%PackageB.import, [template] { -// CHECK:STDOUT: .HasG = %import_ref.924 +// CHECK:STDOUT: .HasG = %PackageB.HasG // CHECK:STDOUT: import PackageB//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref PackageA//default, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.924: type = import_ref PackageB//default, HasG, loaded [template = constants.%HasG.type] -// CHECK:STDOUT: %import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d8a: %G.assoc_type = import_ref PackageB//default, loc7_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.992 = import_ref PackageB//default, G, unloaded -// CHECK:STDOUT: %import_ref.0e8 = import_ref PackageA//default, loc11_16, unloaded -// CHECK:STDOUT: %import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.798 = import_ref PackageA//default, loc5_9, unloaded -// CHECK:STDOUT: %import_ref.8fe = import_ref PackageA//default, F, unloaded -// CHECK:STDOUT: %import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.5d9: = import_ref PackageB//default, loc13_25, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] -// CHECK:STDOUT: %import_ref.7db = import_ref PackageB//default, loc18_25, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.231 = import_ref PackageB//default, loc23_16, unloaded -// CHECK:STDOUT: %import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageA.C: type = import_ref PackageA//default, C, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.8f2: = import_ref PackageA//default, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageA.import_ref.2c4 = import_ref PackageA//default, inst25 [no loc], unloaded +// CHECK:STDOUT: %PackageB.HasG: type = import_ref PackageB//default, HasG, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded +// CHECK:STDOUT: %PackageB.import_ref.d8a: %G.assoc_type = import_ref PackageB//default, loc7_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageB.G = import_ref PackageB//default, G, unloaded +// CHECK:STDOUT: %PackageA.import_ref.0e8 = import_ref PackageA//default, loc11_16, unloaded +// CHECK:STDOUT: %PackageA.import_ref.28c = import_ref PackageA//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %PackageA.import_ref.798 = import_ref PackageA//default, loc5_9, unloaded +// CHECK:STDOUT: %PackageA.F = import_ref PackageA//default, F, unloaded +// CHECK:STDOUT: %PackageA.import_ref.29a: type = import_ref PackageA//default, loc11_6, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageA.import_ref.e8c: type = import_ref PackageA//default, loc11_11, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageB.import_ref.5d9: = import_ref PackageB//default, loc13_25, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageB.import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageB.import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.import_ref.7db = import_ref PackageB//default, loc18_25, unloaded +// CHECK:STDOUT: %PackageB.import_ref.8f2: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageB.import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageB.import_ref.231 = import_ref PackageB//default, loc23_16, unloaded +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -740,7 +740,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %c.param: %C = value_param runtime_param0 // CHECK:STDOUT: %.loc7: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %PackageA.ref: = name_ref PackageA, imports.%PackageA [template = imports.%PackageA] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%PackageA.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } @@ -748,58 +748,58 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @HasG [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.5d8 -// CHECK:STDOUT: .G = imports.%import_ref.d8a -// CHECK:STDOUT: witness = (imports.%import_ref.992) +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.5d8 +// CHECK:STDOUT: .G = imports.%PackageB.import_ref.d8a +// CHECK:STDOUT: witness = (imports.%PackageB.G) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.28c -// CHECK:STDOUT: .F = imports.%import_ref.798 -// CHECK:STDOUT: witness = (imports.%import_ref.8fe) +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.28c +// CHECK:STDOUT: .F = imports.%PackageA.import_ref.798 +// CHECK:STDOUT: witness = (imports.%PackageA.F) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.29a as imports.%import_ref.e8c [from "package_a.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%PackageA.import_ref.29a as imports.%PackageA.import_ref.e8c [from "package_a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.0e8 +// CHECK:STDOUT: witness = imports.%PackageA.import_ref.0e8 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.2: imports.%import_ref.dfb as imports.%import_ref.cee586.1 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.2: imports.%PackageB.import_ref.dfb as imports.%PackageB.import_ref.cee586.1 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.5d9 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.5d9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.3: imports.%import_ref.aa9f8a.1 as imports.%import_ref.831 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.3: imports.%PackageB.import_ref.aa9f8a.1 as imports.%PackageB.import_ref.831 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.7db +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.7db // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.4: imports.%import_ref.aa9f8a.2 as imports.%import_ref.cee586.2 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.4: imports.%PackageB.import_ref.aa9f8a.2 as imports.%PackageB.import_ref.cee586.2 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.231 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.231 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "package_a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%PackageA.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%PackageA.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "package_b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageB.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.cab // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @TestCG(%c.param_patt: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %PackageB.ref: = name_ref PackageB, imports.%PackageB [template = imports.%PackageB] -// CHECK:STDOUT: %HasG.ref: type = name_ref HasG, imports.%import_ref.924 [template = constants.%HasG.type] -// CHECK:STDOUT: %G.ref: %G.assoc_type = name_ref G, imports.%import_ref.d8a [template = constants.%assoc0] +// CHECK:STDOUT: %HasG.ref: type = name_ref HasG, imports.%PackageB.HasG [template = constants.%HasG.type] +// CHECK:STDOUT: %G.ref: %G.assoc_type = name_ref G, imports.%PackageB.import_ref.d8a [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %G.type.d9e = impl_witness_access constants.%impl_witness, element0 [template = constants.%G.dbb] // CHECK:STDOUT: %G.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -827,41 +827,41 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.fcb: %HasG.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %G.type.d9e: type = fn_type @G.1 [template] // CHECK:STDOUT: %G.assoc_type: type = assoc_entity_type %HasG.type, %G.type.d9e [template] -// CHECK:STDOUT: %assoc0: %G.assoc_type = assoc_entity element0, imports.%import_ref.d9c [template] +// CHECK:STDOUT: %assoc0: %G.assoc_type = assoc_entity element0, imports.%PackageB.import_ref.d9c [template] // CHECK:STDOUT: %C: type = class_type @C [template] // CHECK:STDOUT: %HasF.type: type = facet_type <@HasF> [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.b0a6) [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageB.import_ref.b0a) [template] // CHECK:STDOUT: %G.type.405: type = fn_type @G.2 [template] // CHECK:STDOUT: %G.703: %G.type.405 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageB: = namespace file.%PackageB.import, [template] { -// CHECK:STDOUT: .D = %import_ref.b0aa -// CHECK:STDOUT: .HasG = %import_ref.924 +// CHECK:STDOUT: .D = %PackageB.D +// CHECK:STDOUT: .HasG = %PackageB.HasG // CHECK:STDOUT: import PackageB//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b0aa: type = import_ref PackageB//default, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.8f2: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.924: type = import_ref PackageB//default, HasG, loaded [template = constants.%HasG.type] -// CHECK:STDOUT: %import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d8a: %G.assoc_type = import_ref PackageB//default, loc7_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.992 = import_ref PackageB//default, G, unloaded -// CHECK:STDOUT: %import_ref.fa0 = import_ref PackageB//default, loc13_25, unloaded -// CHECK:STDOUT: %import_ref.8db: = import_ref PackageB//default, inst35 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref PackageB//default, inst36 [indirect], unloaded -// CHECK:STDOUT: %import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] -// CHECK:STDOUT: %import_ref.7db = import_ref PackageB//default, loc18_25, unloaded -// CHECK:STDOUT: %import_ref.96f = import_ref PackageB//default, inst53 [indirect], unloaded -// CHECK:STDOUT: %import_ref.e4b = import_ref PackageB//default, inst54 [indirect], unloaded -// CHECK:STDOUT: %import_ref.acb = import_ref PackageB//default, F, unloaded -// CHECK:STDOUT: %import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] -// CHECK:STDOUT: %import_ref.240: = import_ref PackageB//default, loc23_16, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.D: type = import_ref PackageB//default, D, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.8f2: = import_ref PackageB//default, loc10_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageB.import_ref.cab = import_ref PackageB//default, inst27 [no loc], unloaded +// CHECK:STDOUT: %PackageB.HasG: type = import_ref PackageB//default, HasG, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.import_ref.5d8 = import_ref PackageB//default, inst17 [no loc], unloaded +// CHECK:STDOUT: %PackageB.import_ref.d8a: %G.assoc_type = import_ref PackageB//default, loc7_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageB.G = import_ref PackageB//default, G, unloaded +// CHECK:STDOUT: %PackageB.import_ref.fa0 = import_ref PackageB//default, loc13_25, unloaded +// CHECK:STDOUT: %PackageB.import_ref.8db: = import_ref PackageB//default, inst35 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageB.import_ref.6a9 = import_ref PackageB//default, inst36 [indirect], unloaded +// CHECK:STDOUT: %PackageB.import_ref.dfb: type = import_ref PackageB//default, loc13_14, loaded [template = constants.%C] +// CHECK:STDOUT: %PackageB.import_ref.cee586.1: type = import_ref PackageB//default, loc13_20, loaded [template = constants.%HasG.type] +// CHECK:STDOUT: %PackageB.import_ref.7db = import_ref PackageB//default, loc18_25, unloaded +// CHECK:STDOUT: %PackageB.import_ref.96f = import_ref PackageB//default, inst53 [indirect], unloaded +// CHECK:STDOUT: %PackageB.import_ref.e4b = import_ref PackageB//default, inst54 [indirect], unloaded +// CHECK:STDOUT: %PackageB.F = import_ref PackageB//default, F, unloaded +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.1: type = import_ref PackageB//default, loc18_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.831: type = import_ref PackageB//default, loc18_19, loaded [template = constants.%HasF.type] +// CHECK:STDOUT: %PackageB.import_ref.240: = import_ref PackageB//default, loc23_16, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageB.import_ref.aa9f8a.2: type = import_ref PackageB//default, loc23_6, loaded [template = constants.%D] +// CHECK:STDOUT: %PackageB.import_ref.cee586.2: type = import_ref PackageB//default, loc23_11, loaded [template = constants.%HasG.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -877,7 +877,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %d.param: %D = value_param runtime_param0 // CHECK:STDOUT: %.loc6: type = splice_block %D.ref [template = constants.%D] { // CHECK:STDOUT: %PackageB.ref.loc6: = name_ref PackageB, imports.%PackageB [template = imports.%PackageB] -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0aa [template = constants.%D] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%PackageB.D [template = constants.%D] // CHECK:STDOUT: } // CHECK:STDOUT: %d: %D = bind_name d, %d.param // CHECK:STDOUT: } @@ -885,53 +885,53 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @HasG [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.5d8 -// CHECK:STDOUT: .G = imports.%import_ref.d8a -// CHECK:STDOUT: witness = (imports.%import_ref.992) +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.5d8 +// CHECK:STDOUT: .G = imports.%PackageB.import_ref.d8a +// CHECK:STDOUT: witness = (imports.%PackageB.G) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.96f -// CHECK:STDOUT: .F = imports.%import_ref.e4b -// CHECK:STDOUT: witness = (imports.%import_ref.acb) +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.96f +// CHECK:STDOUT: .F = imports.%PackageB.import_ref.e4b +// CHECK:STDOUT: witness = (imports.%PackageB.F) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.dfb as imports.%import_ref.cee586.1 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%PackageB.import_ref.dfb as imports.%PackageB.import_ref.cee586.1 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.fa0 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.fa0 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.2: imports.%import_ref.aa9f8a.1 as imports.%import_ref.831 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.2: imports.%PackageB.import_ref.aa9f8a.1 as imports.%PackageB.import_ref.831 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.7db +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.7db // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.3: imports.%import_ref.aa9f8a.2 as imports.%import_ref.cee586.2 [from "package_b.carbon"] { +// CHECK:STDOUT: impl @impl.3: imports.%PackageB.import_ref.aa9f8a.2 as imports.%PackageB.import_ref.cee586.2 [from "package_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.240 +// CHECK:STDOUT: witness = imports.%PackageB.import_ref.240 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "package_b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageB.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.cab // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "package_b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%PackageB.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%PackageB.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @TestDG(%d.param_patt: %D) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %d.ref: %D = name_ref d, %d // CHECK:STDOUT: %PackageB.ref.loc7: = name_ref PackageB, imports.%PackageB [template = imports.%PackageB] -// CHECK:STDOUT: %HasG.ref: type = name_ref HasG, imports.%import_ref.924 [template = constants.%HasG.type] -// CHECK:STDOUT: %G.ref: %G.assoc_type = name_ref G, imports.%import_ref.d8a [template = constants.%assoc0] +// CHECK:STDOUT: %HasG.ref: type = name_ref HasG, imports.%PackageB.HasG [template = constants.%HasG.type] +// CHECK:STDOUT: %G.ref: %G.assoc_type = name_ref G, imports.%PackageB.import_ref.d8a [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %G.type.d9e = impl_witness_access constants.%impl_witness, element0 [template = constants.%G.703] // CHECK:STDOUT: %G.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -1018,24 +1018,24 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self: %Z.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %H.type.386: type = fn_type @H.1 [template] // CHECK:STDOUT: %H.assoc_type: type = assoc_entity_type %Z.type, %H.type.386 [template] -// CHECK:STDOUT: %assoc0: %H.assoc_type = assoc_entity element0, imports.%import_ref.d97 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.6d7) [template] +// CHECK:STDOUT: %assoc0: %H.assoc_type = assoc_entity element0, imports.%PackageAssociatedInterface.import_ref.d97 [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageAssociatedInterface.import_ref.6d7) [template] // CHECK:STDOUT: %H.type.ab3: type = fn_type @H.2 [template] // CHECK:STDOUT: %H.c25: %H.type.ab3 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageAssociatedInterface: = namespace file.%PackageAssociatedInterface.import, [template] { -// CHECK:STDOUT: .Z = %import_ref.25c +// CHECK:STDOUT: .Z = %PackageAssociatedInterface.Z // CHECK:STDOUT: import PackageAssociatedInterface//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.25c: type = import_ref PackageAssociatedInterface//default, Z, loaded [template = constants.%Z.type] -// CHECK:STDOUT: %import_ref.f88 = import_ref PackageAssociatedInterface//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.150: %H.assoc_type = import_ref PackageAssociatedInterface//default, loc5_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.908 = import_ref PackageAssociatedInterface//default, H, unloaded -// CHECK:STDOUT: %import_ref.998: = import_ref PackageAssociatedInterface//default, loc8_14, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.e5c: type = import_ref PackageAssociatedInterface//default, loc8_7, loaded [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %import_ref.df1: type = import_ref PackageAssociatedInterface//default, loc8_12, loaded [template = constants.%Z.type] +// CHECK:STDOUT: %PackageAssociatedInterface.Z: type = import_ref PackageAssociatedInterface//default, Z, loaded [template = constants.%Z.type] +// CHECK:STDOUT: %PackageAssociatedInterface.import_ref.f88 = import_ref PackageAssociatedInterface//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %PackageAssociatedInterface.import_ref.150: %H.assoc_type = import_ref PackageAssociatedInterface//default, loc5_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageAssociatedInterface.H = import_ref PackageAssociatedInterface//default, H, unloaded +// CHECK:STDOUT: %PackageAssociatedInterface.import_ref.998: = import_ref PackageAssociatedInterface//default, loc8_14, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageAssociatedInterface.import_ref.e5c: type = import_ref PackageAssociatedInterface//default, loc8_7, loaded [template = constants.%empty_tuple.type] +// CHECK:STDOUT: %PackageAssociatedInterface.import_ref.df1: type = import_ref PackageAssociatedInterface//default, loc8_12, loaded [template = constants.%Z.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1049,22 +1049,22 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @Z [from "associated_interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f88 -// CHECK:STDOUT: .H = imports.%import_ref.150 -// CHECK:STDOUT: witness = (imports.%import_ref.908) +// CHECK:STDOUT: .Self = imports.%PackageAssociatedInterface.import_ref.f88 +// CHECK:STDOUT: .H = imports.%PackageAssociatedInterface.import_ref.150 +// CHECK:STDOUT: witness = (imports.%PackageAssociatedInterface.H) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.e5c as imports.%import_ref.df1 [from "associated_interface.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%PackageAssociatedInterface.import_ref.e5c as imports.%PackageAssociatedInterface.import_ref.df1 [from "associated_interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.998 +// CHECK:STDOUT: witness = imports.%PackageAssociatedInterface.import_ref.998 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @J() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7: %empty_tuple.type = tuple_literal () // CHECK:STDOUT: %PackageAssociatedInterface.ref: = name_ref PackageAssociatedInterface, imports.%PackageAssociatedInterface [template = imports.%PackageAssociatedInterface] -// CHECK:STDOUT: %Z.ref: type = name_ref Z, imports.%import_ref.25c [template = constants.%Z.type] -// CHECK:STDOUT: %H.ref: %H.assoc_type = name_ref H, imports.%import_ref.150 [template = constants.%assoc0] +// CHECK:STDOUT: %Z.ref: type = name_ref Z, imports.%PackageAssociatedInterface.Z [template = constants.%Z.type] +// CHECK:STDOUT: %H.ref: %H.assoc_type = name_ref H, imports.%PackageAssociatedInterface.import_ref.150 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %H.type.386 = impl_witness_access constants.%impl_witness, element0 [template = constants.%H.c25] // CHECK:STDOUT: %H.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -1196,22 +1196,22 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %L: %L.type = struct_value () [template] // CHECK:STDOUT: %AnyParam.val: %AnyParam.241 = struct_value () [template] // CHECK:STDOUT: %K.assoc_type: type = assoc_entity_type %Y.type, %K.type.311 [template] -// CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, imports.%import_ref.d37 [template] +// CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, imports.%PackageHasParam.import_ref.d37 [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageHasParam: = namespace file.%PackageHasParam.import, [template] { -// CHECK:STDOUT: .AnyParam = %import_ref.8b7 -// CHECK:STDOUT: .Y = %import_ref.d7e +// CHECK:STDOUT: .AnyParam = %PackageHasParam.AnyParam +// CHECK:STDOUT: .Y = %PackageHasParam.Y // CHECK:STDOUT: import PackageHasParam//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8b7: %AnyParam.type = import_ref PackageHasParam//default, AnyParam, loaded [template = constants.%AnyParam.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref PackageHasParam//default, loc4_34, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.601 = import_ref PackageHasParam//default, inst34 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d7e: type = import_ref PackageHasParam//default, Y, loaded [template = constants.%Y.type] -// CHECK:STDOUT: %import_ref.dc1 = import_ref PackageHasParam//default, inst40 [no loc], unloaded -// CHECK:STDOUT: %import_ref.df6: %K.assoc_type = import_ref PackageHasParam//default, loc7_10, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.b80: %K.type.311 = import_ref PackageHasParam//default, K, loaded [template = constants.%K.7a1] +// CHECK:STDOUT: %PackageHasParam.AnyParam: %AnyParam.type = import_ref PackageHasParam//default, AnyParam, loaded [template = constants.%AnyParam.generic] +// CHECK:STDOUT: %PackageHasParam.import_ref.8f2: = import_ref PackageHasParam//default, loc4_34, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageHasParam.import_ref.601 = import_ref PackageHasParam//default, inst34 [no loc], unloaded +// CHECK:STDOUT: %PackageHasParam.Y: type = import_ref PackageHasParam//default, Y, loaded [template = constants.%Y.type] +// CHECK:STDOUT: %PackageHasParam.import_ref.dc1 = import_ref PackageHasParam//default, inst40 [no loc], unloaded +// CHECK:STDOUT: %PackageHasParam.import_ref.df6: %K.assoc_type = import_ref PackageHasParam//default, loc7_10, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageHasParam.K: %K.type.311 = import_ref PackageHasParam//default, K, loaded [template = constants.%K.7a1] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1230,11 +1230,11 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %PackageHasParam.ref.loc8_6: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%import_ref.8b7 [template = constants.%AnyParam.generic] +// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%PackageHasParam.AnyParam [template = constants.%AnyParam.generic] // CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.c92 = name_ref GenericInterface, file.%GenericInterface.decl [template = constants.%GenericInterface.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericInterface.type.c92, constants.%GenericInterface.generic) [template = constants.%AnyParam.241] // CHECK:STDOUT: %PackageHasParam.ref.loc8_52: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%import_ref.d7e [template = constants.%Y.type] +// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [template = constants.%Y.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%K.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %L.decl: %L.type = fn_decl @L [template = constants.%L] {} {} @@ -1259,9 +1259,9 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @Y [from "has_param.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.dc1 -// CHECK:STDOUT: .K = imports.%import_ref.df6 -// CHECK:STDOUT: witness = (imports.%import_ref.b80) +// CHECK:STDOUT: .Self = imports.%PackageHasParam.import_ref.dc1 +// CHECK:STDOUT: .K = imports.%PackageHasParam.import_ref.df6 +// CHECK:STDOUT: witness = (imports.%PackageHasParam.K) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %AnyParam as %Y.ref { @@ -1281,10 +1281,10 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageHasParam.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.601 +// CHECK:STDOUT: .Self = imports.%PackageHasParam.import_ref.601 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1312,15 +1312,15 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: assign %obj.var, %.loc13_3.2 // CHECK:STDOUT: %.loc13_53: type = splice_block %AnyParam [template = constants.%AnyParam.241] { // CHECK:STDOUT: %PackageHasParam.ref.loc13: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%import_ref.8b7 [template = constants.%AnyParam.generic] +// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%PackageHasParam.AnyParam [template = constants.%AnyParam.generic] // CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.c92 = name_ref GenericInterface, file.%GenericInterface.decl [template = constants.%GenericInterface.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericInterface.type.c92, constants.%GenericInterface.generic) [template = constants.%AnyParam.241] // CHECK:STDOUT: } // CHECK:STDOUT: %obj: ref %AnyParam.241 = bind_name obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.241 = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc14: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%import_ref.d7e [template = constants.%Y.type] -// CHECK:STDOUT: %K.ref: %K.assoc_type = name_ref K, imports.%import_ref.df6 [template = constants.%assoc0] +// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [template = constants.%Y.type] +// CHECK:STDOUT: %K.ref: %K.assoc_type = name_ref K, imports.%PackageHasParam.import_ref.df6 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %K.type.311 = impl_witness_access constants.%impl_witness, element0 [template = constants.%K.2e9] // CHECK:STDOUT: %K.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -1379,34 +1379,34 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.f64: %Y.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %K.type.311: type = fn_type @K.1 [template] // CHECK:STDOUT: %K.assoc_type: type = assoc_entity_type %Y.type, %K.type.311 [template] -// CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, imports.%import_ref.d37 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.456) [template] +// CHECK:STDOUT: %assoc0: %K.assoc_type = assoc_entity element0, imports.%PackageHasParam.import_ref.d37 [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%PackageGenericInterface.import_ref.456) [template] // CHECK:STDOUT: %K.type.7f9: type = fn_type @K.2 [template] // CHECK:STDOUT: %K.c3c: %K.type.7f9 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %PackageHasParam: = namespace file.%PackageHasParam.import, [template] { -// CHECK:STDOUT: .AnyParam = %import_ref.8b7 -// CHECK:STDOUT: .Y = %import_ref.d7e +// CHECK:STDOUT: .AnyParam = %PackageHasParam.AnyParam +// CHECK:STDOUT: .Y = %PackageHasParam.Y // CHECK:STDOUT: import PackageHasParam//default // CHECK:STDOUT: } // CHECK:STDOUT: %PackageGenericInterface: = namespace file.%PackageGenericInterface.import, [template] { -// CHECK:STDOUT: .GenericInterface = %import_ref.3e7 +// CHECK:STDOUT: .GenericInterface = %PackageGenericInterface.GenericInterface // CHECK:STDOUT: import PackageGenericInterface//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8b7: %AnyParam.type = import_ref PackageHasParam//default, AnyParam, loaded [template = constants.%AnyParam.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref PackageHasParam//default, loc4_34, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.601 = import_ref PackageHasParam//default, inst34 [no loc], unloaded -// CHECK:STDOUT: %import_ref.3e7: %GenericInterface.type.0da = import_ref PackageGenericInterface//default, GenericInterface, loaded [template = constants.%GenericInterface.generic] -// CHECK:STDOUT: %import_ref.c3b = import_ref PackageGenericInterface//default, inst28 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d7e: type = import_ref PackageHasParam//default, Y, loaded [template = constants.%Y.type] -// CHECK:STDOUT: %import_ref.dc1 = import_ref PackageHasParam//default, inst40 [no loc], unloaded -// CHECK:STDOUT: %import_ref.df6: %K.assoc_type = import_ref PackageHasParam//default, loc7_10, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.9be = import_ref PackageHasParam//default, K, unloaded -// CHECK:STDOUT: %import_ref.ca8: = import_ref PackageGenericInterface//default, loc8_70, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.321: type = import_ref PackageGenericInterface//default, loc8_47, loaded [template = constants.%AnyParam.861] -// CHECK:STDOUT: %import_ref.ca6: type = import_ref PackageGenericInterface//default, loc8_67, loaded [template = constants.%Y.type] +// CHECK:STDOUT: %PackageHasParam.AnyParam: %AnyParam.type = import_ref PackageHasParam//default, AnyParam, loaded [template = constants.%AnyParam.generic] +// CHECK:STDOUT: %PackageHasParam.import_ref.8f2: = import_ref PackageHasParam//default, loc4_34, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %PackageHasParam.import_ref.601 = import_ref PackageHasParam//default, inst34 [no loc], unloaded +// CHECK:STDOUT: %PackageGenericInterface.GenericInterface: %GenericInterface.type.0da = import_ref PackageGenericInterface//default, GenericInterface, loaded [template = constants.%GenericInterface.generic] +// CHECK:STDOUT: %PackageGenericInterface.import_ref.c3b = import_ref PackageGenericInterface//default, inst28 [no loc], unloaded +// CHECK:STDOUT: %PackageHasParam.Y: type = import_ref PackageHasParam//default, Y, loaded [template = constants.%Y.type] +// CHECK:STDOUT: %PackageHasParam.import_ref.dc1 = import_ref PackageHasParam//default, inst40 [no loc], unloaded +// CHECK:STDOUT: %PackageHasParam.import_ref.df6: %K.assoc_type = import_ref PackageHasParam//default, loc7_10, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %PackageHasParam.K = import_ref PackageHasParam//default, K, unloaded +// CHECK:STDOUT: %PackageGenericInterface.import_ref.ca8: = import_ref PackageGenericInterface//default, loc8_70, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %PackageGenericInterface.import_ref.321: type = import_ref PackageGenericInterface//default, loc8_47, loaded [template = constants.%AnyParam.861] +// CHECK:STDOUT: %PackageGenericInterface.import_ref.ca6: type = import_ref PackageGenericInterface//default, loc8_67, loaded [template = constants.%Y.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1430,21 +1430,21 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.c3b +// CHECK:STDOUT: .Self = imports.%PackageGenericInterface.import_ref.c3b // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Y [from "has_param.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.dc1 -// CHECK:STDOUT: .K = imports.%import_ref.df6 -// CHECK:STDOUT: witness = (imports.%import_ref.9be) +// CHECK:STDOUT: .Self = imports.%PackageHasParam.import_ref.dc1 +// CHECK:STDOUT: .K = imports.%PackageHasParam.import_ref.df6 +// CHECK:STDOUT: witness = (imports.%PackageHasParam.K) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.321 as imports.%import_ref.ca6 [from "has_generic_interface.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%PackageGenericInterface.import_ref.321 as imports.%PackageGenericInterface.import_ref.ca6 [from "has_generic_interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.ca8 +// CHECK:STDOUT: witness = imports.%PackageGenericInterface.import_ref.ca8 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @AnyParam(constants.%T: type, constants.%X: %T) [from "has_param.carbon"] { @@ -1456,10 +1456,10 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%PackageHasParam.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.601 +// CHECK:STDOUT: .Self = imports.%PackageHasParam.import_ref.601 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1476,16 +1476,16 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: assign %obj.var, %.loc8_3.2 // CHECK:STDOUT: %.loc9_45: type = splice_block %AnyParam [template = constants.%AnyParam.861] { // CHECK:STDOUT: %PackageHasParam.ref.loc8: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%import_ref.8b7 [template = constants.%AnyParam.generic] +// CHECK:STDOUT: %AnyParam.ref: %AnyParam.type = name_ref AnyParam, imports.%PackageHasParam.AnyParam [template = constants.%AnyParam.generic] // CHECK:STDOUT: %PackageGenericInterface.ref: = name_ref PackageGenericInterface, imports.%PackageGenericInterface [template = imports.%PackageGenericInterface] -// CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.0da = name_ref GenericInterface, imports.%import_ref.3e7 [template = constants.%GenericInterface.generic] +// CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type.0da = name_ref GenericInterface, imports.%PackageGenericInterface.GenericInterface [template = constants.%GenericInterface.generic] // CHECK:STDOUT: %AnyParam: type = class_type @AnyParam, @AnyParam(constants.%GenericInterface.type.0da, constants.%GenericInterface.generic) [template = constants.%AnyParam.861] // CHECK:STDOUT: } // CHECK:STDOUT: %obj: ref %AnyParam.861 = bind_name obj, %obj.var // CHECK:STDOUT: %obj.ref: ref %AnyParam.861 = name_ref obj, %obj // CHECK:STDOUT: %PackageHasParam.ref.loc10: = name_ref PackageHasParam, imports.%PackageHasParam [template = imports.%PackageHasParam] -// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%import_ref.d7e [template = constants.%Y.type] -// CHECK:STDOUT: %K.ref: %K.assoc_type = name_ref K, imports.%import_ref.df6 [template = constants.%assoc0] +// CHECK:STDOUT: %Y.ref: type = name_ref Y, imports.%PackageHasParam.Y [template = constants.%Y.type] +// CHECK:STDOUT: %K.ref: %K.assoc_type = name_ref K, imports.%PackageHasParam.import_ref.df6 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %K.type.311 = impl_witness_access constants.%impl_witness, element0 [template = constants.%K.c3c] // CHECK:STDOUT: %K.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return @@ -1750,7 +1750,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %Self.013: %I.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type: type = fn_type @F [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %I.type, %F.type [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.777 [template] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%HasExtraInterfaces.import_ref.777 [template] // CHECK:STDOUT: %Extra8.type: type = facet_type <@Extra8> [template] // CHECK:STDOUT: %Extra7.type: type = facet_type <@Extra7> [template] // CHECK:STDOUT: %Extra6.type: type = facet_type <@Extra6> [template] @@ -1765,28 +1765,28 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %HasExtraInterfaces: = namespace file.%HasExtraInterfaces.import, [template] { -// CHECK:STDOUT: .C = %import_ref.740 -// CHECK:STDOUT: .I = %import_ref.df2 +// CHECK:STDOUT: .C = %HasExtraInterfaces.C +// CHECK:STDOUT: .I = %HasExtraInterfaces.I // CHECK:STDOUT: import HasExtraInterfaces//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.740: %C.type = import_ref HasExtraInterfaces//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref HasExtraInterfaces//default, loc13_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.4c0 = import_ref HasExtraInterfaces//default, inst57 [no loc], unloaded -// CHECK:STDOUT: %import_ref.df2: type = import_ref HasExtraInterfaces//default, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.e5d = import_ref HasExtraInterfaces//default, inst63 [no loc], unloaded -// CHECK:STDOUT: %import_ref.fd4: %F.assoc_type = import_ref HasExtraInterfaces//default, loc14_21, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8b9 = import_ref HasExtraInterfaces//default, F, unloaded -// CHECK:STDOUT: %import_ref.1c8 = import_ref HasExtraInterfaces//default, loc16_79, unloaded -// CHECK:STDOUT: %import_ref.9c8 = import_ref HasExtraInterfaces//default, inst43 [no loc], unloaded -// CHECK:STDOUT: %import_ref.dfe = import_ref HasExtraInterfaces//default, inst39 [no loc], unloaded -// CHECK:STDOUT: %import_ref.6b6 = import_ref HasExtraInterfaces//default, inst35 [no loc], unloaded -// CHECK:STDOUT: %import_ref.576 = import_ref HasExtraInterfaces//default, inst31 [no loc], unloaded -// CHECK:STDOUT: %import_ref.0dd = import_ref HasExtraInterfaces//default, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.f83 = import_ref HasExtraInterfaces//default, inst23 [no loc], unloaded -// CHECK:STDOUT: %import_ref.975 = import_ref HasExtraInterfaces//default, inst19 [no loc], unloaded -// CHECK:STDOUT: %import_ref.a3c = import_ref HasExtraInterfaces//default, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.aa8: type = import_ref HasExtraInterfaces//default, loc16_72, loaded [template = constants.%C.074] -// CHECK:STDOUT: %import_ref.301: type = import_ref HasExtraInterfaces//default, loc16_77, loaded [template = constants.%I.type] +// CHECK:STDOUT: %HasExtraInterfaces.C: %C.type = import_ref HasExtraInterfaces//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.8f2: = import_ref HasExtraInterfaces//default, loc13_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.4c0 = import_ref HasExtraInterfaces//default, inst57 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.I: type = import_ref HasExtraInterfaces//default, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.e5d = import_ref HasExtraInterfaces//default, inst63 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.fd4: %F.assoc_type = import_ref HasExtraInterfaces//default, loc14_21, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %HasExtraInterfaces.F = import_ref HasExtraInterfaces//default, F, unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.1c8 = import_ref HasExtraInterfaces//default, loc16_79, unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.9c8 = import_ref HasExtraInterfaces//default, inst43 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.dfe = import_ref HasExtraInterfaces//default, inst39 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.6b6 = import_ref HasExtraInterfaces//default, inst35 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.576 = import_ref HasExtraInterfaces//default, inst31 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.0dd = import_ref HasExtraInterfaces//default, inst27 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.f83 = import_ref HasExtraInterfaces//default, inst23 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.975 = import_ref HasExtraInterfaces//default, inst19 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.a3c = import_ref HasExtraInterfaces//default, inst15 [no loc], unloaded +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.aa8: type = import_ref HasExtraInterfaces//default, loc16_72, loaded [template = constants.%C.074] +// CHECK:STDOUT: %HasExtraInterfaces.import_ref.301: type = import_ref HasExtraInterfaces//default, loc16_77, loaded [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1802,7 +1802,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %c.param: %C.42e = value_param runtime_param0 // CHECK:STDOUT: %.loc5: type = splice_block %C [template = constants.%C.42e] { // CHECK:STDOUT: %HasExtraInterfaces.ref.loc5: = name_ref HasExtraInterfaces, imports.%HasExtraInterfaces [template = imports.%HasExtraInterfaces] -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.740 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%HasExtraInterfaces.C [template = constants.%C.generic] // CHECK:STDOUT: %C: type = class_type @C, @C(type) [template = constants.%C.42e] // CHECK:STDOUT: } // CHECK:STDOUT: %c: %C.42e = bind_name c, %c.param @@ -1811,62 +1811,62 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .F = imports.%import_ref.fd4 -// CHECK:STDOUT: witness = (imports.%import_ref.8b9) +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.e5d +// CHECK:STDOUT: .F = imports.%HasExtraInterfaces.import_ref.fd4 +// CHECK:STDOUT: witness = (imports.%HasExtraInterfaces.F) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra8 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.9c8 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.9c8 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra7 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.dfe +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.dfe // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra6 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6b6 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.6b6 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra5 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.576 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.576 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra4 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.0dd +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.0dd // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra3 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f83 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.f83 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra2 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.975 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.975 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Extra1 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.a3c +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.a3c // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.aa8 as imports.%import_ref.301 [from "has_extra_interfaces.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%HasExtraInterfaces.import_ref.aa8 as imports.%HasExtraInterfaces.import_ref.301 [from "has_extra_interfaces.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.1c8 +// CHECK:STDOUT: witness = imports.%HasExtraInterfaces.import_ref.1c8 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(constants.%T: type) [from "has_extra_interfaces.carbon"] { @@ -1876,10 +1876,10 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%HasExtraInterfaces.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 +// CHECK:STDOUT: .Self = imports.%HasExtraInterfaces.import_ref.4c0 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1887,8 +1887,8 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C.42e = name_ref c, %c // CHECK:STDOUT: %HasExtraInterfaces.ref.loc12: = name_ref HasExtraInterfaces, imports.%HasExtraInterfaces [template = imports.%HasExtraInterfaces] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] -// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%import_ref.fd4 [template = constants.%assoc0] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%HasExtraInterfaces.I [template = constants.%I.type] +// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%HasExtraInterfaces.import_ref.fd4 [template = constants.%assoc0] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/lookup/no_prelude/specific_args.carbon b/toolchain/check/testdata/impl/lookup/no_prelude/specific_args.carbon index 9339080fa058..ea687283e31d 100644 --- a/toolchain/check/testdata/impl/lookup/no_prelude/specific_args.carbon +++ b/toolchain/check/testdata/impl/lookup/no_prelude/specific_args.carbon @@ -177,12 +177,12 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type.2ae: type = fn_type @F.1, @I(%T) [symbolic] // CHECK:STDOUT: %F.bb2: %F.type.2ae = struct_value () [symbolic] // CHECK:STDOUT: %F.assoc_type.003: type = assoc_entity_type %I.type.325, %F.type.2ae [symbolic] -// CHECK:STDOUT: %assoc0.ed5: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479 [symbolic] +// CHECK:STDOUT: %assoc0.ed5: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479 [symbolic] // CHECK:STDOUT: %I.type.e45: type = facet_type <@I, @I(%InInterfaceArgs)> [template] // CHECK:STDOUT: %F.type.14f: type = fn_type @F.1, @I(%InInterfaceArgs) [template] // CHECK:STDOUT: %F.b81: %F.type.14f = struct_value () [template] // CHECK:STDOUT: %F.assoc_type.992: type = assoc_entity_type %I.type.e45, %F.type.14f [template] -// CHECK:STDOUT: %assoc0.ad0: %F.assoc_type.992 = assoc_entity element0, imports.%import_ref.479 [template] +// CHECK:STDOUT: %assoc0.ad0: %F.assoc_type.992 = assoc_entity element0, imports.%Main.import_ref.479 [template] // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%F.decl) [template] // CHECK:STDOUT: %F.type.b63: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.d5f: %F.type.b63 = struct_value () [template] @@ -190,29 +190,29 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.9f4: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] -// CHECK:STDOUT: %import_ref.148 = import_ref Main//types, C, unloaded -// CHECK:STDOUT: %import_ref.686: type = import_ref Main//types, X, loaded [template = constants.%X] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded -// CHECK:STDOUT: %import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.182 = import_ref Main//types, loc4_31, unloaded -// CHECK:STDOUT: %import_ref.87f: @I.%F.type (%F.type.2ae) = import_ref Main//types, F, loaded [symbolic = @I.%F (constants.%F.bb2)] -// CHECK:STDOUT: %import_ref.479 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.I: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] +// CHECK:STDOUT: %Main.C = import_ref Main//types, C, unloaded +// CHECK:STDOUT: %Main.X: type = import_ref Main//types, X, loaded [template = constants.%X] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.182 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.F: @I.%F.type (%F.type.2ae) = import_ref Main//types, F, loaded [symbolic = @I.%F (constants.%F.bb2)] +// CHECK:STDOUT: %Main.import_ref.479 = import_ref Main//types, loc4_31, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.9f4 -// CHECK:STDOUT: .C = imports.%import_ref.148 -// CHECK:STDOUT: .X = imports.%import_ref.686 +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .X = imports.%Main.X // CHECK:STDOUT: .InInterfaceArgs = %InInterfaceArgs.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %InInterfaceArgs.decl: type = class_decl @InInterfaceArgs [template = constants.%InInterfaceArgs] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { -// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%import_ref.686 [template = constants.%X] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] +// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Main.X [template = constants.%X] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] // CHECK:STDOUT: %InInterfaceArgs.ref: type = name_ref InInterfaceArgs, file.%InInterfaceArgs.decl [template = constants.%InInterfaceArgs] // CHECK:STDOUT: %I.type: type = facet_type <@I, @I(constants.%InInterfaceArgs)> [template = constants.%I.type.e45] // CHECK:STDOUT: } @@ -229,13 +229,13 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type: type = fn_type @F.1, @I(%T) [symbolic = %F.type (constants.%F.type.2ae)] // CHECK:STDOUT: %F: @I.%F.type (%F.type.2ae) = struct_value () [symbolic = %F (constants.%F.bb2)] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type @I.%I.type (%I.type.325), @I.%F.type (%F.type.2ae) [symbolic = %F.assoc_type (constants.%F.assoc_type.003)] -// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%import_ref.479 [symbolic = %assoc0 (constants.%assoc0.ed5)] +// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%Main.import_ref.479 [symbolic = %assoc0 (constants.%assoc0.ed5)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.884 -// CHECK:STDOUT: .F = imports.%import_ref.182 -// CHECK:STDOUT: witness = (imports.%import_ref.87f) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.884 +// CHECK:STDOUT: .F = imports.%Main.import_ref.182 +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -256,10 +256,10 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X [from "types.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.acf +// CHECK:STDOUT: .Self = imports.%Main.import_ref.acf // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(constants.%T: type, constants.%Self: %I.type.325) [from "types.carbon"] { @@ -314,43 +314,43 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type.2ae: type = fn_type @F.1, @I(%T) [symbolic] // CHECK:STDOUT: %F.bb2: %F.type.2ae = struct_value () [symbolic] // CHECK:STDOUT: %F.assoc_type.003: type = assoc_entity_type %I.type.325, %F.type.2ae [symbolic] -// CHECK:STDOUT: %assoc0.ed59f4.1: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479b0f.1 [symbolic] +// CHECK:STDOUT: %assoc0.ed59f4.1: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [symbolic] // CHECK:STDOUT: %InInterfaceArgs: type = class_type @InInterfaceArgs [template] // CHECK:STDOUT: %I.type.e45: type = facet_type <@I, @I(%InInterfaceArgs)> [template] // CHECK:STDOUT: %F.type.14f: type = fn_type @F.1, @I(%InInterfaceArgs) [template] // CHECK:STDOUT: %F.b81: %F.type.14f = struct_value () [template] // CHECK:STDOUT: %F.assoc_type.992: type = assoc_entity_type %I.type.e45, %F.type.14f [template] -// CHECK:STDOUT: %assoc0.ad0: %F.assoc_type.992 = assoc_entity element0, imports.%import_ref.479b0f.1 [template] -// CHECK:STDOUT: %assoc0.ed59f4.2: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479b0f.2 [symbolic] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.7f5) [template] +// CHECK:STDOUT: %assoc0.ad0: %F.assoc_type.992 = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [template] +// CHECK:STDOUT: %assoc0.ed59f4.2: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479b0f.2 [symbolic] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.7f5) [template] // CHECK:STDOUT: %F.type.b63: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.d5f: %F.type.b63 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.9f4: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] -// CHECK:STDOUT: %import_ref.148 = import_ref Main//types, C, unloaded -// CHECK:STDOUT: %import_ref.686: type = import_ref Main//types, X, loaded [template = constants.%X] -// CHECK:STDOUT: %import_ref.33d: type = import_ref Main//impl_in_interface_args, InInterfaceArgs, loaded [template = constants.%InInterfaceArgs] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded -// CHECK:STDOUT: %import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4ed: @I.%F.assoc_type (%F.assoc_type.003) = import_ref Main//types, loc4_31, loaded [symbolic = @I.%assoc0 (constants.%assoc0.ed59f4.2)] -// CHECK:STDOUT: %import_ref.e3f = import_ref Main//types, F, unloaded -// CHECK:STDOUT: %import_ref.479b0f.1 = import_ref Main//types, loc4_31, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//impl_in_interface_args, loc5_24, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.bf8 = import_ref Main//impl_in_interface_args, inst18 [no loc], unloaded -// CHECK:STDOUT: %import_ref.f9f: = import_ref Main//impl_in_interface_args, loc7_30, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.956: type = import_ref Main//impl_in_interface_args, loc7_6, loaded [template = constants.%X] -// CHECK:STDOUT: %import_ref.e8c: type = import_ref Main//impl_in_interface_args, loc7_28, loaded [template = constants.%I.type.e45] +// CHECK:STDOUT: %Main.I: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] +// CHECK:STDOUT: %Main.C = import_ref Main//types, C, unloaded +// CHECK:STDOUT: %Main.X: type = import_ref Main//types, X, loaded [template = constants.%X] +// CHECK:STDOUT: %Main.InInterfaceArgs: type = import_ref Main//impl_in_interface_args, InInterfaceArgs, loaded [template = constants.%InInterfaceArgs] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4ed: @I.%F.assoc_type (%F.assoc_type.003) = import_ref Main//types, loc4_31, loaded [symbolic = @I.%assoc0 (constants.%assoc0.ed59f4.2)] +// CHECK:STDOUT: %Main.F = import_ref Main//types, F, unloaded +// CHECK:STDOUT: %Main.import_ref.479b0f.1 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//impl_in_interface_args, loc5_24, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.bf8 = import_ref Main//impl_in_interface_args, inst18 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.f9f: = import_ref Main//impl_in_interface_args, loc7_30, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.956: type = import_ref Main//impl_in_interface_args, loc7_6, loaded [template = constants.%X] +// CHECK:STDOUT: %Main.import_ref.e8c: type = import_ref Main//impl_in_interface_args, loc7_28, loaded [template = constants.%I.type.e45] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.9f4 -// CHECK:STDOUT: .C = imports.%import_ref.148 -// CHECK:STDOUT: .X = imports.%import_ref.686 -// CHECK:STDOUT: .InInterfaceArgs = imports.%import_ref.33d +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .X = imports.%Main.X +// CHECK:STDOUT: .InInterfaceArgs = imports.%Main.InInterfaceArgs // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -359,7 +359,7 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %x.param_patt: %X = value_param_pattern %x.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %x.param: %X = value_param runtime_param0 -// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%import_ref.686 [template = constants.%X] +// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Main.X [template = constants.%X] // CHECK:STDOUT: %x: %X = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -374,42 +374,42 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type: type = fn_type @F.1, @I(%T) [symbolic = %F.type (constants.%F.type.2ae)] // CHECK:STDOUT: %F: @I.%F.type (%F.type.2ae) = struct_value () [symbolic = %F (constants.%F.bb2)] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type @I.%I.type (%I.type.325), @I.%F.type (%F.type.2ae) [symbolic = %F.assoc_type (constants.%F.assoc_type.003)] -// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%import_ref.479b0f.1 [symbolic = %assoc0 (constants.%assoc0.ed59f4.1)] +// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [symbolic = %assoc0 (constants.%assoc0.ed59f4.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.884 -// CHECK:STDOUT: .F = imports.%import_ref.4ed -// CHECK:STDOUT: witness = (imports.%import_ref.e3f) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.884 +// CHECK:STDOUT: .F = imports.%Main.import_ref.4ed +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.956 as imports.%import_ref.e8c [from "impl_in_interface_args.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.956 as imports.%Main.import_ref.e8c [from "impl_in_interface_args.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.f9f +// CHECK:STDOUT: witness = imports.%Main.import_ref.f9f // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X [from "types.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.acf +// CHECK:STDOUT: .Self = imports.%Main.import_ref.acf // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @InInterfaceArgs [from "impl_in_interface_args.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.bf8 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.bf8 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%x.param_patt: %X) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %x.ref: %X = name_ref x, %x -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] -// CHECK:STDOUT: %InInterfaceArgs.ref: type = name_ref InInterfaceArgs, imports.%import_ref.33d [template = constants.%InInterfaceArgs] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] +// CHECK:STDOUT: %InInterfaceArgs.ref: type = name_ref InInterfaceArgs, imports.%Main.InInterfaceArgs [template = constants.%InInterfaceArgs] // CHECK:STDOUT: %I.type: type = facet_type <@I, @I(constants.%InInterfaceArgs)> [template = constants.%I.type.e45] -// CHECK:STDOUT: %.loc6: %F.assoc_type.992 = specific_constant imports.%import_ref.4ed, @I(constants.%InInterfaceArgs) [template = constants.%assoc0.ad0] +// CHECK:STDOUT: %.loc6: %F.assoc_type.992 = specific_constant imports.%Main.import_ref.4ed, @I(constants.%InInterfaceArgs) [template = constants.%assoc0.ad0] // CHECK:STDOUT: %F.ref: %F.assoc_type.992 = name_ref F, %.loc6 [template = constants.%assoc0.ad0] // CHECK:STDOUT: %impl.elem0: %F.type.14f = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.d5f] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %impl.elem0() @@ -463,13 +463,13 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type.2ae: type = fn_type @F.1, @I(%T) [symbolic] // CHECK:STDOUT: %F.bb2: %F.type.2ae = struct_value () [symbolic] // CHECK:STDOUT: %F.assoc_type.003: type = assoc_entity_type %I.type.325, %F.type.2ae [symbolic] -// CHECK:STDOUT: %assoc0.ed5: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479 [symbolic] +// CHECK:STDOUT: %assoc0.ed5: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479 [symbolic] // CHECK:STDOUT: %X: type = class_type @X [template] // CHECK:STDOUT: %I.type.45c: type = facet_type <@I, @I(%X)> [template] // CHECK:STDOUT: %F.type.56a: type = fn_type @F.1, @I(%X) [template] // CHECK:STDOUT: %F.a79: %F.type.56a = struct_value () [template] // CHECK:STDOUT: %F.assoc_type.2e0: type = assoc_entity_type %I.type.45c, %F.type.56a [template] -// CHECK:STDOUT: %assoc0.ef3: %F.assoc_type.2e0 = assoc_entity element0, imports.%import_ref.479 [template] +// CHECK:STDOUT: %assoc0.ef3: %F.assoc_type.2e0 = assoc_entity element0, imports.%Main.import_ref.479 [template] // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%F.decl) [template] // CHECK:STDOUT: %F.type.fab: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.7ab: %F.type.fab = struct_value () [template] @@ -477,34 +477,34 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.9f4: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Main//types, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.686: type = import_ref Main//types, X, loaded [template = constants.%X] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//types, loc5_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//types, inst49 [no loc], unloaded -// CHECK:STDOUT: %import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.182 = import_ref Main//types, loc4_31, unloaded -// CHECK:STDOUT: %import_ref.87f: @I.%F.type (%F.type.2ae) = import_ref Main//types, F, loaded [symbolic = @I.%F (constants.%F.bb2)] -// CHECK:STDOUT: %import_ref.479 = import_ref Main//types, loc4_31, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded +// CHECK:STDOUT: %Main.I: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//types, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Main.X: type = import_ref Main//types, X, loaded [template = constants.%X] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//types, loc5_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//types, inst49 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.182 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.F: @I.%F.type (%F.type.2ae) = import_ref Main//types, F, loaded [symbolic = @I.%F (constants.%F.bb2)] +// CHECK:STDOUT: %Main.import_ref.479 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.9f4 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .X = imports.%import_ref.686 +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .X = imports.%Main.X // CHECK:STDOUT: .InClassArgs = %InClassArgs.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %InClassArgs.decl: type = class_decl @InClassArgs [template = constants.%InClassArgs] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C.generic] // CHECK:STDOUT: %InClassArgs.ref: type = name_ref InClassArgs, file.%InClassArgs.decl [template = constants.%InClassArgs] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%InClassArgs) [template = constants.%C.23b] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] -// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%import_ref.686 [template = constants.%X] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] +// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Main.X [template = constants.%X] // CHECK:STDOUT: %I.type: type = facet_type <@I, @I(constants.%X)> [template = constants.%I.type.45c] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%F.decl) [template = constants.%impl_witness] @@ -520,13 +520,13 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type: type = fn_type @F.1, @I(%T) [symbolic = %F.type (constants.%F.type.2ae)] // CHECK:STDOUT: %F: @I.%F.type (%F.type.2ae) = struct_value () [symbolic = %F (constants.%F.bb2)] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type @I.%I.type (%I.type.325), @I.%F.type (%F.type.2ae) [symbolic = %F.assoc_type (constants.%F.assoc_type.003)] -// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%import_ref.479 [symbolic = %assoc0 (constants.%assoc0.ed5)] +// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%Main.import_ref.479 [symbolic = %assoc0 (constants.%assoc0.ed5)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.884 -// CHECK:STDOUT: .F = imports.%import_ref.182 -// CHECK:STDOUT: witness = (imports.%import_ref.87f) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.884 +// CHECK:STDOUT: .F = imports.%Main.import_ref.182 +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -553,18 +553,18 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X [from "types.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.acf +// CHECK:STDOUT: .Self = imports.%Main.import_ref.acf // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(constants.%T: type, constants.%Self: %I.type.325) [from "types.carbon"] { @@ -632,45 +632,45 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type.2ae: type = fn_type @F.1, @I(%T) [symbolic] // CHECK:STDOUT: %F.bb2: %F.type.2ae = struct_value () [symbolic] // CHECK:STDOUT: %F.assoc_type.003: type = assoc_entity_type %I.type.325, %F.type.2ae [symbolic] -// CHECK:STDOUT: %assoc0.ed59f4.1: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479b0f.1 [symbolic] +// CHECK:STDOUT: %assoc0.ed59f4.1: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [symbolic] // CHECK:STDOUT: %X: type = class_type @X [template] // CHECK:STDOUT: %I.type.45c: type = facet_type <@I, @I(%X)> [template] // CHECK:STDOUT: %F.type.56a: type = fn_type @F.1, @I(%X) [template] // CHECK:STDOUT: %F.a79: %F.type.56a = struct_value () [template] // CHECK:STDOUT: %F.assoc_type.2e0: type = assoc_entity_type %I.type.45c, %F.type.56a [template] -// CHECK:STDOUT: %assoc0.ef3: %F.assoc_type.2e0 = assoc_entity element0, imports.%import_ref.479b0f.1 [template] -// CHECK:STDOUT: %assoc0.ed59f4.2: %F.assoc_type.003 = assoc_entity element0, imports.%import_ref.479b0f.2 [symbolic] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.ae4) [template] +// CHECK:STDOUT: %assoc0.ef3: %F.assoc_type.2e0 = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [template] +// CHECK:STDOUT: %assoc0.ed59f4.2: %F.assoc_type.003 = assoc_entity element0, imports.%Main.import_ref.479b0f.2 [symbolic] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.ae4) [template] // CHECK:STDOUT: %F.type.fab: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.7ab: %F.type.fab = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.9f4: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Main//types, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.686: type = import_ref Main//types, X, loaded [template = constants.%X] -// CHECK:STDOUT: %import_ref.4a9: type = import_ref Main//impl_in_class_args, InClassArgs, loaded [template = constants.%InClassArgs] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//types, loc5_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//types, inst49 [no loc], unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//impl_in_class_args, loc5_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.683 = import_ref Main//impl_in_class_args, inst18 [no loc], unloaded -// CHECK:STDOUT: %import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4ed: @I.%F.assoc_type (%F.assoc_type.003) = import_ref Main//types, loc4_31, loaded [symbolic = @I.%assoc0 (constants.%assoc0.ed59f4.2)] -// CHECK:STDOUT: %import_ref.e3f = import_ref Main//types, F, unloaded -// CHECK:STDOUT: %import_ref.479b0f.1 = import_ref Main//types, loc4_31, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.3: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded -// CHECK:STDOUT: %import_ref.6de: = import_ref Main//impl_in_class_args, loc7_29, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.d6e: type = import_ref Main//impl_in_class_args, loc7_19, loaded [template = constants.%C.23b] -// CHECK:STDOUT: %import_ref.208: type = import_ref Main//impl_in_class_args, loc7_27, loaded [template = constants.%I.type.45c] +// CHECK:STDOUT: %Main.I: %I.type.dac = import_ref Main//types, I, loaded [template = constants.%I.generic] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//types, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Main.X: type = import_ref Main//types, X, loaded [template = constants.%X] +// CHECK:STDOUT: %Main.InClassArgs: type = import_ref Main//impl_in_class_args, InClassArgs, loaded [template = constants.%InClassArgs] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//types, loc5_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//types, inst49 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//impl_in_class_args, loc5_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.683 = import_ref Main//impl_in_class_args, inst18 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.884 = import_ref Main//types, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4ed: @I.%F.assoc_type (%F.assoc_type.003) = import_ref Main//types, loc4_31, loaded [symbolic = @I.%assoc0 (constants.%assoc0.ed59f4.2)] +// CHECK:STDOUT: %Main.F = import_ref Main//types, F, unloaded +// CHECK:STDOUT: %Main.import_ref.479b0f.1 = import_ref Main//types, loc4_31, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.3: = import_ref Main//types, loc7_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.acf = import_ref Main//types, inst54 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.6de: = import_ref Main//impl_in_class_args, loc7_29, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.d6e: type = import_ref Main//impl_in_class_args, loc7_19, loaded [template = constants.%C.23b] +// CHECK:STDOUT: %Main.import_ref.208: type = import_ref Main//impl_in_class_args, loc7_27, loaded [template = constants.%I.type.45c] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.9f4 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .X = imports.%import_ref.686 -// CHECK:STDOUT: .InClassArgs = imports.%import_ref.4a9 +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .X = imports.%Main.X +// CHECK:STDOUT: .InClassArgs = imports.%Main.InClassArgs // CHECK:STDOUT: .H = %H.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -680,8 +680,8 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C.23b = value_param runtime_param0 // CHECK:STDOUT: %.loc6_22: type = splice_block %C [template = constants.%C.23b] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] -// CHECK:STDOUT: %InClassArgs.ref: type = name_ref InClassArgs, imports.%import_ref.4a9 [template = constants.%InClassArgs] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C.generic] +// CHECK:STDOUT: %InClassArgs.ref: type = name_ref InClassArgs, imports.%Main.InClassArgs [template = constants.%InClassArgs] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%InClassArgs) [template = constants.%C.23b] // CHECK:STDOUT: } // CHECK:STDOUT: %c: %C.23b = bind_name c, %c.param @@ -698,19 +698,19 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: %F.type: type = fn_type @F.1, @I(%T) [symbolic = %F.type (constants.%F.type.2ae)] // CHECK:STDOUT: %F: @I.%F.type (%F.type.2ae) = struct_value () [symbolic = %F (constants.%F.bb2)] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type @I.%I.type (%I.type.325), @I.%F.type (%F.type.2ae) [symbolic = %F.assoc_type (constants.%F.assoc_type.003)] -// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%import_ref.479b0f.1 [symbolic = %assoc0 (constants.%assoc0.ed59f4.1)] +// CHECK:STDOUT: %assoc0: @I.%F.assoc_type (%F.assoc_type.003) = assoc_entity element0, imports.%Main.import_ref.479b0f.1 [symbolic = %assoc0 (constants.%assoc0.ed59f4.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.884 -// CHECK:STDOUT: .F = imports.%import_ref.4ed -// CHECK:STDOUT: witness = (imports.%import_ref.e3f) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.884 +// CHECK:STDOUT: .F = imports.%Main.import_ref.4ed +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.d6e as imports.%import_ref.208 [from "impl_in_class_args.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.d6e as imports.%Main.import_ref.208 [from "impl_in_class_args.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.6de +// CHECK:STDOUT: witness = imports.%Main.import_ref.6de // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(constants.%T: type) [from "types.carbon"] { @@ -720,34 +720,34 @@ fn H(c: C(InClassArgs)) { c.(I(X).F)(); } // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @InClassArgs [from "impl_in_class_args.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.683 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.683 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X [from "types.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.acf +// CHECK:STDOUT: .Self = imports.%Main.import_ref.acf // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @H(%c.param_patt: %C.23b) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C.23b = name_ref c, %c -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] -// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%import_ref.686 [template = constants.%X] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] +// CHECK:STDOUT: %X.ref: type = name_ref X, imports.%Main.X [template = constants.%X] // CHECK:STDOUT: %I.type: type = facet_type <@I, @I(constants.%X)> [template = constants.%I.type.45c] -// CHECK:STDOUT: %.loc6_34: %F.assoc_type.2e0 = specific_constant imports.%import_ref.4ed, @I(constants.%X) [template = constants.%assoc0.ef3] +// CHECK:STDOUT: %.loc6_34: %F.assoc_type.2e0 = specific_constant imports.%Main.import_ref.4ed, @I(constants.%X) [template = constants.%assoc0.ef3] // CHECK:STDOUT: %F.ref: %F.assoc_type.2e0 = name_ref F, %.loc6_34 [template = constants.%assoc0.ef3] // CHECK:STDOUT: %impl.elem0: %F.type.56a = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.7ab] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %impl.elem0() diff --git a/toolchain/check/testdata/impl/lookup/transitive.carbon b/toolchain/check/testdata/impl/lookup/transitive.carbon index ee3edead2abc..9bb7bbb793c5 100644 --- a/toolchain/check/testdata/impl/lookup/transitive.carbon +++ b/toolchain/check/testdata/impl/lookup/transitive.carbon @@ -105,19 +105,19 @@ fn Call() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//i, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I: type = import_ref Main//i, I, loaded [template = constants.%I.type] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//i, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4a0 = import_ref Main//i, loc4_21, unloaded -// CHECK:STDOUT: %import_ref.05a: %F.type.cf0 = import_ref Main//i, F, loaded [template = constants.%F.bc6] +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//i, inst17 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4a0 = import_ref Main//i, loc4_21, unloaded +// CHECK:STDOUT: %Main.F: %F.type.cf0 = import_ref Main//i, F, loaded [template = constants.%F.bc6] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: } @@ -126,16 +126,16 @@ fn Call() { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%F.decl) [template = constants.%impl_witness] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "i.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .F = imports.%import_ref.4a0 -// CHECK:STDOUT: witness = (imports.%import_ref.05a) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .F = imports.%Main.import_ref.4a0 +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C.ref as %I.ref { @@ -179,18 +179,18 @@ fn Call() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//c, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.C: type = import_ref Main//c, C, loaded [template = constants.%C] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//c, loc6_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//c, inst18 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//c, loc6_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//c, inst18 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Get = %Get.decl // CHECK:STDOUT: } @@ -200,17 +200,17 @@ fn Call() { // CHECK:STDOUT: %return.patt: %C = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %C = out_param_pattern %return.patt, runtime_param0 // CHECK:STDOUT: } { -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %return.param: ref %C = out_param runtime_param0 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "c.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Get() -> %C; @@ -230,33 +230,33 @@ fn Call() { // CHECK:STDOUT: %Self: %I.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type.cf0: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %I.type, %F.type.cf0 [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.777 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.742) [template] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%Main.import_ref.777 [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.742) [template] // CHECK:STDOUT: %F.type.5d6: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.a2e: %F.type.5d6 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.773: %Get.type = import_ref Main//get, Get, loaded [template = constants.%Get] -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//i, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.Get: %Get.type = import_ref Main//get, Get, loaded [template = constants.%Get] +// CHECK:STDOUT: %Main.I: type = import_ref Main//i, I, loaded [template = constants.%I.type] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8db: = import_ref Main//get, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//get, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//i, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b5b: %F.assoc_type = import_ref Main//i, loc4_21, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8b9 = import_ref Main//i, F, unloaded -// CHECK:STDOUT: %import_ref.e53: = import_ref Main//c, loc7_13, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.29a: type = import_ref Main//c, loc7_6, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.f50: type = import_ref Main//c, loc7_11, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref.8db: = import_ref Main//get, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//get, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//i, inst17 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b5b: %F.assoc_type = import_ref Main//i, loc4_21, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.F = import_ref Main//i, F, unloaded +// CHECK:STDOUT: %Main.import_ref.e53: = import_ref Main//c, loc7_13, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.29a: type = import_ref Main//c, loc7_6, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.f50: type = import_ref Main//c, loc7_11, loaded [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Get = imports.%import_ref.773 -// CHECK:STDOUT: .I = imports.%import_ref.df2 +// CHECK:STDOUT: .Get = imports.%Main.Get +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Call = %Call.decl // CHECK:STDOUT: } @@ -267,30 +267,30 @@ fn Call() { // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "i.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .F = imports.%import_ref.b5b -// CHECK:STDOUT: witness = (imports.%import_ref.8b9) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .F = imports.%Main.import_ref.b5b +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.29a as imports.%import_ref.f50 [from "c.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.29a as imports.%Main.import_ref.f50 [from "c.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.e53 +// CHECK:STDOUT: witness = imports.%Main.import_ref.e53 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "get.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Call() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Get.ref: %Get.type = name_ref Get, imports.%import_ref.773 [template = constants.%Get] +// CHECK:STDOUT: %Get.ref: %Get.type = name_ref Get, imports.%Main.Get [template = constants.%Get] // CHECK:STDOUT: %.loc9: ref %C = temporary_storage // CHECK:STDOUT: %Get.call: init %C = call %Get.ref() to %.loc9 -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] -// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%import_ref.b5b [template = constants.%assoc0] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] +// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%Main.import_ref.b5b [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %F.type.cf0 = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.a2e] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %impl.elem0() // CHECK:STDOUT: return 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 286d49653dab..0357e3f7aa30 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_builtin_call.carbon @@ -424,13 +424,13 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %Op.type.31b: type = fn_type @Op.1 [template] // CHECK:STDOUT: %Self.as_type: type = facet_access_type %Self [symbolic] // CHECK:STDOUT: %Op.assoc_type: type = assoc_entity_type %Add.type, %Op.type.31b [template] -// CHECK:STDOUT: %assoc0: %Op.assoc_type = assoc_entity element0, imports.%import_ref.047 [template] -// CHECK:STDOUT: %impl_witness.3a3: = impl_witness (imports.%import_ref.19b), @impl(%N) [symbolic] +// CHECK:STDOUT: %assoc0: %Op.assoc_type = assoc_entity element0, imports.%Main.import_ref.047 [template] +// CHECK:STDOUT: %impl_witness.3a3: = impl_witness (imports.%Main.import_ref.19b), @impl(%N) [symbolic] // CHECK:STDOUT: %Op.type.883: type = fn_type @Op.2, @impl(%N) [symbolic] // CHECK:STDOUT: %Op.8bc: %Op.type.883 = struct_value () [symbolic] // CHECK:STDOUT: %require_complete.fc7: = require_complete_type %MyInt.09f [symbolic] -// CHECK:STDOUT: %impl_witness.8d6: = impl_witness (imports.%import_ref.19b), @impl(%int_64) [template] -// CHECK:STDOUT: %impl_witness.7e5: = impl_witness (imports.%import_ref.464), @impl(%N) [symbolic] +// CHECK:STDOUT: %impl_witness.8d6: = impl_witness (imports.%Main.import_ref.19b), @impl(%int_64) [template] +// CHECK:STDOUT: %impl_witness.7e5: = impl_witness (imports.%Main.import_ref.464), @impl(%N) [symbolic] // CHECK:STDOUT: %Op.type.5a6: type = fn_type @Op.2, @impl(%int_64) [template] // CHECK:STDOUT: %Op.cf9: %Op.type.5a6 = struct_value () [template] // CHECK:STDOUT: %CallImportedDouble.type: type = fn_type @CallImportedDouble [template] @@ -441,29 +441,29 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.fe6: type = import_ref Main//generic_impl, Add, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.174 = import_ref Main//generic_impl, IntLiteral, unloaded -// CHECK:STDOUT: %import_ref.0dc = import_ref Main//generic_impl, Int, unloaded -// CHECK:STDOUT: %import_ref.370: %MyInt.type = import_ref Main//generic_impl, MyInt, loaded [template = constants.%MyInt.generic] -// CHECK:STDOUT: %import_ref.1a7: %Double.type = import_ref Main//generic_impl, Double, loaded [template = constants.%Double] -// CHECK:STDOUT: %import_ref.9e9: = import_ref Main//generic_impl, loc13_1, loaded [symbolic = @MyInt.%complete_type (constants.%complete_type.a87)] -// CHECK:STDOUT: %import_ref.697 = import_ref Main//generic_impl, inst89 [no loc], unloaded -// CHECK:STDOUT: %import_ref.07c = import_ref Main//generic_impl, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.6d9: %Op.assoc_type = import_ref Main//generic_impl, loc5_41, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.044 = import_ref Main//generic_impl, Op, unloaded -// CHECK:STDOUT: %import_ref.33b: = import_ref Main//generic_impl, loc15_48, loaded [symbolic = @impl.%impl_witness (constants.%impl_witness.7e5)] -// CHECK:STDOUT: %import_ref.719: type = import_ref Main//generic_impl, loc15_39, loaded [symbolic = @impl.%MyInt (constants.%MyInt.09f)] -// CHECK:STDOUT: %import_ref.bf0: type = import_ref Main//generic_impl, loc15_44, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.19b: @impl.%Op.type (%Op.type.883) = import_ref Main//generic_impl, loc16_42, loaded [symbolic = @impl.%Op (constants.%Op.8bc)] +// CHECK:STDOUT: %Main.Add: type = import_ref Main//generic_impl, Add, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Main.IntLiteral = import_ref Main//generic_impl, IntLiteral, unloaded +// CHECK:STDOUT: %Main.Int = import_ref Main//generic_impl, Int, unloaded +// CHECK:STDOUT: %Main.MyInt: %MyInt.type = import_ref Main//generic_impl, MyInt, loaded [template = constants.%MyInt.generic] +// CHECK:STDOUT: %Main.Double: %Double.type = import_ref Main//generic_impl, Double, loaded [template = constants.%Double] +// CHECK:STDOUT: %Main.import_ref.9e9: = import_ref Main//generic_impl, loc13_1, loaded [symbolic = @MyInt.%complete_type (constants.%complete_type.a87)] +// CHECK:STDOUT: %Main.import_ref.697 = import_ref Main//generic_impl, inst89 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.07c = import_ref Main//generic_impl, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.6d9: %Op.assoc_type = import_ref Main//generic_impl, loc5_41, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.Op = import_ref Main//generic_impl, Op, unloaded +// CHECK:STDOUT: %Main.import_ref.33b: = import_ref Main//generic_impl, loc15_48, loaded [symbolic = @impl.%impl_witness (constants.%impl_witness.7e5)] +// CHECK:STDOUT: %Main.import_ref.719: type = import_ref Main//generic_impl, loc15_39, loaded [symbolic = @impl.%MyInt (constants.%MyInt.09f)] +// CHECK:STDOUT: %Main.import_ref.bf0: type = import_ref Main//generic_impl, loc15_44, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Main.import_ref.19b: @impl.%Op.type (%Op.type.883) = import_ref Main//generic_impl, loc16_42, loaded [symbolic = @impl.%Op (constants.%Op.8bc)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Add = imports.%import_ref.fe6 -// CHECK:STDOUT: .IntLiteral = imports.%import_ref.174 -// CHECK:STDOUT: .Int = imports.%import_ref.0dc -// CHECK:STDOUT: .MyInt = imports.%import_ref.370 -// CHECK:STDOUT: .Double = imports.%import_ref.1a7 +// CHECK:STDOUT: .Add = imports.%Main.Add +// CHECK:STDOUT: .IntLiteral = imports.%Main.IntLiteral +// CHECK:STDOUT: .Int = imports.%Main.Int +// CHECK:STDOUT: .MyInt = imports.%Main.MyInt +// CHECK:STDOUT: .Double = imports.%Main.Double // CHECK:STDOUT: .LocalDouble = %LocalDouble.decl // CHECK:STDOUT: .CallImportedDouble = %CallImportedDouble.decl // CHECK:STDOUT: } @@ -474,12 +474,12 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %return.patt: %MyInt.f30 = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %MyInt.f30 = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { -// CHECK:STDOUT: %MyInt.ref.loc8_33: %MyInt.type = name_ref MyInt, imports.%import_ref.370 [template = constants.%MyInt.generic] +// CHECK:STDOUT: %MyInt.ref.loc8_33: %MyInt.type = name_ref MyInt, imports.%Main.MyInt [template = constants.%MyInt.generic] // CHECK:STDOUT: %int_64.loc8_39: Core.IntLiteral = int_value 64 [template = constants.%int_64] // CHECK:STDOUT: %MyInt.loc8_41: type = class_type @MyInt, @MyInt(constants.%int_64) [template = constants.%MyInt.f30] // CHECK:STDOUT: %x.param: %MyInt.f30 = value_param runtime_param0 // CHECK:STDOUT: %.loc8: type = splice_block %MyInt.loc8_27 [template = constants.%MyInt.f30] { -// CHECK:STDOUT: %MyInt.ref.loc8_19: %MyInt.type = name_ref MyInt, imports.%import_ref.370 [template = constants.%MyInt.generic] +// CHECK:STDOUT: %MyInt.ref.loc8_19: %MyInt.type = name_ref MyInt, imports.%Main.MyInt [template = constants.%MyInt.generic] // CHECK:STDOUT: %int_64.loc8_25: Core.IntLiteral = int_value 64 [template = constants.%int_64] // CHECK:STDOUT: %MyInt.loc8_27: type = class_type @MyInt, @MyInt(constants.%int_64) [template = constants.%MyInt.f30] // CHECK:STDOUT: } @@ -493,12 +493,12 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %return.patt: %MyInt.f30 = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %MyInt.f30 = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { -// CHECK:STDOUT: %MyInt.ref.loc12_40: %MyInt.type = name_ref MyInt, imports.%import_ref.370 [template = constants.%MyInt.generic] +// CHECK:STDOUT: %MyInt.ref.loc12_40: %MyInt.type = name_ref MyInt, imports.%Main.MyInt [template = constants.%MyInt.generic] // CHECK:STDOUT: %int_64.loc12_46: Core.IntLiteral = int_value 64 [template = constants.%int_64] // CHECK:STDOUT: %MyInt.loc12_48: type = class_type @MyInt, @MyInt(constants.%int_64) [template = constants.%MyInt.f30] // CHECK:STDOUT: %n.param: %MyInt.f30 = value_param runtime_param0 // CHECK:STDOUT: %.loc12: type = splice_block %MyInt.loc12_34 [template = constants.%MyInt.f30] { -// CHECK:STDOUT: %MyInt.ref.loc12_26: %MyInt.type = name_ref MyInt, imports.%import_ref.370 [template = constants.%MyInt.generic] +// CHECK:STDOUT: %MyInt.ref.loc12_26: %MyInt.type = name_ref MyInt, imports.%Main.MyInt [template = constants.%MyInt.generic] // CHECK:STDOUT: %int_64.loc12_32: Core.IntLiteral = int_value 64 [template = constants.%int_64] // CHECK:STDOUT: %MyInt.loc12_34: type = class_type @MyInt, @MyInt(constants.%int_64) [template = constants.%MyInt.f30] // CHECK:STDOUT: } @@ -510,25 +510,25 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: // CHECK:STDOUT: interface @Add [from "generic_impl.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.07c -// CHECK:STDOUT: .Op = imports.%import_ref.6d9 -// CHECK:STDOUT: witness = (imports.%import_ref.044) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.07c +// CHECK:STDOUT: .Op = imports.%Main.import_ref.6d9 +// CHECK:STDOUT: witness = (imports.%Main.Op) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic impl @impl(constants.%N: Core.IntLiteral) [from "generic_impl.carbon"] { // CHECK:STDOUT: %N: Core.IntLiteral = bind_symbolic_name N, 0 [symbolic = %N (constants.%N)] // CHECK:STDOUT: %N.patt: Core.IntLiteral = symbolic_binding_pattern N, 0 [symbolic = %N.patt (constants.%N.patt)] // CHECK:STDOUT: %MyInt: type = class_type @MyInt, @MyInt(%N) [symbolic = %MyInt (constants.%MyInt.09f)] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.19b), @impl(%N) [symbolic = %impl_witness (constants.%impl_witness.3a3)] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.19b), @impl(%N) [symbolic = %impl_witness (constants.%impl_witness.3a3)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Op.type: type = fn_type @Op.2, @impl(%N) [symbolic = %Op.type (constants.%Op.type.883)] // CHECK:STDOUT: %Op: @impl.%Op.type (%Op.type.883) = struct_value () [symbolic = %Op (constants.%Op.8bc)] // CHECK:STDOUT: %require_complete: = require_complete_type @impl.%MyInt (%MyInt.09f) [symbolic = %require_complete (constants.%require_complete.fc7)] // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.719 as imports.%import_ref.bf0 { +// CHECK:STDOUT: impl: imports.%Main.import_ref.719 as imports.%Main.import_ref.bf0 { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.33b +// CHECK:STDOUT: witness = imports.%Main.import_ref.33b // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -542,18 +542,18 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %complete_type: = complete_type_witness @MyInt.%iN.builtin (%iN.builtin) [symbolic = %complete_type (constants.%complete_type.a87)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.9e9 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.9e9 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.697 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.697 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @LocalDouble(%x.param_patt: %MyInt.f30) -> %MyInt.f30 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %x.ref.loc9_10: %MyInt.f30 = name_ref x, %x -// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.fe6 [template = constants.%Add.type] -// CHECK:STDOUT: %Op.ref: %Op.assoc_type = name_ref Op, imports.%import_ref.6d9 [template = constants.%assoc0] +// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%Main.Add [template = constants.%Add.type] +// CHECK:STDOUT: %Op.ref: %Op.assoc_type = name_ref Op, imports.%Main.import_ref.6d9 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %Op.type.31b = impl_witness_access constants.%impl_witness.8d6, element0 [template = constants.%Op.cf9] // CHECK:STDOUT: %Op.bound: = bound_method %x.ref.loc9_10, %impl.elem0 // CHECK:STDOUT: %x.ref.loc9_21: %MyInt.f30 = name_ref x, %x @@ -582,7 +582,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: // CHECK:STDOUT: fn @CallImportedDouble(%n.param_patt: %MyInt.f30) -> %MyInt.f30 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Double.ref: %Double.type = name_ref Double, imports.%import_ref.1a7 [template = constants.%Double] +// CHECK:STDOUT: %Double.ref: %Double.type = name_ref Double, imports.%Main.Double [template = constants.%Double] // CHECK:STDOUT: %n.ref: %MyInt.f30 = name_ref n, %n // CHECK:STDOUT: %Double.specific_fn: = specific_function %Double.ref, @Double(constants.%int_64) [template = constants.%Double.specific_fn] // CHECK:STDOUT: %Double.call: init %MyInt.f30 = call %Double.specific_fn(%n.ref) @@ -1031,27 +1031,27 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.174 = import_ref Main//convert_symbolic, IntLiteral, unloaded -// CHECK:STDOUT: %import_ref.4a2: %Int.type = import_ref Main//convert_symbolic, Int, loaded [template = constants.%Int] -// CHECK:STDOUT: %import_ref.e08 = import_ref Main//convert_symbolic, ToLiteral, unloaded -// CHECK:STDOUT: %import_ref.527: %FromLiteral.type = import_ref Main//convert_symbolic, FromLiteral, loaded [template = constants.%FromLiteral] -// CHECK:STDOUT: %import_ref.eaa: %Make.type = import_ref Main//convert_symbolic, Make, loaded [template = constants.%Make] -// CHECK:STDOUT: %import_ref.466: type = import_ref Main//convert_symbolic, OtherInt, loaded [template = constants.%OtherInt] -// CHECK:STDOUT: %import_ref.10c: %MakeFromClass.type = import_ref Main//convert_symbolic, MakeFromClass, loaded [template = constants.%MakeFromClass] -// CHECK:STDOUT: %import_ref.b03: = import_ref Main//convert_symbolic, loc14_1, loaded [template = constants.%complete_type.f8a] -// CHECK:STDOUT: %import_ref.d11 = import_ref Main//convert_symbolic, inst129 [no loc], unloaded -// CHECK:STDOUT: %import_ref.8f7 = import_ref Main//convert_symbolic, loc13_45, unloaded +// CHECK:STDOUT: %Main.IntLiteral = import_ref Main//convert_symbolic, IntLiteral, unloaded +// CHECK:STDOUT: %Main.Int: %Int.type = import_ref Main//convert_symbolic, Int, loaded [template = constants.%Int] +// CHECK:STDOUT: %Main.ToLiteral = import_ref Main//convert_symbolic, ToLiteral, unloaded +// CHECK:STDOUT: %Main.FromLiteral: %FromLiteral.type = import_ref Main//convert_symbolic, FromLiteral, loaded [template = constants.%FromLiteral] +// CHECK:STDOUT: %Main.Make: %Make.type = import_ref Main//convert_symbolic, Make, loaded [template = constants.%Make] +// CHECK:STDOUT: %Main.OtherInt: type = import_ref Main//convert_symbolic, OtherInt, loaded [template = constants.%OtherInt] +// CHECK:STDOUT: %Main.MakeFromClass: %MakeFromClass.type = import_ref Main//convert_symbolic, MakeFromClass, loaded [template = constants.%MakeFromClass] +// CHECK:STDOUT: %Main.import_ref.b03: = import_ref Main//convert_symbolic, loc14_1, loaded [template = constants.%complete_type.f8a] +// CHECK:STDOUT: %Main.import_ref.d11 = import_ref Main//convert_symbolic, inst129 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f7 = import_ref Main//convert_symbolic, loc13_45, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .IntLiteral = imports.%import_ref.174 -// CHECK:STDOUT: .Int = imports.%import_ref.4a2 -// CHECK:STDOUT: .ToLiteral = imports.%import_ref.e08 -// CHECK:STDOUT: .FromLiteral = imports.%import_ref.527 -// CHECK:STDOUT: .Make = imports.%import_ref.eaa -// CHECK:STDOUT: .OtherInt = imports.%import_ref.466 -// CHECK:STDOUT: .MakeFromClass = imports.%import_ref.10c +// CHECK:STDOUT: .IntLiteral = imports.%Main.IntLiteral +// CHECK:STDOUT: .Int = imports.%Main.Int +// CHECK:STDOUT: .ToLiteral = imports.%Main.ToLiteral +// CHECK:STDOUT: .FromLiteral = imports.%Main.FromLiteral +// CHECK:STDOUT: .Make = imports.%Main.Make +// CHECK:STDOUT: .OtherInt = imports.%Main.OtherInt +// CHECK:STDOUT: .MakeFromClass = imports.%Main.MakeFromClass // CHECK:STDOUT: .m = %m // CHECK:STDOUT: .n = %n // CHECK:STDOUT: } @@ -1062,7 +1062,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: } // CHECK:STDOUT: %m.var: ref %i64.builtin = var m // CHECK:STDOUT: %.loc6_14.1: type = splice_block %.loc6_14.3 [template = constants.%i64.builtin] { -// CHECK:STDOUT: %Int.ref.loc6: %Int.type = name_ref Int, imports.%import_ref.4a2 [template = constants.%Int] +// CHECK:STDOUT: %Int.ref.loc6: %Int.type = name_ref Int, imports.%Main.Int [template = constants.%Int] // CHECK:STDOUT: %int_64.loc6: Core.IntLiteral = int_value 64 [template = constants.%int_64.fab] // CHECK:STDOUT: %int.make_type_signed.loc6: init type = call %Int.ref.loc6(%int_64.loc6) [template = constants.%i64.builtin] // CHECK:STDOUT: %.loc6_14.2: type = value_of_initializer %int.make_type_signed.loc6 [template = constants.%i64.builtin] @@ -1075,7 +1075,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: } // CHECK:STDOUT: %n.var: ref %i64.builtin = var n // CHECK:STDOUT: %.loc7_14.1: type = splice_block %.loc7_14.3 [template = constants.%i64.builtin] { -// CHECK:STDOUT: %Int.ref.loc7: %Int.type = name_ref Int, imports.%import_ref.4a2 [template = constants.%Int] +// CHECK:STDOUT: %Int.ref.loc7: %Int.type = name_ref Int, imports.%Main.Int [template = constants.%Int] // CHECK:STDOUT: %int_64.loc7: Core.IntLiteral = int_value 64 [template = constants.%int_64.fab] // CHECK:STDOUT: %int.make_type_signed.loc7: init type = call %Int.ref.loc7(%int_64.loc7) [template = constants.%i64.builtin] // CHECK:STDOUT: %.loc7_14.2: type = value_of_initializer %int.make_type_signed.loc7 [template = constants.%i64.builtin] @@ -1085,11 +1085,11 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @OtherInt [from "convert_symbolic.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.b03 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.b03 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.d11 -// CHECK:STDOUT: .ToLiteral = imports.%import_ref.8f7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.d11 +// CHECK:STDOUT: .ToLiteral = imports.%Main.import_ref.8f7 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int(%n.param_patt: Core.IntLiteral) -> type = "int.make_type_signed" [from "convert_symbolic.carbon"]; @@ -1129,8 +1129,8 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Make.ref: %Make.type = name_ref Make, imports.%import_ref.eaa [template = constants.%Make] -// CHECK:STDOUT: %FromLiteral.ref.loc6: %FromLiteral.type = name_ref FromLiteral, imports.%import_ref.527 [template = constants.%FromLiteral] +// CHECK:STDOUT: %Make.ref: %Make.type = name_ref Make, imports.%Main.Make [template = constants.%Make] +// CHECK:STDOUT: %FromLiteral.ref.loc6: %FromLiteral.type = name_ref FromLiteral, imports.%Main.FromLiteral [template = constants.%FromLiteral] // CHECK:STDOUT: %int_64.loc6: Core.IntLiteral = int_value 64 [template = constants.%int_64.fab] // CHECK:STDOUT: %int.convert_checked.loc6: init %i32.builtin = call %FromLiteral.ref.loc6(%int_64.loc6) [template = constants.%int_64.f82] // CHECK:STDOUT: %.loc6_38.1: %i32.builtin = value_of_initializer %int.convert_checked.loc6 [template = constants.%int_64.f82] @@ -1138,11 +1138,11 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %Make.specific_fn: = specific_function %Make.ref, @Make(constants.%int_64.f82) [template = constants.%Make.specific_fn.02d] // CHECK:STDOUT: %Make.call: init %i64.builtin = call %Make.specific_fn() // CHECK:STDOUT: assign file.%m.var, %Make.call -// CHECK:STDOUT: %MakeFromClass.ref: %MakeFromClass.type = name_ref MakeFromClass, imports.%import_ref.10c [template = constants.%MakeFromClass] -// CHECK:STDOUT: %FromLiteral.ref.loc7: %FromLiteral.type = name_ref FromLiteral, imports.%import_ref.527 [template = constants.%FromLiteral] +// CHECK:STDOUT: %MakeFromClass.ref: %MakeFromClass.type = name_ref MakeFromClass, imports.%Main.MakeFromClass [template = constants.%MakeFromClass] +// CHECK:STDOUT: %FromLiteral.ref.loc7: %FromLiteral.type = name_ref FromLiteral, imports.%Main.FromLiteral [template = constants.%FromLiteral] // CHECK:STDOUT: %int_64.loc7: Core.IntLiteral = int_value 64 [template = constants.%int_64.fab] // CHECK:STDOUT: %int.convert_checked.loc7: init %i32.builtin = call %FromLiteral.ref.loc7(%int_64.loc7) [template = constants.%int_64.f82] -// CHECK:STDOUT: %OtherInt.ref: type = name_ref OtherInt, imports.%import_ref.466 [template = constants.%OtherInt] +// CHECK:STDOUT: %OtherInt.ref: type = name_ref OtherInt, imports.%Main.OtherInt [template = constants.%OtherInt] // CHECK:STDOUT: %.loc7_48.1: init %OtherInt = as_compatible %int.convert_checked.loc7 [template = constants.%int_64.f82] // CHECK:STDOUT: %.loc7_48.2: init %OtherInt = converted %int.convert_checked.loc7, %.loc7_48.1 [template = constants.%int_64.f82] // CHECK:STDOUT: %.loc7_59.1: %OtherInt = value_of_initializer %.loc7_48.2 [template = constants.%int_64.f82] 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 5d134d406381..55c939264642 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_extend_impl.carbon @@ -120,30 +120,30 @@ fn G(c: C) { // CHECK:STDOUT: %Self: %I.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type.cf0: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %I.type, %F.type.cf0 [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.777 [template] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.f6d) [template] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%Main.import_ref.777 [template] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.f6d) [template] // CHECK:STDOUT: %F.type.f36: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.4c3: %F.type.f36 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.541 = import_ref Main//extend_impl_library, I, unloaded -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//extend_impl_library, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//extend_impl_library, loc12_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//extend_impl_library, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.3019d1.1: type = import_ref Main//extend_impl_library, loc9_18, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//extend_impl_library, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b5b: %F.assoc_type = import_ref Main//extend_impl_library, loc5_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8b9 = import_ref Main//extend_impl_library, F, unloaded -// CHECK:STDOUT: %import_ref.b86: = import_ref Main//extend_impl_library, loc9_20, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.0ed: type = import_ref Main//extend_impl_library, loc9_15, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.3019d1.2: type = import_ref Main//extend_impl_library, loc9_18, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I = import_ref Main//extend_impl_library, I, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//extend_impl_library, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//extend_impl_library, loc12_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//extend_impl_library, inst25 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.3019d1.1: type = import_ref Main//extend_impl_library, loc9_18, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//extend_impl_library, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b5b: %F.assoc_type = import_ref Main//extend_impl_library, loc5_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.F = import_ref Main//extend_impl_library, F, unloaded +// CHECK:STDOUT: %Main.import_ref.b86: = import_ref Main//extend_impl_library, loc9_20, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.0ed: type = import_ref Main//extend_impl_library, loc9_15, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.3019d1.2: type = import_ref Main//extend_impl_library, loc9_18, loaded [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.541 -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -152,39 +152,39 @@ fn G(c: C) { // CHECK:STDOUT: %c.param_patt: %C = value_param_pattern %c.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %c.param: %C = value_param runtime_param0 -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "extend_impl_library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .F = imports.%import_ref.b5b -// CHECK:STDOUT: witness = (imports.%import_ref.8b9) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .F = imports.%Main.import_ref.b5b +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.0ed as imports.%import_ref.3019d1.2 [from "extend_impl_library.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.0ed as imports.%Main.import_ref.3019d1.2 [from "extend_impl_library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.b86 +// CHECK:STDOUT: witness = imports.%Main.import_ref.b86 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "extend_impl_library.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: extend imports.%import_ref.3019d1.1 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: extend imports.%Main.import_ref.3019d1.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%c.param_patt: %C) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %F.ref.loc7: %F.assoc_type = name_ref F, imports.%import_ref.b5b [template = constants.%assoc0] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %F.ref.loc7: %F.assoc_type = name_ref F, imports.%Main.import_ref.b5b [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0.loc7: %F.type.cf0 = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.4c3] // CHECK:STDOUT: %F.call.loc7: init %empty_tuple.type = call %impl.elem0.loc7() // CHECK:STDOUT: %c.ref: %C = name_ref c, %c -// CHECK:STDOUT: %F.ref.loc8: %F.assoc_type = name_ref F, imports.%import_ref.b5b [template = constants.%assoc0] +// CHECK:STDOUT: %F.ref.loc8: %F.assoc_type = name_ref F, imports.%Main.import_ref.b5b [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0.loc8: %F.type.cf0 = impl_witness_access constants.%impl_witness, element0 [template = constants.%F.4c3] // CHECK:STDOUT: %F.call.loc8: init %empty_tuple.type = call %impl.elem0.loc8() // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/impl/no_prelude/import_generic.carbon b/toolchain/check/testdata/impl/no_prelude/import_generic.carbon index 8c548c6793ca..9435de549a9c 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_generic.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_generic.carbon @@ -294,23 +294,23 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//import_generic, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.9f4: %I.type.dac = import_ref Main//import_generic, I, loaded [template = constants.%I.generic] -// CHECK:STDOUT: %import_ref.003 = import_ref Main//import_generic, loc8_33, unloaded -// CHECK:STDOUT: %import_ref.884 = import_ref Main//import_generic, inst31 [no loc], unloaded -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//import_generic, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//import_generic, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.29aca8.1: type = import_ref Main//import_generic, loc8_24, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.4be: type = import_ref Main//import_generic, loc8_32, loaded [symbolic = @impl.1.%I.type (constants.%I.type.325)] -// CHECK:STDOUT: %import_ref.4e1 = import_ref Main//import_generic, loc12_35, unloaded -// CHECK:STDOUT: %import_ref.29aca8.2: type = import_ref Main//import_generic, loc12_24, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.3e2: type = import_ref Main//import_generic, loc12_33, loaded [symbolic = @impl.2.%I.type (constants.%I.type.0e2)] +// CHECK:STDOUT: %Main.C: type = import_ref Main//import_generic, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.I: %I.type.dac = import_ref Main//import_generic, I, loaded [template = constants.%I.generic] +// CHECK:STDOUT: %Main.import_ref.003 = import_ref Main//import_generic, loc8_33, unloaded +// CHECK:STDOUT: %Main.import_ref.884 = import_ref Main//import_generic, inst31 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//import_generic, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//import_generic, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.29aca8.1: type = import_ref Main//import_generic, loc8_24, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.4be: type = import_ref Main//import_generic, loc8_32, loaded [symbolic = @impl.1.%I.type (constants.%I.type.325)] +// CHECK:STDOUT: %Main.import_ref.4e1 = import_ref Main//import_generic, loc12_35, unloaded +// CHECK:STDOUT: %Main.import_ref.29aca8.2: type = import_ref Main//import_generic, loc12_24, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.3e2: type = import_ref Main//import_generic, loc12_33, loaded [symbolic = @impl.2.%I.type (constants.%I.type.0e2)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .I = imports.%import_ref.9f4 +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -318,8 +318,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc8_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc8_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc8_14.1, runtime_param [symbolic = %T.patt.loc8_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc8_14.1 [symbolic = %T.loc8_14.2 (constants.%T)] // CHECK:STDOUT: %I.type.loc8_32.1: type = facet_type <@I, @I(constants.%T)> [symbolic = %I.type.loc8_32.2 (constants.%I.type.325)] // CHECK:STDOUT: %T.param: type = value_param runtime_param @@ -330,8 +330,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc14_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc14_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc14_14.1, runtime_param [symbolic = %T.patt.loc14_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc14_14.1 [symbolic = %T.loc14_14.2 (constants.%T)] // CHECK:STDOUT: %I.type.loc14_32.1: type = facet_type <@I, @I(constants.%T)> [symbolic = %I.type.loc14_32.2 (constants.%I.type.325)] // CHECK:STDOUT: %T.param: type = value_param runtime_param @@ -342,8 +342,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc20_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc20_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc20_14.1, runtime_param [symbolic = %T.patt.loc20_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc20_14.1 [symbolic = %T.loc20_14.2 (constants.%T)] // CHECK:STDOUT: %ptr.loc20_32.1: type = ptr_type %T [symbolic = %ptr.loc20_32.2 (constants.%ptr)] // CHECK:STDOUT: %I.type.loc20_33.1: type = facet_type <@I, @I(constants.%ptr)> [symbolic = %I.type.loc20_33.2 (constants.%I.type.0e2)] @@ -355,8 +355,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc26_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc26_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc26_14.1, runtime_param [symbolic = %T.patt.loc26_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%import_ref.9f4 [template = constants.%I.generic] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %I.ref: %I.type.dac = name_ref I, imports.%Main.I [template = constants.%I.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc26_14.1 [symbolic = %T.loc26_14.2 (constants.%T)] // CHECK:STDOUT: %ptr.loc26_32.1: type = ptr_type %T [symbolic = %ptr.loc26_32.2 (constants.%ptr)] // CHECK:STDOUT: %I.type.loc26_33.1: type = facet_type <@I, @I(constants.%ptr)> [symbolic = %I.type.loc26_33.2 (constants.%I.type.0e2)] @@ -376,7 +376,7 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.884 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.884 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -390,9 +390,9 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.29aca8.1 as imports.%import_ref.4be { +// CHECK:STDOUT: impl: imports.%Main.import_ref.29aca8.1 as imports.%Main.import_ref.4be { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.003 +// CHECK:STDOUT: witness = imports.%Main.import_ref.003 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -406,9 +406,9 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.29aca8.2 as imports.%import_ref.3e2 { +// CHECK:STDOUT: impl: imports.%Main.import_ref.29aca8.2 as imports.%Main.import_ref.3e2 { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.4e1 +// CHECK:STDOUT: witness = imports.%Main.import_ref.4e1 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -465,10 +465,10 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "import_generic.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @I(constants.%T) { @@ -742,21 +742,21 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b0a: type = import_ref Main//import_generic_decl, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.0eb: %J.type.2b8 = import_ref Main//import_generic_decl, J, loaded [template = constants.%J.generic] -// CHECK:STDOUT: %import_ref.ff5 = import_ref Main//import_generic_decl, inst31 [no loc], unloaded -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//import_generic_decl, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.cab = import_ref Main//import_generic_decl, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.aa9f8a.1: type = import_ref Main//import_generic_decl, loc11_24, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.ded: type = import_ref Main//import_generic_decl, loc11_32, loaded [symbolic = @impl.1.%J.type (constants.%J.type.b72)] -// CHECK:STDOUT: %import_ref.aa9f8a.2: type = import_ref Main//import_generic_decl, loc17_24, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.0d3: type = import_ref Main//import_generic_decl, loc17_33, loaded [symbolic = @impl.2.%J.type (constants.%J.type.628)] +// CHECK:STDOUT: %Main.D: type = import_ref Main//import_generic_decl, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.J: %J.type.2b8 = import_ref Main//import_generic_decl, J, loaded [template = constants.%J.generic] +// CHECK:STDOUT: %Main.import_ref.ff5 = import_ref Main//import_generic_decl, inst31 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//import_generic_decl, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.cab = import_ref Main//import_generic_decl, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.aa9f8a.1: type = import_ref Main//import_generic_decl, loc11_24, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.import_ref.ded: type = import_ref Main//import_generic_decl, loc11_32, loaded [symbolic = @impl.1.%J.type (constants.%J.type.b72)] +// CHECK:STDOUT: %Main.import_ref.aa9f8a.2: type = import_ref Main//import_generic_decl, loc17_24, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.import_ref.0d3: type = import_ref Main//import_generic_decl, loc17_33, loaded [symbolic = @impl.2.%J.type (constants.%J.type.628)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .D = imports.%import_ref.b0a -// CHECK:STDOUT: .J = imports.%import_ref.0eb +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .J = imports.%Main.J // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -764,8 +764,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc8_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc8_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc8_14.1, runtime_param [symbolic = %T.patt.loc8_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%import_ref.0eb [template = constants.%J.generic] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%Main.J [template = constants.%J.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc8_14.1 [symbolic = %T.loc8_14.2 (constants.%T)] // CHECK:STDOUT: %J.type.loc8_32.1: type = facet_type <@J, @J(constants.%T)> [symbolic = %J.type.loc8_32.2 (constants.%J.type.b72)] // CHECK:STDOUT: %T.param: type = value_param runtime_param @@ -776,8 +776,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc14_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc14_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc14_14.1, runtime_param [symbolic = %T.patt.loc14_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%import_ref.0eb [template = constants.%J.generic] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%Main.J [template = constants.%J.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc14_14.1 [symbolic = %T.loc14_14.2 (constants.%T)] // CHECK:STDOUT: %J.type.loc14_32.1: type = facet_type <@J, @J(constants.%T)> [symbolic = %J.type.loc14_32.2 (constants.%J.type.b72)] // CHECK:STDOUT: %T.param: type = value_param runtime_param @@ -788,8 +788,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc20_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc20_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc20_14.1, runtime_param [symbolic = %T.patt.loc20_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%import_ref.0eb [template = constants.%J.generic] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%Main.J [template = constants.%J.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc20_14.1 [symbolic = %T.loc20_14.2 (constants.%T)] // CHECK:STDOUT: %ptr.loc20_32.1: type = ptr_type %T [symbolic = %ptr.loc20_32.2 (constants.%ptr)] // CHECK:STDOUT: %J.type.loc20_33.1: type = facet_type <@J, @J(constants.%ptr)> [symbolic = %J.type.loc20_33.2 (constants.%J.type.628)] @@ -801,8 +801,8 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %T.patt.loc26_14.1: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt.loc26_14.2 (constants.%T.patt)] // CHECK:STDOUT: %T.param_patt: type = value_param_pattern %T.patt.loc26_14.1, runtime_param [symbolic = %T.patt.loc26_14.2 (constants.%T.patt)] // CHECK:STDOUT: } { -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] -// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%import_ref.0eb [template = constants.%J.generic] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] +// CHECK:STDOUT: %J.ref: %J.type.2b8 = name_ref J, imports.%Main.J [template = constants.%J.generic] // CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc26_14.1 [symbolic = %T.loc26_14.2 (constants.%T)] // CHECK:STDOUT: %ptr.loc26_32.1: type = ptr_type %T [symbolic = %ptr.loc26_32.2 (constants.%ptr)] // CHECK:STDOUT: %J.type.loc26_33.1: type = facet_type <@J, @J(constants.%ptr)> [symbolic = %J.type.loc26_33.2 (constants.%J.type.628)] @@ -822,7 +822,7 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ff5 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.ff5 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -834,7 +834,7 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %require_complete: = require_complete_type @impl.1.%J.type (%J.type.b72) [symbolic = %require_complete (constants.%require_complete.287)] // CHECK:STDOUT: %impl_witness: = impl_witness (), @impl.1(%T) [symbolic = %impl_witness (constants.%impl_witness.0ef94b.1)] // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.aa9f8a.1 as imports.%import_ref.ded; +// CHECK:STDOUT: impl: imports.%Main.import_ref.aa9f8a.1 as imports.%Main.import_ref.ded; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic impl @impl.2(constants.%T: type) [from "fail_import_generic_decl.carbon"] { @@ -845,7 +845,7 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: %require_complete: = require_complete_type @impl.2.%J.type (%J.type.628) [symbolic = %require_complete (constants.%require_complete.c60)] // CHECK:STDOUT: %impl_witness: = impl_witness (), @impl.2(%T) [symbolic = %impl_witness (constants.%impl_witness.b80f53.1)] // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.aa9f8a.2 as imports.%import_ref.0d3; +// CHECK:STDOUT: impl: imports.%Main.import_ref.aa9f8a.2 as imports.%Main.import_ref.0d3; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic impl @impl.3(%T.loc8_14.1: type) { @@ -901,10 +901,10 @@ impl forall [T:! type] D as J(T*) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "fail_import_generic_decl.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cab // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @J(constants.%T) { 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 a8afdc7df5f2..26d4e71177d4 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 @@ -254,7 +254,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] @@ -262,29 +262,29 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C1 = %C1.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C1.decl: type = class_decl @C1 [template = constants.%C1] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C1.ref: type = name_ref C1, file.%C1.decl [template = constants.%C1] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self.ref [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc5_26.1: %empty_struct_type = struct_literal () @@ -298,9 +298,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C1.ref as %.loc5_14 { @@ -325,7 +325,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] @@ -333,29 +333,29 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C2 = %C2.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C2.decl: type = class_decl @C2 [template = constants.%C2] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C2.ref.loc5: type = name_ref C2, file.%C2.decl [template = constants.%C2] -// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self.1: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc5: %I.type = name_ref .Self, %.Self.1 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc5: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc5: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc5: = facet_access_witness %.Self.ref.loc5 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc5: type = impl_witness_access %.Self.as_wit.loc5, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc5_26.1: %empty_struct_type = struct_literal () @@ -367,10 +367,10 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %impl_witness: = impl_witness (constants.%empty_struct_type) [template = constants.%impl_witness] // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C2.ref.loc6: type = name_ref C2, file.%C2.decl [template = constants.%C2] -// CHECK:STDOUT: %I.ref.loc6: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc6: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self.2: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc6: %I.type = name_ref .Self, %.Self.2 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc6: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc6: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc6: = facet_access_witness %.Self.ref.loc6 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc6: type = impl_witness_access %.Self.as_wit.loc6, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc6_26.1: %empty_struct_type = struct_literal () @@ -383,9 +383,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C2.ref.loc5 as %.loc5_14 { @@ -411,41 +411,41 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %impl_witness: = impl_witness (%empty_struct_type) [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C3 = %C3.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C3.decl: type = class_decl @C3 [template = constants.%C3] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C3.ref.loc5: type = name_ref C3, file.%C3.decl [template = constants.%C3] -// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (constants.%empty_struct_type) [template = constants.%impl_witness] // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C3.ref.loc6: type = name_ref C3, file.%C3.decl [template = constants.%C3] -// CHECK:STDOUT: %I.ref.loc6: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc6: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self.ref [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc6_26.1: %empty_struct_type = struct_literal () @@ -458,9 +458,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C3.ref.loc5 as %I.ref.loc5 { @@ -486,7 +486,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [template] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type.f5a: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] @@ -495,29 +495,29 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C4 = %C4.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C4.decl: type = class_decl @C4 [template = constants.%C4] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C4.ref.loc5: type = name_ref C4, file.%C4.decl [template = constants.%C4] -// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self.1: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc5: %I.type = name_ref .Self, %.Self.1 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc5: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc5: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc5: = facet_access_witness %.Self.ref.loc5 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc5: type = impl_witness_access %.Self.as_wit.loc5, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc5_26.1: %empty_struct_type = struct_literal () @@ -529,10 +529,10 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %impl_witness: = impl_witness (constants.%empty_struct_type) [template = constants.%impl_witness] // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C4.ref.loc13: type = name_ref C4, file.%C4.decl [template = constants.%C4] -// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self.2: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc13: %I.type = name_ref .Self, %.Self.2 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc13: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc13: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc13: = facet_access_witness %.Self.ref.loc13 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc13: type = impl_witness_access %.Self.as_wit.loc13, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc13_26.1: %empty_tuple.type = tuple_literal () @@ -545,9 +545,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C4.ref.loc5 as %.loc5_14 { @@ -572,57 +572,57 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I3.type: type = facet_type <@I3> [template] // CHECK:STDOUT: %.Self: %I3.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I3.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.95f [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.95f [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] -// CHECK:STDOUT: %assoc1: %assoc_type = assoc_entity element1, imports.%import_ref.f70 [template] +// CHECK:STDOUT: %assoc1: %assoc_type = assoc_entity element1, imports.%Main.import_ref.f70 [template] // CHECK:STDOUT: %impl.elem1: type = impl_witness_access %.Self.as_wit, element1 [symbolic] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %empty_struct_type} [template] -// CHECK:STDOUT: %assoc2: %assoc_type = assoc_entity element2, imports.%import_ref.469 [template] +// CHECK:STDOUT: %assoc2: %assoc_type = assoc_entity element2, imports.%Main.import_ref.469 [template] // CHECK:STDOUT: %impl.elem2: type = impl_witness_access %.Self.as_wit, element2 [symbolic] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %empty_struct_type} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.541 = import_ref Main//interface, I, unloaded -// CHECK:STDOUT: %import_ref.f40: type = import_ref Main//interface, I3, loaded [template = constants.%I3.type] -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.148 = import_ref Main//interface, inst23 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4d5: %assoc_type = import_ref Main//interface, loc6_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.2f7: %assoc_type = import_ref Main//interface, loc7_9, loaded [template = constants.%assoc1] -// CHECK:STDOUT: %import_ref.fc4: %assoc_type = import_ref Main//interface, loc8_9, loaded [template = constants.%assoc2] -// CHECK:STDOUT: %import_ref.cdd = import_ref Main//interface, T1, unloaded -// CHECK:STDOUT: %import_ref.bad = import_ref Main//interface, T2, unloaded -// CHECK:STDOUT: %import_ref.742 = import_ref Main//interface, T3, unloaded +// CHECK:STDOUT: %Main.I = import_ref Main//interface, I, unloaded +// CHECK:STDOUT: %Main.I3: type = import_ref Main//interface, I3, loaded [template = constants.%I3.type] +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.148 = import_ref Main//interface, inst23 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.4d5: %assoc_type = import_ref Main//interface, loc6_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.import_ref.2f7: %assoc_type = import_ref Main//interface, loc7_9, loaded [template = constants.%assoc1] +// CHECK:STDOUT: %Main.import_ref.fc4: %assoc_type = import_ref Main//interface, loc8_9, loaded [template = constants.%assoc2] +// CHECK:STDOUT: %Main.T1 = import_ref Main//interface, T1, unloaded +// CHECK:STDOUT: %Main.T2 = import_ref Main//interface, T2, unloaded +// CHECK:STDOUT: %Main.T3 = import_ref Main//interface, T3, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.541 -// CHECK:STDOUT: .I3 = imports.%import_ref.f40 -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C5 = %C5.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C5.decl: type = class_decl @C5 [template = constants.%C5] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C5.ref.loc18: type = name_ref C5, file.%C5.decl [template = constants.%C5] -// CHECK:STDOUT: %I3.ref.loc18: type = name_ref I3, imports.%import_ref.f40 [template = constants.%I3.type] +// CHECK:STDOUT: %I3.ref.loc18: type = name_ref I3, imports.%Main.I3 [template = constants.%I3.type] // CHECK:STDOUT: %.Self.1: %I3.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc18_21: %I3.type = name_ref .Self, %.Self.1 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T1.ref.loc18: %assoc_type = name_ref T1, imports.%import_ref.4d5 [template = constants.%assoc0] +// CHECK:STDOUT: %T1.ref.loc18: %assoc_type = name_ref T1, imports.%Main.import_ref.4d5 [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc18_21: = facet_access_witness %.Self.ref.loc18_21 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc18: type = impl_witness_access %.Self.as_wit.loc18_21, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %BAD1.ref: = name_ref BAD1, [template = ] // CHECK:STDOUT: %.Self.ref.loc18_36: %I3.type = name_ref .Self, %.Self.1 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T2.ref.loc18: %assoc_type = name_ref T2, imports.%import_ref.2f7 [template = constants.%assoc1] +// CHECK:STDOUT: %T2.ref.loc18: %assoc_type = name_ref T2, imports.%Main.import_ref.2f7 [template = constants.%assoc1] // CHECK:STDOUT: %.Self.as_wit.loc18_36: = facet_access_witness %.Self.ref.loc18_36 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem1.loc18: type = impl_witness_access %.Self.as_wit.loc18_36, element1 [symbolic = constants.%impl.elem1] // CHECK:STDOUT: %.loc18_48.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc18_48.2: type = converted %.loc18_48.1, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %empty_struct_type} [template = constants.%struct_type.a] // CHECK:STDOUT: %.Self.ref.loc18_55: %I3.type = name_ref .Self, %.Self.1 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T3.ref.loc18: %assoc_type = name_ref T3, imports.%import_ref.fc4 [template = constants.%assoc2] +// CHECK:STDOUT: %T3.ref.loc18: %assoc_type = name_ref T3, imports.%Main.import_ref.fc4 [template = constants.%assoc2] // CHECK:STDOUT: %.Self.as_wit.loc18_55: = facet_access_witness %.Self.ref.loc18_55 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem2.loc18: type = impl_witness_access %.Self.as_wit.loc18_55, element2 [symbolic = constants.%impl.elem2] // CHECK:STDOUT: %BAD2.ref: = name_ref BAD2, [template = ] @@ -634,22 +634,22 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C5.ref.loc28: type = name_ref C5, file.%C5.decl [template = constants.%C5] -// CHECK:STDOUT: %I3.ref.loc28: type = name_ref I3, imports.%import_ref.f40 [template = constants.%I3.type] +// CHECK:STDOUT: %I3.ref.loc28: type = name_ref I3, imports.%Main.I3 [template = constants.%I3.type] // CHECK:STDOUT: %.Self.2: %I3.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc28_21: %I3.type = name_ref .Self, %.Self.2 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T1.ref.loc28: %assoc_type = name_ref T1, imports.%import_ref.4d5 [template = constants.%assoc0] +// CHECK:STDOUT: %T1.ref.loc28: %assoc_type = name_ref T1, imports.%Main.import_ref.4d5 [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc28_21: = facet_access_witness %.Self.ref.loc28_21 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc28: type = impl_witness_access %.Self.as_wit.loc28_21, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc28_33.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc28_33.2: type = converted %.loc28_33.1, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %empty_struct_type} [template = constants.%struct_type.b] // CHECK:STDOUT: %.Self.ref.loc28_40: %I3.type = name_ref .Self, %.Self.2 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T2.ref.loc28: %assoc_type = name_ref T2, imports.%import_ref.2f7 [template = constants.%assoc1] +// CHECK:STDOUT: %T2.ref.loc28: %assoc_type = name_ref T2, imports.%Main.import_ref.2f7 [template = constants.%assoc1] // CHECK:STDOUT: %.Self.as_wit.loc28_40: = facet_access_witness %.Self.ref.loc28_40 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem1.loc28: type = impl_witness_access %.Self.as_wit.loc28_40, element1 [symbolic = constants.%impl.elem1] // CHECK:STDOUT: %BAD3.ref: = name_ref BAD3, [template = ] // CHECK:STDOUT: %.Self.ref.loc28_55: %I3.type = name_ref .Self, %.Self.2 [symbolic = constants.%.Self] -// CHECK:STDOUT: %T3.ref.loc28: %assoc_type = name_ref T3, imports.%import_ref.fc4 [template = constants.%assoc2] +// CHECK:STDOUT: %T3.ref.loc28: %assoc_type = name_ref T3, imports.%Main.import_ref.fc4 [template = constants.%assoc2] // CHECK:STDOUT: %.Self.as_wit.loc28_55: = facet_access_witness %.Self.ref.loc28_55 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem2.loc28: type = impl_witness_access %.Self.as_wit.loc28_55, element2 [symbolic = constants.%impl.elem2] // CHECK:STDOUT: %BAD4.ref: = name_ref BAD4, [template = ] @@ -663,11 +663,11 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I3 [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.148 -// CHECK:STDOUT: .T1 = imports.%import_ref.4d5 -// CHECK:STDOUT: .T2 = imports.%import_ref.2f7 -// CHECK:STDOUT: .T3 = imports.%import_ref.fc4 -// CHECK:STDOUT: witness = (imports.%import_ref.cdd, imports.%import_ref.bad, imports.%import_ref.742) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.148 +// CHECK:STDOUT: .T1 = imports.%Main.import_ref.4d5 +// CHECK:STDOUT: .T2 = imports.%Main.import_ref.2f7 +// CHECK:STDOUT: .T3 = imports.%Main.import_ref.fc4 +// CHECK:STDOUT: witness = (imports.%Main.T1, imports.%Main.T2, imports.%Main.T3) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C5.ref.loc18 as %.loc18_15 { @@ -692,7 +692,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] @@ -700,29 +700,29 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C6 = %C6.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C6.decl: type = class_decl @C6 [template = constants.%C6] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C6.ref.loc5: type = name_ref C6, file.%C6.decl [template = constants.%C6] -// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc5: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self.ref [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc5_26.1: %empty_struct_type = struct_literal () @@ -734,15 +734,15 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %impl_witness: = impl_witness (constants.%empty_struct_type) [template = constants.%impl_witness] // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C6.ref.loc13: type = name_ref C6, file.%C6.decl [template = constants.%C6] -// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C6.ref.loc5 as %.loc5_14 { @@ -768,7 +768,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [template] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type and %impl.elem0 = %empty_tuple.type> [template] @@ -776,35 +776,35 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C7 = %C7.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C7.decl: type = class_decl @C7 [template = constants.%C7] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C7.ref: type = name_ref C7, file.%C7.decl [template = constants.%C7] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc10_20: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_20: = facet_access_witness %.Self.ref.loc10_20 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_20: type = impl_witness_access %.Self.as_wit.loc10_20, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc10_26.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc10_26.2: type = converted %.loc10_26.1, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %.Self.ref.loc10_32: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_32: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_32: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_32: = facet_access_witness %.Self.ref.loc10_32 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_32: type = impl_witness_access %.Self.as_wit.loc10_32, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc10_38.1: %empty_tuple.type = tuple_literal () @@ -819,9 +819,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C7.ref as %.loc10_14 { @@ -847,40 +847,40 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [template] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.08d = import_ref Main//interface, T, unloaded +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T = import_ref Main//interface, T, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C8 = %C8.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C8.decl: type = class_decl @C8 [template = constants.%C8] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C8.ref: type = name_ref C8, file.%C8.decl [template = constants.%C8] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc10_20: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_20: = facet_access_witness %.Self.ref.loc10_20 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_20: type = impl_witness_access %.Self.as_wit.loc10_20, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %BAD5.ref: = name_ref BAD5, [template = ] // CHECK:STDOUT: %.Self.ref.loc10_34: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_34: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_34: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_34: = facet_access_witness %.Self.ref.loc10_34 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_34: type = impl_witness_access %.Self.as_wit.loc10_34, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc10_40.1: %empty_tuple.type = tuple_literal () @@ -894,9 +894,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.08d) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C8.ref as %.loc10_14 { @@ -921,41 +921,41 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.08d = import_ref Main//interface, T, unloaded +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T = import_ref Main//interface, T, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .C9 = %C9.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C9.decl: type = class_decl @C9 [template = constants.%C9] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C9.ref: type = name_ref C9, file.%C9.decl [template = constants.%C9] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc10_20: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_20: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_20: = facet_access_witness %.Self.ref.loc10_20 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_20: type = impl_witness_access %.Self.as_wit.loc10_20, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc10_26.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc10_26.2: type = converted %.loc10_26.1, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %.Self.ref.loc10_32: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc10_32: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc10_32: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc10_32: = facet_access_witness %.Self.ref.loc10_32 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc10_32: type = impl_witness_access %.Self.as_wit.loc10_32, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %BAD6.ref: = name_ref BAD6, [template = ] @@ -968,9 +968,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.08d) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C9.ref as %.loc10_14 { @@ -995,40 +995,40 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.08d = import_ref Main//interface, T, unloaded +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T = import_ref Main//interface, T, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .CA = %CA.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %CA.decl: type = class_decl @CA [template = constants.%CA] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %CA.ref: type = name_ref CA, file.%CA.decl [template = constants.%CA] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc14_20: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc14_20: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc14_20: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc14_20: = facet_access_witness %.Self.ref.loc14_20 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc14_20: type = impl_witness_access %.Self.as_wit.loc14_20, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %BAD7.ref: = name_ref BAD7, [template = ] // CHECK:STDOUT: %.Self.ref.loc14_34: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc14_34: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc14_34: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc14_34: = facet_access_witness %.Self.ref.loc14_34 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc14_34: type = impl_witness_access %.Self.as_wit.loc14_34, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %BAD8.ref: = name_ref BAD8, [template = ] @@ -1041,9 +1041,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.08d) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %CA.ref as %.loc14 { @@ -1068,7 +1068,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %I.type: type = facet_type <@I> [template] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %I.type, type [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.ef4 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.ef4 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: type = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %I_where.type: type = facet_type <@I where %impl.elem0 = %empty_struct_type> [template] @@ -1076,35 +1076,35 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//interface, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.dfc = import_ref Main//interface, NonType, unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.3b7: type = import_ref Main//interface, T, loaded [template = %T] +// CHECK:STDOUT: %Main.I: type = import_ref Main//interface, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType = import_ref Main//interface, NonType, unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//interface, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.15c: %assoc_type = import_ref Main//interface, loc3_20, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.T: type = import_ref Main//interface, T, loaded [template = %T] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df2 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.dfc +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .CB = %CB.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %CB.decl: type = class_decl @CB [template = constants.%CB] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %CB.ref: type = name_ref CB, file.%CB.decl [template = constants.%CB] -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %.Self: %I.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref.loc6_20: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc6_20: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc6_20: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc6_20: = facet_access_witness %.Self.ref.loc6_20 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc6_20: type = impl_witness_access %.Self.as_wit.loc6_20, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc6_26.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc6_26.2: type = converted %.loc6_26.1, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %.Self.ref.loc6_32: %I.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %T.ref.loc6_32: %assoc_type = name_ref T, imports.%import_ref.15c [template = constants.%assoc0] +// CHECK:STDOUT: %T.ref.loc6_32: %assoc_type = name_ref T, imports.%Main.import_ref.15c [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit.loc6_32: = facet_access_witness %.Self.ref.loc6_32 [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0.loc6_32: type = impl_witness_access %.Self.as_wit.loc6_32, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc6_38.1: %empty_struct_type = struct_literal () @@ -1119,9 +1119,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .T = imports.%import_ref.15c -// CHECK:STDOUT: witness = (imports.%import_ref.3b7) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .T = imports.%Main.import_ref.15c +// CHECK:STDOUT: witness = (imports.%Main.T) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %CB.ref as %.loc6_14 { @@ -1147,7 +1147,7 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: %.Self: %NonType.type = bind_symbolic_name .Self [symbolic] // CHECK:STDOUT: %struct_type.a.225: type = struct_type {.a: %empty_struct_type} [template] // CHECK:STDOUT: %assoc_type: type = assoc_entity_type %NonType.type, %struct_type.a.225 [template] -// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%import_ref.f27 [template] +// CHECK:STDOUT: %assoc0: %assoc_type = assoc_entity element0, imports.%Main.import_ref.f27 [template] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self [symbolic] // CHECK:STDOUT: %impl.elem0: %struct_type.a.225 = impl_witness_access %.Self.as_wit, element0 [symbolic] // CHECK:STDOUT: %empty_struct: %empty_struct_type = struct_value () [template] @@ -1157,29 +1157,29 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.541 = import_ref Main//interface, I, unloaded -// CHECK:STDOUT: %import_ref.43d = import_ref Main//interface, I3, unloaded -// CHECK:STDOUT: %import_ref.22d: type = import_ref Main//interface, NonType, loaded [template = constants.%NonType.type] -// CHECK:STDOUT: %import_ref.8b7 = import_ref Main//interface, inst37 [no loc], unloaded -// CHECK:STDOUT: %import_ref.abe: %assoc_type = import_ref Main//interface, loc12_8, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.d24: %struct_type.a.225 = import_ref Main//interface, Y, loaded [template = %Y] +// CHECK:STDOUT: %Main.I = import_ref Main//interface, I, unloaded +// CHECK:STDOUT: %Main.I3 = import_ref Main//interface, I3, unloaded +// CHECK:STDOUT: %Main.NonType: type = import_ref Main//interface, NonType, loaded [template = constants.%NonType.type] +// CHECK:STDOUT: %Main.import_ref.8b7 = import_ref Main//interface, inst37 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.abe: %assoc_type = import_ref Main//interface, loc12_8, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.Y: %struct_type.a.225 = import_ref Main//interface, Y, loaded [template = %Y] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.541 -// CHECK:STDOUT: .I3 = imports.%import_ref.43d -// CHECK:STDOUT: .NonType = imports.%import_ref.22d +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .I3 = imports.%Main.I3 +// CHECK:STDOUT: .NonType = imports.%Main.NonType // CHECK:STDOUT: .CC = %CC.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %CC.decl: type = class_decl @CC [template = constants.%CC] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %CC.ref: type = name_ref CC, file.%CC.decl [template = constants.%CC] -// CHECK:STDOUT: %NonType.ref: type = name_ref NonType, imports.%import_ref.22d [template = constants.%NonType.type] +// CHECK:STDOUT: %NonType.ref: type = name_ref NonType, imports.%Main.NonType [template = constants.%NonType.type] // CHECK:STDOUT: %.Self: %NonType.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref: %NonType.type = name_ref .Self, %.Self [symbolic = constants.%.Self] -// CHECK:STDOUT: %Y.ref: %assoc_type = name_ref Y, imports.%import_ref.abe [template = constants.%assoc0] +// CHECK:STDOUT: %Y.ref: %assoc_type = name_ref Y, imports.%Main.import_ref.abe [template = constants.%assoc0] // CHECK:STDOUT: %.Self.as_wit: = facet_access_witness %.Self.ref [symbolic = constants.%.Self.as_wit] // CHECK:STDOUT: %impl.elem0: %struct_type.a.225 = impl_witness_access %.Self.as_wit, element0 [symbolic = constants.%impl.elem0] // CHECK:STDOUT: %.loc6_38: %empty_struct_type = struct_literal () @@ -1197,9 +1197,9 @@ impl CC as NonType where .Y = {.a = {}} { } // CHECK:STDOUT: // CHECK:STDOUT: interface @NonType [from "interface.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.8b7 -// CHECK:STDOUT: .Y = imports.%import_ref.abe -// CHECK:STDOUT: witness = (imports.%import_ref.d24) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.8b7 +// CHECK:STDOUT: .Y = imports.%Main.import_ref.abe +// CHECK:STDOUT: witness = (imports.%Main.Y) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %CC.ref as %.loc6_20 { diff --git a/toolchain/check/testdata/impl/no_prelude/import_self.carbon b/toolchain/check/testdata/impl/no_prelude/import_self.carbon index c4a0cd300082..041f789135a8 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_self.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_self.carbon @@ -116,26 +116,26 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: %F.type: type = fn_type @F [template] // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %Op.assoc_type: type = assoc_entity_type %Add.type, %Op.type.31b [template] -// CHECK:STDOUT: %assoc0: %Op.assoc_type = assoc_entity element0, imports.%import_ref.047 [template] +// CHECK:STDOUT: %assoc0: %Op.assoc_type = assoc_entity element0, imports.%Main.import_ref.047 [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.fe6: type = import_ref Main//a, Add, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.07c = import_ref Main//a, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.6d9: %Op.assoc_type = import_ref Main//a, loc5_41, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.502: %Op.type.31b = import_ref Main//a, Op, loaded [template = constants.%Op.d59] +// CHECK:STDOUT: %Main.Add: type = import_ref Main//a, Add, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Main.import_ref.07c = import_ref Main//a, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.6d9: %Op.assoc_type = import_ref Main//a, loc5_41, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.Op: %Op.type.31b = import_ref Main//a, Op, loaded [template = constants.%Op.d59] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Add = imports.%import_ref.fe6 +// CHECK:STDOUT: .Add = imports.%Main.Add // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %.loc6_7.1: %empty_tuple.type = tuple_literal () // CHECK:STDOUT: %.loc6_7.2: type = converted %.loc6_7.1, constants.%empty_tuple.type [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.fe6 [template = constants.%Add.type] +// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%Main.Add [template = constants.%Add.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%Op.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { @@ -167,9 +167,9 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: // CHECK:STDOUT: interface @Add [from "a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.07c -// CHECK:STDOUT: .Op = imports.%import_ref.6d9 -// CHECK:STDOUT: witness = (imports.%import_ref.502) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.07c +// CHECK:STDOUT: .Op = imports.%Main.import_ref.6d9 +// CHECK:STDOUT: witness = (imports.%Main.Op) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %.loc6_7.2 as %Add.ref { @@ -215,8 +215,8 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: fn @F(%x.param_patt: %empty_tuple.type, %y.param_patt: %empty_tuple.type) -> %empty_tuple.type { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %x.ref: %empty_tuple.type = name_ref x, %x -// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.fe6 [template = constants.%Add.type] -// CHECK:STDOUT: %Op.ref: %Op.assoc_type = name_ref Op, imports.%import_ref.6d9 [template = constants.%assoc0] +// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%Main.Add [template = constants.%Add.type] +// CHECK:STDOUT: %Op.ref: %Op.assoc_type = name_ref Op, imports.%Main.import_ref.6d9 [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %Op.type.31b = impl_witness_access constants.%impl_witness, element0 [template = constants.%Op.489] // CHECK:STDOUT: %Op.bound: = bound_method %x.ref, %impl.elem0 // CHECK:STDOUT: %y.ref: %empty_tuple.type = name_ref y, %y diff --git a/toolchain/check/testdata/impl/no_prelude/import_use_generic.carbon b/toolchain/check/testdata/impl/no_prelude/import_use_generic.carbon index f6c0f06cc7b0..4299c3e6df6f 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_use_generic.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_use_generic.carbon @@ -191,12 +191,12 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: %Self: %I.type = bind_symbolic_name Self, 0 [symbolic] // CHECK:STDOUT: %F.type.cf0: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type %I.type, %F.type.cf0 [template] -// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%import_ref.777 [template] -// CHECK:STDOUT: %impl_witness.681: = impl_witness (imports.%import_ref.e2c), @impl(%T) [symbolic] +// CHECK:STDOUT: %assoc0: %F.assoc_type = assoc_entity element0, imports.%Main.import_ref.777 [template] +// CHECK:STDOUT: %impl_witness.681: = impl_witness (imports.%Main.import_ref.e2c), @impl(%T) [symbolic] // CHECK:STDOUT: %F.type.40c: type = fn_type @F.2, @impl(%T) [symbolic] // CHECK:STDOUT: %F.071: %F.type.40c = struct_value () [symbolic] -// CHECK:STDOUT: %impl_witness.02b: = impl_witness (imports.%import_ref.e2c), @impl(%empty_struct_type) [template] -// CHECK:STDOUT: %impl_witness.bbe: = impl_witness (imports.%import_ref.c57), @impl(%T) [symbolic] +// CHECK:STDOUT: %impl_witness.02b: = impl_witness (imports.%Main.import_ref.e2c), @impl(%empty_struct_type) [template] +// CHECK:STDOUT: %impl_witness.bbe: = impl_witness (imports.%Main.import_ref.c57), @impl(%T) [symbolic] // CHECK:STDOUT: %F.type.4a4: type = fn_type @F.2, @impl(%empty_struct_type) [template] // CHECK:STDOUT: %F.9e6: %F.type.4a4 = struct_value () [template] // CHECK:STDOUT: %F.specific_fn: = specific_function %F.9e6, @F.2(%empty_struct_type) [template] @@ -205,23 +205,23 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Main//import_generic, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//import_generic, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//import_generic, loc4_20, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.4c0 = import_ref Main//import_generic, inst25 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//import_generic, inst31 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b5b: %F.assoc_type = import_ref Main//import_generic, loc7_9, loaded [template = constants.%assoc0] -// CHECK:STDOUT: %import_ref.8b9 = import_ref Main//import_generic, F, unloaded -// CHECK:STDOUT: %import_ref.d91: = import_ref Main//import_generic, loc10_34, loaded [symbolic = @impl.%impl_witness (constants.%impl_witness.bbe)] -// CHECK:STDOUT: %import_ref.499: type = import_ref Main//import_generic, loc10_27, loaded [symbolic = @impl.%C (constants.%C.f2e)] -// CHECK:STDOUT: %import_ref.301: type = import_ref Main//import_generic, loc10_32, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.e2c: @impl.%F.type (%F.type.40c) = import_ref Main//import_generic, loc11_10, loaded [symbolic = @impl.%F (constants.%F.071)] +// CHECK:STDOUT: %Main.C: %C.type = import_ref Main//import_generic, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Main.I: type = import_ref Main//import_generic, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//import_generic, loc4_20, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.4c0 = import_ref Main//import_generic, inst25 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e5d = import_ref Main//import_generic, inst31 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b5b: %F.assoc_type = import_ref Main//import_generic, loc7_9, loaded [template = constants.%assoc0] +// CHECK:STDOUT: %Main.F = import_ref Main//import_generic, F, unloaded +// CHECK:STDOUT: %Main.import_ref.d91: = import_ref Main//import_generic, loc10_34, loaded [symbolic = @impl.%impl_witness (constants.%impl_witness.bbe)] +// CHECK:STDOUT: %Main.import_ref.499: type = import_ref Main//import_generic, loc10_27, loaded [symbolic = @impl.%C (constants.%C.f2e)] +// CHECK:STDOUT: %Main.import_ref.301: type = import_ref Main//import_generic, loc10_32, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref.e2c: @impl.%F.type (%F.type.40c) = import_ref Main//import_generic, loc11_10, loaded [symbolic = @impl.%F (constants.%F.071)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .I = imports.%import_ref.df2 +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } @@ -232,7 +232,7 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C.7a7 = var c // CHECK:STDOUT: %.loc6_12.1: type = splice_block %C [template = constants.%C.7a7] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [template = constants.%C.generic] // CHECK:STDOUT: %.loc6_11: %empty_struct_type = struct_literal () // CHECK:STDOUT: %.loc6_12.2: type = converted %.loc6_11, constants.%empty_struct_type [template = constants.%empty_struct_type] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%empty_struct_type) [template = constants.%C.7a7] @@ -243,8 +243,8 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: %return.param_patt: = out_param_pattern %return.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %c.ref: ref %C.7a7 = name_ref c, file.%c -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df2 [template = constants.%I.type] -// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%import_ref.b5b [template = constants.%assoc0] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] +// CHECK:STDOUT: %F.ref: %F.assoc_type = name_ref F, imports.%Main.import_ref.b5b [template = constants.%assoc0] // CHECK:STDOUT: %impl.elem0: %F.type.cf0 = impl_witness_access constants.%impl_witness.02b, element0 [template = constants.%F.9e6] // CHECK:STDOUT: %F.specific_fn: = specific_function %impl.elem0, @F.2(constants.%empty_struct_type) [template = constants.%F.specific_fn] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.specific_fn() @@ -258,24 +258,24 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "import_generic.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d -// CHECK:STDOUT: .F = imports.%import_ref.b5b -// CHECK:STDOUT: witness = (imports.%import_ref.8b9) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.e5d +// CHECK:STDOUT: .F = imports.%Main.import_ref.b5b +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic impl @impl(constants.%T: type) [from "import_generic.carbon"] { // CHECK:STDOUT: %T: type = bind_symbolic_name T, 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %T.patt: type = symbolic_binding_pattern T, 0 [symbolic = %T.patt (constants.%T.patt)] // CHECK:STDOUT: %C: type = class_type @C, @C(%T) [symbolic = %C (constants.%C.f2e)] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.e2c), @impl(%T) [symbolic = %impl_witness (constants.%impl_witness.681)] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.e2c), @impl(%T) [symbolic = %impl_witness (constants.%impl_witness.681)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %F.type: type = fn_type @F.2, @impl(%T) [symbolic = %F.type (constants.%F.type.40c)] // CHECK:STDOUT: %F: @impl.%F.type (%F.type.40c) = struct_value () [symbolic = %F (constants.%F.071)] // CHECK:STDOUT: -// CHECK:STDOUT: impl: imports.%import_ref.499 as imports.%import_ref.301 { +// CHECK:STDOUT: impl: imports.%Main.import_ref.499 as imports.%Main.import_ref.301 { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.d91 +// CHECK:STDOUT: witness = imports.%Main.import_ref.d91 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -286,10 +286,10 @@ fn F() -> c.(I.F)() {} // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.4c0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.4c0 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon index a379bf39e249..7af6aeaa7c83 100644 --- a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon +++ b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon @@ -267,46 +267,46 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Op.type.036: type = fn_type @Op.1, @Action(%T) [symbolic] // CHECK:STDOUT: %Op.6ed: %Op.type.036 = struct_value () [symbolic] // CHECK:STDOUT: %Op.assoc_type.2ba: type = assoc_entity_type %Action.type.cca, %Op.type.036 [symbolic] -// CHECK:STDOUT: %assoc0.9b9b19.1: %Op.assoc_type.2ba = assoc_entity element0, imports.%import_ref.0e3753.1 [symbolic] +// CHECK:STDOUT: %assoc0.9b9b19.1: %Op.assoc_type.2ba = assoc_entity element0, imports.%Main.import_ref.0e3753.1 [symbolic] // CHECK:STDOUT: %Op.type.54d: type = fn_type @Op.1, @Action(%B) [template] // CHECK:STDOUT: %Op.dba: %Op.type.54d = struct_value () [template] // CHECK:STDOUT: %Op.assoc_type.e7a: type = assoc_entity_type %Action.type.cb0, %Op.type.54d [template] -// CHECK:STDOUT: %assoc0.b39: %Op.assoc_type.e7a = assoc_entity element0, imports.%import_ref.0e3753.2 [template] +// CHECK:STDOUT: %assoc0.b39: %Op.assoc_type.e7a = assoc_entity element0, imports.%Main.import_ref.0e3753.2 [template] // CHECK:STDOUT: %G.type: type = fn_type @G [template] // CHECK:STDOUT: %G: %G.type = struct_value () [template] -// CHECK:STDOUT: %assoc0.9b9b19.2: %Op.assoc_type.2ba = assoc_entity element0, imports.%import_ref.0e3753.3 [symbolic] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.d0b) [template] +// CHECK:STDOUT: %assoc0.9b9b19.2: %Op.assoc_type.2ba = assoc_entity element0, imports.%Main.import_ref.0e3753.3 [symbolic] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.d0b) [template] // CHECK:STDOUT: %Op.type.4b4: type = fn_type @Op.2 [template] // CHECK:STDOUT: %Op.40d: %Op.type.4b4 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.10a: %Action.type.29c = import_ref Main//action, Action, loaded [template = constants.%Action.generic] -// CHECK:STDOUT: %import_ref.e62: type = import_ref Main//action, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.dd8: type = import_ref Main//action, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//action, C, unloaded -// CHECK:STDOUT: %import_ref.bde = import_ref Main//action, F, unloaded -// CHECK:STDOUT: %import_ref.71c: = import_ref Main//action, loc12_21, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//action, loc9_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.54a = import_ref Main//action, inst46 [no loc], unloaded -// CHECK:STDOUT: %import_ref.ddc = import_ref Main//action, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.f86: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = import_ref Main//action, loc5_10, loaded [symbolic = @Action.%assoc0 (constants.%assoc0.9b9b19.2)] -// CHECK:STDOUT: %import_ref.ae2 = import_ref Main//action, Op, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//action, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.da3 = import_ref Main//action, inst41 [no loc], unloaded -// CHECK:STDOUT: %import_ref.984: type = import_ref Main//action, loc12_6, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.bb2: type = import_ref Main//action, loc12_19, loaded [template = constants.%Action.type.cb0] -// CHECK:STDOUT: %import_ref.7b5 = import_ref Main//action, loc13_11, unloaded -// CHECK:STDOUT: %import_ref.0e3753.1 = import_ref Main//action, loc5_10, unloaded +// CHECK:STDOUT: %Main.Action: %Action.type.29c = import_ref Main//action, Action, loaded [template = constants.%Action.generic] +// CHECK:STDOUT: %Main.A: type = import_ref Main//action, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: type = import_ref Main//action, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.C = import_ref Main//action, C, unloaded +// CHECK:STDOUT: %Main.F = import_ref Main//action, F, unloaded +// CHECK:STDOUT: %Main.import_ref.71c: = import_ref Main//action, loc12_21, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//action, loc9_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.54a = import_ref Main//action, inst46 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.ddc = import_ref Main//action, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.f86: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = import_ref Main//action, loc5_10, loaded [symbolic = @Action.%assoc0 (constants.%assoc0.9b9b19.2)] +// CHECK:STDOUT: %Main.Op = import_ref Main//action, Op, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//action, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.da3 = import_ref Main//action, inst41 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.984: type = import_ref Main//action, loc12_6, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.import_ref.bb2: type = import_ref Main//action, loc12_19, loaded [template = constants.%Action.type.cb0] +// CHECK:STDOUT: %Main.import_ref.7b5 = import_ref Main//action, loc13_11, unloaded +// CHECK:STDOUT: %Main.import_ref.0e3753.1 = import_ref Main//action, loc5_10, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Action = imports.%import_ref.10a -// CHECK:STDOUT: .A = imports.%import_ref.e62 -// CHECK:STDOUT: .B = imports.%import_ref.dd8 -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .Action = imports.%Main.Action +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import @@ -316,7 +316,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %a.param_patt: %A = value_param_pattern %a.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %A = value_param runtime_param0 -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.e62 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -331,34 +331,34 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Op.type: type = fn_type @Op.1, @Action(%T) [symbolic = %Op.type (constants.%Op.type.036)] // CHECK:STDOUT: %Op: @Action.%Op.type (%Op.type.036) = struct_value () [symbolic = %Op (constants.%Op.6ed)] // CHECK:STDOUT: %Op.assoc_type: type = assoc_entity_type @Action.%Action.type (%Action.type.cca), @Action.%Op.type (%Op.type.036) [symbolic = %Op.assoc_type (constants.%Op.assoc_type.2ba)] -// CHECK:STDOUT: %assoc0: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = assoc_entity element0, imports.%import_ref.0e3753.1 [symbolic = %assoc0 (constants.%assoc0.9b9b19.1)] +// CHECK:STDOUT: %assoc0: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = assoc_entity element0, imports.%Main.import_ref.0e3753.1 [symbolic = %assoc0 (constants.%assoc0.9b9b19.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ddc -// CHECK:STDOUT: .Op = imports.%import_ref.f86 -// CHECK:STDOUT: witness = (imports.%import_ref.ae2) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.ddc +// CHECK:STDOUT: .Op = imports.%Main.import_ref.f86 +// CHECK:STDOUT: witness = (imports.%Main.Op) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.984 as imports.%import_ref.bb2 [from "action.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.984 as imports.%Main.import_ref.bb2 [from "action.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Op = imports.%import_ref.7b5 -// CHECK:STDOUT: witness = imports.%import_ref.71c +// CHECK:STDOUT: .Op = imports.%Main.import_ref.7b5 +// CHECK:STDOUT: witness = imports.%Main.import_ref.71c // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B [from "action.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.54a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.54a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "action.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.da3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.da3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.1(constants.%T: type, constants.%Self: %Action.type.cca) [from "action.carbon"] { @@ -369,10 +369,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: fn @G(%a.param_patt: %A) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a -// CHECK:STDOUT: %Action.ref: %Action.type.29c = name_ref Action, imports.%import_ref.10a [template = constants.%Action.generic] -// CHECK:STDOUT: %B.ref: type = name_ref B, imports.%import_ref.dd8 [template = constants.%B] +// CHECK:STDOUT: %Action.ref: %Action.type.29c = name_ref Action, imports.%Main.Action [template = constants.%Action.generic] +// CHECK:STDOUT: %B.ref: type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %Action.type: type = facet_type <@Action, @Action(constants.%B)> [template = constants.%Action.type.cb0] -// CHECK:STDOUT: %.loc4: %Op.assoc_type.e7a = specific_constant imports.%import_ref.f86, @Action(constants.%B) [template = constants.%assoc0.b39] +// CHECK:STDOUT: %.loc4: %Op.assoc_type.e7a = specific_constant imports.%Main.import_ref.f86, @Action(constants.%B) [template = constants.%assoc0.b39] // CHECK:STDOUT: %Op.ref: %Op.assoc_type.e7a = name_ref Op, %.loc4 [template = constants.%assoc0.b39] // CHECK:STDOUT: %impl.elem0: %Op.type.54d = impl_witness_access constants.%impl_witness, element0 [template = constants.%Op.40d] // CHECK:STDOUT: %Op.call: init %empty_tuple.type = call %impl.elem0() @@ -420,11 +420,11 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Op.type.036: type = fn_type @Op, @Action(%T) [symbolic] // CHECK:STDOUT: %Op.6ed: %Op.type.036 = struct_value () [symbolic] // CHECK:STDOUT: %Op.assoc_type.2ba: type = assoc_entity_type %Action.type.cca, %Op.type.036 [symbolic] -// CHECK:STDOUT: %assoc0.9b9b19.1: %Op.assoc_type.2ba = assoc_entity element0, imports.%import_ref.0e3753.1 [symbolic] +// CHECK:STDOUT: %assoc0.9b9b19.1: %Op.assoc_type.2ba = assoc_entity element0, imports.%Main.import_ref.0e3753.1 [symbolic] // CHECK:STDOUT: %Op.type.54d: type = fn_type @Op, @Action(%B) [template] // CHECK:STDOUT: %Op.dba: %Op.type.54d = struct_value () [template] // CHECK:STDOUT: %Op.assoc_type.e7a: type = assoc_entity_type %Action.type.cb0, %Op.type.54d [template] -// CHECK:STDOUT: %assoc0.b39: %Op.assoc_type.e7a = assoc_entity element0, imports.%import_ref.0e3753.2 [template] +// CHECK:STDOUT: %assoc0.b39: %Op.assoc_type.e7a = assoc_entity element0, imports.%Main.import_ref.0e3753.2 [template] // CHECK:STDOUT: %G.type: type = fn_type @G [template] // CHECK:STDOUT: %G: %G.type = struct_value () [template] // CHECK:STDOUT: %C: type = class_type @C [template] @@ -432,39 +432,39 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Op.type.5ad: type = fn_type @Op, @Action(%C) [template] // CHECK:STDOUT: %Op.b10: %Op.type.5ad = struct_value () [template] // CHECK:STDOUT: %Op.assoc_type.17b: type = assoc_entity_type %Action.type.e2b, %Op.type.5ad [template] -// CHECK:STDOUT: %assoc0.ccd: %Op.assoc_type.17b = assoc_entity element0, imports.%import_ref.0e3753.1 [template] -// CHECK:STDOUT: %assoc0.9b9b19.2: %Op.assoc_type.2ba = assoc_entity element0, imports.%import_ref.0e3753.3 [symbolic] +// CHECK:STDOUT: %assoc0.ccd: %Op.assoc_type.17b = assoc_entity element0, imports.%Main.import_ref.0e3753.1 [template] +// CHECK:STDOUT: %assoc0.9b9b19.2: %Op.assoc_type.2ba = assoc_entity element0, imports.%Main.import_ref.0e3753.3 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.10a: %Action.type.29c = import_ref Main//action, Action, loaded [template = constants.%Action.generic] -// CHECK:STDOUT: %import_ref.e62: type = import_ref Main//action, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.81b = import_ref Main//action, B, unloaded -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//action, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.bde = import_ref Main//action, F, unloaded -// CHECK:STDOUT: %import_ref.7a1 = import_ref Main//action, loc12_21, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//action, loc9_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.54a = import_ref Main//action, inst46 [no loc], unloaded -// CHECK:STDOUT: %import_ref.ddc = import_ref Main//action, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.f86: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = import_ref Main//action, loc5_10, loaded [symbolic = @Action.%assoc0 (constants.%assoc0.9b9b19.2)] -// CHECK:STDOUT: %import_ref.ae2 = import_ref Main//action, Op, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//action, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.da3 = import_ref Main//action, inst41 [no loc], unloaded -// CHECK:STDOUT: %import_ref.984: type = import_ref Main//action, loc12_6, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.bb2: type = import_ref Main//action, loc12_19, loaded [template = constants.%Action.type.cb0] -// CHECK:STDOUT: %import_ref.7b5 = import_ref Main//action, loc13_11, unloaded -// CHECK:STDOUT: %import_ref.0e3753.1 = import_ref Main//action, loc5_10, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.3: = import_ref Main//action, loc10_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//action, inst49 [no loc], unloaded +// CHECK:STDOUT: %Main.Action: %Action.type.29c = import_ref Main//action, Action, loaded [template = constants.%Action.generic] +// CHECK:STDOUT: %Main.A: type = import_ref Main//action, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B = import_ref Main//action, B, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//action, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.F = import_ref Main//action, F, unloaded +// CHECK:STDOUT: %Main.import_ref.7a1 = import_ref Main//action, loc12_21, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//action, loc9_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.54a = import_ref Main//action, inst46 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.ddc = import_ref Main//action, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.f86: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = import_ref Main//action, loc5_10, loaded [symbolic = @Action.%assoc0 (constants.%assoc0.9b9b19.2)] +// CHECK:STDOUT: %Main.Op = import_ref Main//action, Op, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//action, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.da3 = import_ref Main//action, inst41 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.984: type = import_ref Main//action, loc12_6, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.import_ref.bb2: type = import_ref Main//action, loc12_19, loaded [template = constants.%Action.type.cb0] +// CHECK:STDOUT: %Main.import_ref.7b5 = import_ref Main//action, loc13_11, unloaded +// CHECK:STDOUT: %Main.import_ref.0e3753.1 = import_ref Main//action, loc5_10, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.3: = import_ref Main//action, loc10_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//action, inst49 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Action = imports.%import_ref.10a -// CHECK:STDOUT: .A = imports.%import_ref.e62 -// CHECK:STDOUT: .B = imports.%import_ref.81b -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .Action = imports.%Main.Action +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .F = imports.%Main.F // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import @@ -474,7 +474,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %a.param_patt: %A = value_param_pattern %a.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %A = value_param runtime_param0 -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.e62 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -489,41 +489,41 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Op.type: type = fn_type @Op, @Action(%T) [symbolic = %Op.type (constants.%Op.type.036)] // CHECK:STDOUT: %Op: @Action.%Op.type (%Op.type.036) = struct_value () [symbolic = %Op (constants.%Op.6ed)] // CHECK:STDOUT: %Op.assoc_type: type = assoc_entity_type @Action.%Action.type (%Action.type.cca), @Action.%Op.type (%Op.type.036) [symbolic = %Op.assoc_type (constants.%Op.assoc_type.2ba)] -// CHECK:STDOUT: %assoc0: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = assoc_entity element0, imports.%import_ref.0e3753.1 [symbolic = %assoc0 (constants.%assoc0.9b9b19.1)] +// CHECK:STDOUT: %assoc0: @Action.%Op.assoc_type (%Op.assoc_type.2ba) = assoc_entity element0, imports.%Main.import_ref.0e3753.1 [symbolic = %assoc0 (constants.%assoc0.9b9b19.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ddc -// CHECK:STDOUT: .Op = imports.%import_ref.f86 -// CHECK:STDOUT: witness = (imports.%import_ref.ae2) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.ddc +// CHECK:STDOUT: .Op = imports.%Main.import_ref.f86 +// CHECK:STDOUT: witness = (imports.%Main.Op) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.984 as imports.%import_ref.bb2 [from "action.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.984 as imports.%Main.import_ref.bb2 [from "action.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Op = imports.%import_ref.7b5 -// CHECK:STDOUT: witness = imports.%import_ref.7a1 +// CHECK:STDOUT: .Op = imports.%Main.import_ref.7b5 +// CHECK:STDOUT: witness = imports.%Main.import_ref.7a1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B [from "action.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.54a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.54a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "action.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.da3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.da3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "action.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op(constants.%T: type, constants.%Self: %Action.type.cca) [from "action.carbon"] { @@ -534,10 +534,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: fn @G(%a.param_patt: %A) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a -// CHECK:STDOUT: %Action.ref: %Action.type.29c = name_ref Action, imports.%import_ref.10a [template = constants.%Action.generic] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %Action.ref: %Action.type.29c = name_ref Action, imports.%Main.Action [template = constants.%Action.generic] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %Action.type: type = facet_type <@Action, @Action(constants.%C)> [template = constants.%Action.type.e2b] -// CHECK:STDOUT: %.loc8: %Op.assoc_type.17b = specific_constant imports.%import_ref.f86, @Action(constants.%C) [template = constants.%assoc0.ccd] +// CHECK:STDOUT: %.loc8: %Op.assoc_type.17b = specific_constant imports.%Main.import_ref.f86, @Action(constants.%C) [template = constants.%assoc0.ccd] // CHECK:STDOUT: %Op.ref: %Op.assoc_type.17b = name_ref Op, %.loc8 [template = constants.%assoc0.ccd] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -744,42 +744,42 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Make.type.598: type = fn_type @Make.1, @Factory(%T) [symbolic] // CHECK:STDOUT: %Make.737: %Make.type.598 = struct_value () [symbolic] // CHECK:STDOUT: %Make.assoc_type.4d9: type = assoc_entity_type %Factory.type.c96, %Make.type.598 [symbolic] -// CHECK:STDOUT: %assoc0.9270f3.1: %Make.assoc_type.4d9 = assoc_entity element0, imports.%import_ref.21018a.1 [symbolic] +// CHECK:STDOUT: %assoc0.9270f3.1: %Make.assoc_type.4d9 = assoc_entity element0, imports.%Main.import_ref.21018a.1 [symbolic] // CHECK:STDOUT: %Make.type.c59: type = fn_type @Make.1, @Factory(%B) [template] // CHECK:STDOUT: %Make.efe: %Make.type.c59 = struct_value () [template] // CHECK:STDOUT: %Make.assoc_type.6c6: type = assoc_entity_type %Factory.type.a5d, %Make.type.c59 [template] -// CHECK:STDOUT: %assoc0.c38: %Make.assoc_type.6c6 = assoc_entity element0, imports.%import_ref.21018a.2 [template] +// CHECK:STDOUT: %assoc0.c38: %Make.assoc_type.6c6 = assoc_entity element0, imports.%Main.import_ref.21018a.2 [template] // CHECK:STDOUT: %MakeB.type: type = fn_type @MakeB [template] // CHECK:STDOUT: %MakeB: %MakeB.type = struct_value () [template] -// CHECK:STDOUT: %assoc0.9270f3.2: %Make.assoc_type.4d9 = assoc_entity element0, imports.%import_ref.21018a.3 [symbolic] -// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%import_ref.9ec) [template] +// CHECK:STDOUT: %assoc0.9270f3.2: %Make.assoc_type.4d9 = assoc_entity element0, imports.%Main.import_ref.21018a.3 [symbolic] +// CHECK:STDOUT: %impl_witness: = impl_witness (imports.%Main.import_ref.9ec) [template] // CHECK:STDOUT: %Make.type.ec4: type = fn_type @Make.2 [template] // CHECK:STDOUT: %Make.377: %Make.type.ec4 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.e3d: %Factory.type.1a8 = import_ref Main//factory, Factory, loaded [template = constants.%Factory.generic] -// CHECK:STDOUT: %import_ref.e62: type = import_ref Main//factory, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.dd8: type = import_ref Main//factory, B, loaded [template = constants.%B] -// CHECK:STDOUT: %import_ref.72b: = import_ref Main//factory, loc11_22, loaded [template = constants.%impl_witness] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//factory, loc9_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.54a = import_ref Main//factory, inst52 [no loc], unloaded -// CHECK:STDOUT: %import_ref.fbb = import_ref Main//factory, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b0a: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = import_ref Main//factory, loc5_17, loaded [symbolic = @Factory.%assoc0 (constants.%assoc0.9270f3.2)] -// CHECK:STDOUT: %import_ref.c20 = import_ref Main//factory, Make, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//factory, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.da3 = import_ref Main//factory, inst47 [no loc], unloaded -// CHECK:STDOUT: %import_ref.984: type = import_ref Main//factory, loc11_6, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.bd2: type = import_ref Main//factory, loc11_20, loaded [template = constants.%Factory.type.a5d] -// CHECK:STDOUT: %import_ref.a27 = import_ref Main//factory, loc12_17, unloaded -// CHECK:STDOUT: %import_ref.21018a.1 = import_ref Main//factory, loc5_17, unloaded +// CHECK:STDOUT: %Main.Factory: %Factory.type.1a8 = import_ref Main//factory, Factory, loaded [template = constants.%Factory.generic] +// CHECK:STDOUT: %Main.A: type = import_ref Main//factory, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B: type = import_ref Main//factory, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Main.import_ref.72b: = import_ref Main//factory, loc11_22, loaded [template = constants.%impl_witness] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//factory, loc9_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.54a = import_ref Main//factory, inst52 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.fbb = import_ref Main//factory, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b0a: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = import_ref Main//factory, loc5_17, loaded [symbolic = @Factory.%assoc0 (constants.%assoc0.9270f3.2)] +// CHECK:STDOUT: %Main.Make = import_ref Main//factory, Make, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//factory, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.da3 = import_ref Main//factory, inst47 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.984: type = import_ref Main//factory, loc11_6, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.import_ref.bd2: type = import_ref Main//factory, loc11_20, loaded [template = constants.%Factory.type.a5d] +// CHECK:STDOUT: %Main.import_ref.a27 = import_ref Main//factory, loc12_17, unloaded +// CHECK:STDOUT: %Main.import_ref.21018a.1 = import_ref Main//factory, loc5_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Factory = imports.%import_ref.e3d -// CHECK:STDOUT: .A = imports.%import_ref.e62 -// CHECK:STDOUT: .B = imports.%import_ref.dd8 +// CHECK:STDOUT: .Factory = imports.%Main.Factory +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: .MakeB = %MakeB.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import @@ -790,9 +790,9 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %return.patt: %B = return_slot_pattern // CHECK:STDOUT: %return.param_patt: %B = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { -// CHECK:STDOUT: %B.ref.loc4: type = name_ref B, imports.%import_ref.dd8 [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc4: type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %a.param: %A = value_param runtime_param0 -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.e62 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: %return.param: ref %B = out_param runtime_param1 // CHECK:STDOUT: %return: ref %B = return_slot %return.param @@ -809,34 +809,34 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Make.type: type = fn_type @Make.1, @Factory(%T) [symbolic = %Make.type (constants.%Make.type.598)] // CHECK:STDOUT: %Make: @Factory.%Make.type (%Make.type.598) = struct_value () [symbolic = %Make (constants.%Make.737)] // CHECK:STDOUT: %Make.assoc_type: type = assoc_entity_type @Factory.%Factory.type (%Factory.type.c96), @Factory.%Make.type (%Make.type.598) [symbolic = %Make.assoc_type (constants.%Make.assoc_type.4d9)] -// CHECK:STDOUT: %assoc0: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = assoc_entity element0, imports.%import_ref.21018a.1 [symbolic = %assoc0 (constants.%assoc0.9270f3.1)] +// CHECK:STDOUT: %assoc0: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = assoc_entity element0, imports.%Main.import_ref.21018a.1 [symbolic = %assoc0 (constants.%assoc0.9270f3.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.fbb -// CHECK:STDOUT: .Make = imports.%import_ref.b0a -// CHECK:STDOUT: witness = (imports.%import_ref.c20) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.fbb +// CHECK:STDOUT: .Make = imports.%Main.import_ref.b0a +// CHECK:STDOUT: witness = (imports.%Main.Make) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.984 as imports.%import_ref.bd2 [from "factory.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.984 as imports.%Main.import_ref.bd2 [from "factory.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Make = imports.%import_ref.a27 -// CHECK:STDOUT: witness = imports.%import_ref.72b +// CHECK:STDOUT: .Make = imports.%Main.import_ref.a27 +// CHECK:STDOUT: witness = imports.%Main.import_ref.72b // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B [from "factory.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.54a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.54a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "factory.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.da3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.da3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Make.1(constants.%T: type, constants.%Self: %Factory.type.c96) [from "factory.carbon"] { @@ -848,10 +848,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: fn @MakeB(%a.param_patt: %A) -> %return.param_patt: %B { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a -// CHECK:STDOUT: %Factory.ref: %Factory.type.1a8 = name_ref Factory, imports.%import_ref.e3d [template = constants.%Factory.generic] -// CHECK:STDOUT: %B.ref.loc5: type = name_ref B, imports.%import_ref.dd8 [template = constants.%B] +// CHECK:STDOUT: %Factory.ref: %Factory.type.1a8 = name_ref Factory, imports.%Main.Factory [template = constants.%Factory.generic] +// CHECK:STDOUT: %B.ref.loc5: type = name_ref B, imports.%Main.B [template = constants.%B] // CHECK:STDOUT: %Factory.type: type = facet_type <@Factory, @Factory(constants.%B)> [template = constants.%Factory.type.a5d] -// CHECK:STDOUT: %.loc5: %Make.assoc_type.6c6 = specific_constant imports.%import_ref.b0a, @Factory(constants.%B) [template = constants.%assoc0.c38] +// CHECK:STDOUT: %.loc5: %Make.assoc_type.6c6 = specific_constant imports.%Main.import_ref.b0a, @Factory(constants.%B) [template = constants.%assoc0.c38] // CHECK:STDOUT: %Make.ref: %Make.assoc_type.6c6 = name_ref Make, %.loc5 [template = constants.%assoc0.c38] // CHECK:STDOUT: %impl.elem0: %Make.type.c59 = impl_witness_access constants.%impl_witness, element0 [template = constants.%Make.377] // CHECK:STDOUT: %.loc4: ref %B = splice_block %return {} @@ -902,11 +902,11 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Make.type.598: type = fn_type @Make, @Factory(%T) [symbolic] // CHECK:STDOUT: %Make.737: %Make.type.598 = struct_value () [symbolic] // CHECK:STDOUT: %Make.assoc_type.4d9: type = assoc_entity_type %Factory.type.c96, %Make.type.598 [symbolic] -// CHECK:STDOUT: %assoc0.9270f3.1: %Make.assoc_type.4d9 = assoc_entity element0, imports.%import_ref.21018a.1 [symbolic] +// CHECK:STDOUT: %assoc0.9270f3.1: %Make.assoc_type.4d9 = assoc_entity element0, imports.%Main.import_ref.21018a.1 [symbolic] // CHECK:STDOUT: %Make.type.c59: type = fn_type @Make, @Factory(%B) [template] // CHECK:STDOUT: %Make.efe: %Make.type.c59 = struct_value () [template] // CHECK:STDOUT: %Make.assoc_type.6c6: type = assoc_entity_type %Factory.type.a5d, %Make.type.c59 [template] -// CHECK:STDOUT: %assoc0.c38: %Make.assoc_type.6c6 = assoc_entity element0, imports.%import_ref.21018a.2 [template] +// CHECK:STDOUT: %assoc0.c38: %Make.assoc_type.6c6 = assoc_entity element0, imports.%Main.import_ref.21018a.2 [template] // CHECK:STDOUT: %C: type = class_type @C [template] // CHECK:STDOUT: %MakeC.type: type = fn_type @MakeC [template] // CHECK:STDOUT: %MakeC: %MakeC.type = struct_value () [template] @@ -914,33 +914,33 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Make.type.0de: type = fn_type @Make, @Factory(%C) [template] // CHECK:STDOUT: %Make.8ba: %Make.type.0de = struct_value () [template] // CHECK:STDOUT: %Make.assoc_type.2ea: type = assoc_entity_type %Factory.type.5c5, %Make.type.0de [template] -// CHECK:STDOUT: %assoc0.9a3: %Make.assoc_type.2ea = assoc_entity element0, imports.%import_ref.21018a.1 [template] -// CHECK:STDOUT: %assoc0.9270f3.2: %Make.assoc_type.4d9 = assoc_entity element0, imports.%import_ref.21018a.3 [symbolic] +// CHECK:STDOUT: %assoc0.9a3: %Make.assoc_type.2ea = assoc_entity element0, imports.%Main.import_ref.21018a.1 [template] +// CHECK:STDOUT: %assoc0.9270f3.2: %Make.assoc_type.4d9 = assoc_entity element0, imports.%Main.import_ref.21018a.3 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.e3d: %Factory.type.1a8 = import_ref Main//factory, Factory, loaded [template = constants.%Factory.generic] -// CHECK:STDOUT: %import_ref.e62: type = import_ref Main//factory, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.81b = import_ref Main//factory, B, unloaded -// CHECK:STDOUT: %import_ref.3e9 = import_ref Main//factory, loc11_22, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//factory, loc9_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.54a = import_ref Main//factory, inst52 [no loc], unloaded -// CHECK:STDOUT: %import_ref.fbb = import_ref Main//factory, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.b0a: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = import_ref Main//factory, loc5_17, loaded [symbolic = @Factory.%assoc0 (constants.%assoc0.9270f3.2)] -// CHECK:STDOUT: %import_ref.c20 = import_ref Main//factory, Make, unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//factory, loc8_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.da3 = import_ref Main//factory, inst47 [no loc], unloaded -// CHECK:STDOUT: %import_ref.984: type = import_ref Main//factory, loc11_6, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.bd2: type = import_ref Main//factory, loc11_20, loaded [template = constants.%Factory.type.a5d] -// CHECK:STDOUT: %import_ref.a27 = import_ref Main//factory, loc12_17, unloaded -// CHECK:STDOUT: %import_ref.21018a.1 = import_ref Main//factory, loc5_17, unloaded +// CHECK:STDOUT: %Main.Factory: %Factory.type.1a8 = import_ref Main//factory, Factory, loaded [template = constants.%Factory.generic] +// CHECK:STDOUT: %Main.A: type = import_ref Main//factory, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.B = import_ref Main//factory, B, unloaded +// CHECK:STDOUT: %Main.import_ref.3e9 = import_ref Main//factory, loc11_22, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//factory, loc9_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.54a = import_ref Main//factory, inst52 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.fbb = import_ref Main//factory, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.b0a: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = import_ref Main//factory, loc5_17, loaded [symbolic = @Factory.%assoc0 (constants.%assoc0.9270f3.2)] +// CHECK:STDOUT: %Main.Make = import_ref Main//factory, Make, unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//factory, loc8_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.da3 = import_ref Main//factory, inst47 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.984: type = import_ref Main//factory, loc11_6, loaded [template = constants.%A] +// CHECK:STDOUT: %Main.import_ref.bd2: type = import_ref Main//factory, loc11_20, loaded [template = constants.%Factory.type.a5d] +// CHECK:STDOUT: %Main.import_ref.a27 = import_ref Main//factory, loc12_17, unloaded +// CHECK:STDOUT: %Main.import_ref.21018a.1 = import_ref Main//factory, loc5_17, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Factory = imports.%import_ref.e3d -// CHECK:STDOUT: .A = imports.%import_ref.e62 -// CHECK:STDOUT: .B = imports.%import_ref.81b +// CHECK:STDOUT: .Factory = imports.%Main.Factory +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .MakeC = %MakeC.decl // CHECK:STDOUT: } @@ -955,7 +955,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: } { // CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %a.param: %A = value_param runtime_param0 -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.e62 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A] // CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: %return.param: ref %C = out_param runtime_param1 // CHECK:STDOUT: %return: ref %C = return_slot %return.param @@ -972,34 +972,34 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %Make.type: type = fn_type @Make, @Factory(%T) [symbolic = %Make.type (constants.%Make.type.598)] // CHECK:STDOUT: %Make: @Factory.%Make.type (%Make.type.598) = struct_value () [symbolic = %Make (constants.%Make.737)] // CHECK:STDOUT: %Make.assoc_type: type = assoc_entity_type @Factory.%Factory.type (%Factory.type.c96), @Factory.%Make.type (%Make.type.598) [symbolic = %Make.assoc_type (constants.%Make.assoc_type.4d9)] -// CHECK:STDOUT: %assoc0: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = assoc_entity element0, imports.%import_ref.21018a.1 [symbolic = %assoc0 (constants.%assoc0.9270f3.1)] +// CHECK:STDOUT: %assoc0: @Factory.%Make.assoc_type (%Make.assoc_type.4d9) = assoc_entity element0, imports.%Main.import_ref.21018a.1 [symbolic = %assoc0 (constants.%assoc0.9270f3.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.fbb -// CHECK:STDOUT: .Make = imports.%import_ref.b0a -// CHECK:STDOUT: witness = (imports.%import_ref.c20) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.fbb +// CHECK:STDOUT: .Make = imports.%Main.import_ref.b0a +// CHECK:STDOUT: witness = (imports.%Main.Make) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.984 as imports.%import_ref.bd2 [from "factory.carbon"] { +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.984 as imports.%Main.import_ref.bd2 [from "factory.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Make = imports.%import_ref.a27 -// CHECK:STDOUT: witness = imports.%import_ref.3e9 +// CHECK:STDOUT: .Make = imports.%Main.import_ref.a27 +// CHECK:STDOUT: witness = imports.%Main.import_ref.3e9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B [from "factory.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.54a +// CHECK:STDOUT: .Self = imports.%Main.import_ref.54a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "factory.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.da3 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.da3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { @@ -1019,10 +1019,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: fn @MakeC(%a.param_patt: %A) -> %return.param_patt: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a -// CHECK:STDOUT: %Factory.ref: %Factory.type.1a8 = name_ref Factory, imports.%import_ref.e3d [template = constants.%Factory.generic] +// CHECK:STDOUT: %Factory.ref: %Factory.type.1a8 = name_ref Factory, imports.%Main.Factory [template = constants.%Factory.generic] // CHECK:STDOUT: %C.ref.loc11: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Factory.type: type = facet_type <@Factory, @Factory(constants.%C)> [template = constants.%Factory.type.5c5] -// CHECK:STDOUT: %.loc11: %Make.assoc_type.2ea = specific_constant imports.%import_ref.b0a, @Factory(constants.%C) [template = constants.%assoc0.9a3] +// CHECK:STDOUT: %.loc11: %Make.assoc_type.2ea = specific_constant imports.%Main.import_ref.b0a, @Factory(constants.%C) [template = constants.%assoc0.9a3] // CHECK:STDOUT: %Make.ref: %Make.assoc_type.2ea = name_ref Make, %.loc11 [template = constants.%assoc0.9a3] // CHECK:STDOUT: return to %return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/no_prelude/no_definition_in_impl_file.carbon b/toolchain/check/testdata/impl/no_prelude/no_definition_in_impl_file.carbon index 66a70b472160..ca6ddef67179 100644 --- a/toolchain/check/testdata/impl/no_prelude/no_definition_in_impl_file.carbon +++ b/toolchain/check/testdata/impl/no_prelude/no_definition_in_impl_file.carbon @@ -141,39 +141,39 @@ impl () as D; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.14d: type = import_ref Main//decl_in_api_definition_in_impl, A, loaded [template = constants.%A.type] -// CHECK:STDOUT: %import_ref.b61 = import_ref Main//decl_in_api_definition_in_impl, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e5c: type = import_ref Main//decl_in_api_definition_in_impl, loc10_7, loaded [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %import_ref.831: type = import_ref Main//decl_in_api_definition_in_impl, loc10_12, loaded [template = constants.%A.type] +// CHECK:STDOUT: %Main.A: type = import_ref Main//decl_in_api_definition_in_impl, A, loaded [template = constants.%A.type] +// CHECK:STDOUT: %Main.import_ref.b61 = import_ref Main//decl_in_api_definition_in_impl, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e5c: type = import_ref Main//decl_in_api_definition_in_impl, loc10_7, loaded [template = constants.%empty_tuple.type] +// CHECK:STDOUT: %Main.import_ref.831: type = import_ref Main//decl_in_api_definition_in_impl, loc10_12, loaded [template = constants.%A.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.14d +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %.loc8_7.1: %empty_tuple.type = tuple_literal () // CHECK:STDOUT: %.loc8_7.2: type = converted %.loc8_7.1, constants.%empty_tuple.type [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.14d [template = constants.%A.type] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc8: = impl_witness () [template = constants.%impl_witness] // CHECK:STDOUT: impl_decl @impl.3 [template] {} { // CHECK:STDOUT: %.loc14_7.1: %empty_tuple.type = tuple_literal () // CHECK:STDOUT: %.loc14_7.2: type = converted %.loc14_7.1, constants.%empty_tuple.type [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.14d [template = constants.%A.type] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Main.A [template = constants.%A.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc14: = impl_witness () [template = constants.%impl_witness] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @A [from "fail_decl_in_api_definition_in_impl.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.b61 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.b61 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.e5c as imports.%import_ref.831 [from "fail_decl_in_api_definition_in_impl.carbon"]; +// CHECK:STDOUT: impl @impl.1: imports.%Main.import_ref.e5c as imports.%Main.import_ref.831 [from "fail_decl_in_api_definition_in_impl.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %.loc8_7.2 as %A.ref; // CHECK:STDOUT: @@ -191,12 +191,12 @@ impl () as D; // CHECK:STDOUT: --- use_decl_in_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//decl_in_api_definition_in_impl, A, unloaded +// CHECK:STDOUT: %Main.A = import_ref Main//decl_in_api_definition_in_impl, A, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -242,15 +242,15 @@ impl () as D; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.8b9 = import_ref Main//decl_only_in_api, B, unloaded -// CHECK:STDOUT: %import_ref.420 = import_ref Main//decl_only_in_api, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e5c: type = import_ref Main//decl_only_in_api, loc10_7, loaded [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %import_ref.171: type = import_ref Main//decl_only_in_api, loc10_12, loaded [template = constants.%B.type] +// CHECK:STDOUT: %Main.B = import_ref Main//decl_only_in_api, B, unloaded +// CHECK:STDOUT: %Main.import_ref.420 = import_ref Main//decl_only_in_api, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e5c: type = import_ref Main//decl_only_in_api, loc10_7, loaded [template = constants.%empty_tuple.type] +// CHECK:STDOUT: %Main.import_ref.171: type = import_ref Main//decl_only_in_api, loc10_12, loaded [template = constants.%B.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .B = imports.%import_ref.8b9 +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -258,11 +258,11 @@ impl () as D; // CHECK:STDOUT: // CHECK:STDOUT: interface @B [from "fail_decl_only_in_api.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.420 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.420 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.e5c as imports.%import_ref.171 [from "fail_decl_only_in_api.carbon"]; +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.e5c as imports.%Main.import_ref.171 [from "fail_decl_only_in_api.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: --- fail_decl_in_api_decl_in_impl.carbon // CHECK:STDOUT: @@ -305,33 +305,33 @@ impl () as D; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.6be: type = import_ref Main//decl_in_api_decl_in_impl, C, loaded [template = constants.%C.type] -// CHECK:STDOUT: %import_ref.721 = import_ref Main//decl_in_api_decl_in_impl, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e5c: type = import_ref Main//decl_in_api_decl_in_impl, loc10_7, loaded [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %import_ref.653: type = import_ref Main//decl_in_api_decl_in_impl, loc10_12, loaded [template = constants.%C.type] +// CHECK:STDOUT: %Main.C: type = import_ref Main//decl_in_api_decl_in_impl, C, loaded [template = constants.%C.type] +// CHECK:STDOUT: %Main.import_ref.721 = import_ref Main//decl_in_api_decl_in_impl, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e5c: type = import_ref Main//decl_in_api_decl_in_impl, loc10_7, loaded [template = constants.%empty_tuple.type] +// CHECK:STDOUT: %Main.import_ref.653: type = import_ref Main//decl_in_api_decl_in_impl, loc10_12, loaded [template = constants.%C.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.6be +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %.loc8_7.1: %empty_tuple.type = tuple_literal () // CHECK:STDOUT: %.loc8_7.2: type = converted %.loc8_7.1, constants.%empty_tuple.type [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.6be [template = constants.%C.type] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness () [template = constants.%impl_witness] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @C [from "fail_decl_in_api_decl_in_impl.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.721 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.721 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.e5c as imports.%import_ref.653 [from "fail_decl_in_api_decl_in_impl.carbon"]; +// CHECK:STDOUT: impl @impl.1: imports.%Main.import_ref.e5c as imports.%Main.import_ref.653 [from "fail_decl_in_api_decl_in_impl.carbon"]; // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %.loc8_7.2 as %C.ref; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/redeclaration.carbon b/toolchain/check/testdata/impl/redeclaration.carbon index dc32e633855c..c5d122177c92 100644 --- a/toolchain/check/testdata/impl/redeclaration.carbon +++ b/toolchain/check/testdata/impl/redeclaration.carbon @@ -33,7 +33,7 @@ impl i32 as I {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index 9154df6ff8cf..e55e2f6ce7b5 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -25,7 +25,7 @@ var d: i32 = a[b]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -46,8 +46,8 @@ var d: i32 = a[b]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index da39a9125a8b..c666fd99ff51 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -44,7 +44,7 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -71,8 +71,8 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index d063921b2f5a..a23c8ff5efac 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -33,7 +33,7 @@ var c: i32 = a[0x7FFF_FFFF]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -51,8 +51,8 @@ var c: i32 = a[0x7FFF_FFFF]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index c7ac0a347d18..13d37ef00728 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -29,7 +29,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_12.6a3, %Convert.956 [template] @@ -41,8 +41,8 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index e7626c688c1c..1efabd632a76 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -26,7 +26,7 @@ var b: i32 = a[1]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -40,8 +40,8 @@ var b: i32 = a[1]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 1653206dca3f..0d38136f9fc6 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -51,7 +51,7 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: %ptr.235: type = ptr_type %i32 [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -65,8 +65,8 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index 56da42b55376..3255224f5b64 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -51,8 +51,8 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .IndexWith = %import_ref.671 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .IndexWith = %Core.IndexWith // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 605e588e8f7d..ef18ebcfe8e4 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -28,7 +28,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_negative_indexing.carbon b/toolchain/check/testdata/index/fail_negative_indexing.carbon index 8c82fca8da58..754fb09676bb 100644 --- a/toolchain/check/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/index/fail_negative_indexing.carbon @@ -27,7 +27,7 @@ var d: i32 = c[-10]; // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.132: = bound_method %int_42.20e, %Convert.956 [template] @@ -37,7 +37,7 @@ var d: i32 = c[-10]; // CHECK:STDOUT: %array: %array_type = tuple_value (%int_42.c68, %int_42.c68) [template] // CHECK:STDOUT: %int_10: Core.IntLiteral = int_value 10 [template] // CHECK:STDOUT: %Op.type.e42: type = fn_type @Op.13 [template] -// CHECK:STDOUT: %impl_witness.0f6: = impl_witness (imports.%import_ref.c15) [template] +// CHECK:STDOUT: %impl_witness.0f6: = impl_witness (imports.%Core.import_ref.c15) [template] // CHECK:STDOUT: %Op.type.1be: type = fn_type @Op.14 [template] // CHECK:STDOUT: %Op.bba: %Op.type.1be = struct_value () [template] // CHECK:STDOUT: %Op.bound: = bound_method %int_10, %Op.bba [template] @@ -49,9 +49,9 @@ var d: i32 = c[-10]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Negate = %import_ref.6e9 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Negate = %Core.Negate // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index 65de4b87eefc..120e83e70d70 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -27,7 +27,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IndexWith = %import_ref.671 +// CHECK:STDOUT: .IndexWith = %Core.IndexWith // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/assoc_const.carbon b/toolchain/check/testdata/interface/assoc_const.carbon index 36f86c5a8b67..b44f0acf5b9f 100644 --- a/toolchain/check/testdata/interface/assoc_const.carbon +++ b/toolchain/check/testdata/interface/assoc_const.carbon @@ -28,7 +28,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon b/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon index 8ad7a0e923ae..66025fa9e4b2 100644 --- a/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon +++ b/toolchain/check/testdata/interface/fail_assoc_const_bad_default.carbon @@ -31,7 +31,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon b/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon index 483e897bf46f..a7400fb9b495 100644 --- a/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon +++ b/toolchain/check/testdata/interface/fail_todo_assoc_const_default.carbon @@ -36,7 +36,7 @@ interface I { // CHECK:STDOUT: %assoc1: %assoc_type.4fb = assoc_entity element1, @I.%N [template] // CHECK:STDOUT: %int_42.20e: Core.IntLiteral = int_value 42 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_42.20e, %Convert.956 [template] @@ -46,8 +46,8 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon b/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon index 7848c1cc0125..8e2ef717c0cf 100644 --- a/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon +++ b/toolchain/check/testdata/interface/fail_todo_define_default_fn_inline.carbon @@ -41,7 +41,7 @@ interface Interface { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon b/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon index 1a07750c9b6a..fd7ac3d393bb 100644 --- a/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon +++ b/toolchain/check/testdata/interface/fail_todo_define_default_fn_out_of_line.carbon @@ -87,7 +87,7 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/member_lookup.carbon b/toolchain/check/testdata/interface/member_lookup.carbon index b94131b84a69..d2bfb68aaa8e 100644 --- a/toolchain/check/testdata/interface/member_lookup.carbon +++ b/toolchain/check/testdata/interface/member_lookup.carbon @@ -84,7 +84,7 @@ fn AccessMissingConcrete(I:! Interface(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -288,7 +288,7 @@ fn AccessMissingConcrete(I:! Interface(i32)) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/export_name.carbon b/toolchain/check/testdata/interface/no_prelude/export_name.carbon index 54791f55f60a..2fc550106214 100644 --- a/toolchain/check/testdata/interface/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/interface/no_prelude/export_name.carbon @@ -67,8 +67,8 @@ fn UseEmpty(i: I) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df2: type = import_ref Main//base, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.e5d = import_ref Main//base, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.I: type = import_ref Main//base, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref = import_ref Main//base, inst15 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -76,12 +76,12 @@ fn UseEmpty(i: I) {} // CHECK:STDOUT: .I = %I // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %I: type = export I, imports.%import_ref.df2 [template = constants.%I.type] +// CHECK:STDOUT: %I: type = export I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "base.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.e5d +// CHECK:STDOUT: .Self = imports.%Main.import_ref // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: @@ -94,13 +94,13 @@ fn UseEmpty(i: I) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.df1: type = import_ref Main//export, I, loaded [template = constants.%I.type] -// CHECK:STDOUT: %import_ref.6c2 = import_ref Main//export, inst18 [indirect], unloaded +// CHECK:STDOUT: %Main.I: type = import_ref Main//export, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.import_ref = import_ref Main//export, inst18 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref.df1 +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: .UseEmpty = %UseEmpty.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -109,14 +109,14 @@ fn UseEmpty(i: I) {} // CHECK:STDOUT: %i.param_patt: %I.type = value_param_pattern %i.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %I.type = value_param runtime_param0 -// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.df1 [template = constants.%I.type] +// CHECK:STDOUT: %I.ref: type = name_ref I, imports.%Main.I [template = constants.%I.type] // CHECK:STDOUT: %i: %I.type = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I [from "export.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6c2 +// CHECK:STDOUT: .Self = imports.%Main.import_ref // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/fail_definition_imported.carbon b/toolchain/check/testdata/interface/no_prelude/fail_definition_imported.carbon index 9b072163dd65..0a17bdc2a459 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_definition_imported.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_definition_imported.carbon @@ -53,12 +53,12 @@ interface I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: type = import_ref Main//a, I, loaded [template = constants.%I.type] +// CHECK:STDOUT: %Main.I: type = import_ref Main//a, I, loaded [template = constants.%I.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .I = imports.%import_ref +// CHECK:STDOUT: .I = imports.%Main.I // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %.decl: type = interface_decl @.1 [template = constants.%.type] {} {} diff --git a/toolchain/check/testdata/interface/no_prelude/generic_import.carbon b/toolchain/check/testdata/interface/no_prelude/generic_import.carbon index a75f90e43530..e17bc3eeeacb 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic_import.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic_import.carbon @@ -108,12 +108,12 @@ impl C as AddWith(C) { // CHECK:STDOUT: %F.type.fbc: type = fn_type @F.1, @AddWith(%T) [symbolic] // CHECK:STDOUT: %F.be3: %F.type.fbc = struct_value () [symbolic] // CHECK:STDOUT: %F.assoc_type.f26: type = assoc_entity_type %AddWith.type.bc7, %F.type.fbc [symbolic] -// CHECK:STDOUT: %assoc0.1ff: %F.assoc_type.f26 = assoc_entity element0, imports.%import_ref.0c5 [symbolic] +// CHECK:STDOUT: %assoc0.1ff: %F.assoc_type.f26 = assoc_entity element0, imports.%Main.import_ref.0c5 [symbolic] // CHECK:STDOUT: %AddWith.type.e8e: type = facet_type <@AddWith, @AddWith(%C)> [template] // CHECK:STDOUT: %F.type.cd2: type = fn_type @F.1, @AddWith(%C) [template] // CHECK:STDOUT: %F.b58: %F.type.cd2 = struct_value () [template] // CHECK:STDOUT: %F.assoc_type.c97: type = assoc_entity_type %AddWith.type.e8e, %F.type.cd2 [template] -// CHECK:STDOUT: %assoc0.dc2: %F.assoc_type.c97 = assoc_entity element0, imports.%import_ref.0c5 [template] +// CHECK:STDOUT: %assoc0.dc2: %F.assoc_type.c97 = assoc_entity element0, imports.%Main.import_ref.0c5 [template] // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.%F.decl) [template] // CHECK:STDOUT: %F.type.c09: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.e62: %F.type.c09 = struct_value () [template] @@ -121,23 +121,23 @@ impl C as AddWith(C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.cf6: %AddWith.type.b35 = import_ref Main//a, AddWith, loaded [template = constants.%AddWith.generic] -// CHECK:STDOUT: %import_ref.476 = import_ref Main//a, inst26 [no loc], unloaded -// CHECK:STDOUT: %import_ref.ce5 = import_ref Main//a, loc5_9, unloaded -// CHECK:STDOUT: %import_ref.b80: @AddWith.%F.type (%F.type.fbc) = import_ref Main//a, F, loaded [symbolic = @AddWith.%F (constants.%F.be3)] -// CHECK:STDOUT: %import_ref.0c5 = import_ref Main//a, loc5_9, unloaded +// CHECK:STDOUT: %Main.AddWith: %AddWith.type.b35 = import_ref Main//a, AddWith, loaded [template = constants.%AddWith.generic] +// CHECK:STDOUT: %Main.import_ref.476 = import_ref Main//a, inst26 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.ce5 = import_ref Main//a, loc5_9, unloaded +// CHECK:STDOUT: %Main.F: @AddWith.%F.type (%F.type.fbc) = import_ref Main//a, F, loaded [symbolic = @AddWith.%F (constants.%F.be3)] +// CHECK:STDOUT: %Main.import_ref.0c5 = import_ref Main//a, loc5_9, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .AddWith = imports.%import_ref.cf6 +// CHECK:STDOUT: .AddWith = imports.%Main.AddWith // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C.ref.loc7_6: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %AddWith.ref: %AddWith.type.b35 = name_ref AddWith, imports.%import_ref.cf6 [template = constants.%AddWith.generic] +// CHECK:STDOUT: %AddWith.ref: %AddWith.type.b35 = name_ref AddWith, imports.%Main.AddWith [template = constants.%AddWith.generic] // CHECK:STDOUT: %C.ref.loc7_19: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %AddWith.type: type = facet_type <@AddWith, @AddWith(constants.%C)> [template = constants.%AddWith.type.e8e] // CHECK:STDOUT: } @@ -154,13 +154,13 @@ impl C as AddWith(C) { // CHECK:STDOUT: %F.type: type = fn_type @F.1, @AddWith(%T) [symbolic = %F.type (constants.%F.type.fbc)] // CHECK:STDOUT: %F: @AddWith.%F.type (%F.type.fbc) = struct_value () [symbolic = %F (constants.%F.be3)] // CHECK:STDOUT: %F.assoc_type: type = assoc_entity_type @AddWith.%AddWith.type (%AddWith.type.bc7), @AddWith.%F.type (%F.type.fbc) [symbolic = %F.assoc_type (constants.%F.assoc_type.f26)] -// CHECK:STDOUT: %assoc0: @AddWith.%F.assoc_type (%F.assoc_type.f26) = assoc_entity element0, imports.%import_ref.0c5 [symbolic = %assoc0 (constants.%assoc0.1ff)] +// CHECK:STDOUT: %assoc0: @AddWith.%F.assoc_type (%F.assoc_type.f26) = assoc_entity element0, imports.%Main.import_ref.0c5 [symbolic = %assoc0 (constants.%assoc0.1ff)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.476 -// CHECK:STDOUT: .F = imports.%import_ref.ce5 -// CHECK:STDOUT: witness = (imports.%import_ref.b80) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.476 +// CHECK:STDOUT: .F = imports.%Main.import_ref.ce5 +// CHECK:STDOUT: witness = (imports.%Main.F) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/import.carbon b/toolchain/check/testdata/interface/no_prelude/import.carbon index 85f4ff7abf49..b9047e8b1414 100644 --- a/toolchain/check/testdata/interface/no_prelude/import.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import.carbon @@ -159,43 +159,43 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %UseForwardDeclared.type: type = fn_type @UseForwardDeclared [template] // CHECK:STDOUT: %UseForwardDeclared: %UseForwardDeclared.type = struct_value () [template] // CHECK:STDOUT: %assoc_type.6af: type = assoc_entity_type %Basic.type, type [template] -// CHECK:STDOUT: %assoc0.1d6: %assoc_type.6af = assoc_entity element0, imports.%import_ref.ef4597.1 [template] +// CHECK:STDOUT: %assoc0.1d6: %assoc_type.6af = assoc_entity element0, imports.%Main.import_ref.ef4597.1 [template] // CHECK:STDOUT: %F.type.320: type = fn_type @F.1 [template] // CHECK:STDOUT: %F.assoc_type.94b: type = assoc_entity_type %Basic.type, %F.type.320 [template] -// CHECK:STDOUT: %assoc1.d7b: %F.assoc_type.94b = assoc_entity element1, imports.%import_ref.0be [template] +// CHECK:STDOUT: %assoc1.d7b: %F.assoc_type.94b = assoc_entity element1, imports.%Main.import_ref.0be [template] // CHECK:STDOUT: %assoc_type.3e8: type = assoc_entity_type %ForwardDeclared.type, type [template] -// CHECK:STDOUT: %assoc0.910: %assoc_type.3e8 = assoc_entity element0, imports.%import_ref.ef4597.2 [template] +// CHECK:STDOUT: %assoc0.910: %assoc_type.3e8 = assoc_entity element0, imports.%Main.import_ref.ef4597.2 [template] // CHECK:STDOUT: %F.type.505: type = fn_type @F.2 [template] // CHECK:STDOUT: %F.assoc_type.1e3: type = assoc_entity_type %ForwardDeclared.type, %F.type.505 [template] -// CHECK:STDOUT: %assoc1.68e: %F.assoc_type.1e3 = assoc_entity element1, imports.%import_ref.1cc [template] +// CHECK:STDOUT: %assoc1.68e: %F.assoc_type.1e3 = assoc_entity element1, imports.%Main.import_ref.1cc [template] // CHECK:STDOUT: %ptr: type = ptr_type %ForwardDeclared.type [template] // CHECK:STDOUT: %struct_type.f.2f5: type = struct_type {.f: %ForwardDeclared.type} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.4ea: type = import_ref Main//a, Empty, loaded [template = constants.%Empty.type] -// CHECK:STDOUT: %import_ref.4b7: type = import_ref Main//a, Basic, loaded [template = constants.%Basic.type] -// CHECK:STDOUT: %import_ref.e33: type = import_ref Main//a, ForwardDeclared, loaded [template = constants.%ForwardDeclared.type] -// CHECK:STDOUT: %import_ref.2ac: ref %struct_type.f.2f5 = import_ref Main//a, f_ref, loaded -// CHECK:STDOUT: %import_ref.cc0 = import_ref Main//a, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.37f = import_ref Main//a, inst19 [no loc], unloaded -// CHECK:STDOUT: %import_ref.42e: %assoc_type.6af = import_ref Main//a, loc8_8, loaded [template = constants.%assoc0.1d6] -// CHECK:STDOUT: %import_ref.b06: %F.assoc_type.94b = import_ref Main//a, loc9_9, loaded [template = constants.%assoc1.d7b] -// CHECK:STDOUT: %import_ref.08d600.1 = import_ref Main//a, T, unloaded -// CHECK:STDOUT: %import_ref.eea = import_ref Main//a, F, unloaded -// CHECK:STDOUT: %import_ref.52b = import_ref Main//a, inst34 [no loc], unloaded -// CHECK:STDOUT: %import_ref.95f: %assoc_type.3e8 = import_ref Main//a, loc16_8, loaded [template = constants.%assoc0.910] -// CHECK:STDOUT: %import_ref.7f1: %F.assoc_type.1e3 = import_ref Main//a, loc17_9, loaded [template = constants.%assoc1.68e] -// CHECK:STDOUT: %import_ref.08d600.2 = import_ref Main//a, T, unloaded -// CHECK:STDOUT: %import_ref.5d0 = import_ref Main//a, F, unloaded +// CHECK:STDOUT: %Main.Empty: type = import_ref Main//a, Empty, loaded [template = constants.%Empty.type] +// CHECK:STDOUT: %Main.Basic: type = import_ref Main//a, Basic, loaded [template = constants.%Basic.type] +// CHECK:STDOUT: %Main.ForwardDeclared: type = import_ref Main//a, ForwardDeclared, loaded [template = constants.%ForwardDeclared.type] +// CHECK:STDOUT: %Main.f_ref: ref %struct_type.f.2f5 = import_ref Main//a, f_ref, loaded +// CHECK:STDOUT: %Main.import_ref.cc0 = import_ref Main//a, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.37f = import_ref Main//a, inst19 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.42e: %assoc_type.6af = import_ref Main//a, loc8_8, loaded [template = constants.%assoc0.1d6] +// CHECK:STDOUT: %Main.import_ref.b06: %F.assoc_type.94b = import_ref Main//a, loc9_9, loaded [template = constants.%assoc1.d7b] +// CHECK:STDOUT: %Main.T.08d600.1 = import_ref Main//a, T, unloaded +// CHECK:STDOUT: %Main.F.eea = import_ref Main//a, F, unloaded +// CHECK:STDOUT: %Main.import_ref.52b = import_ref Main//a, inst34 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.95f: %assoc_type.3e8 = import_ref Main//a, loc16_8, loaded [template = constants.%assoc0.910] +// CHECK:STDOUT: %Main.import_ref.7f1: %F.assoc_type.1e3 = import_ref Main//a, loc17_9, loaded [template = constants.%assoc1.68e] +// CHECK:STDOUT: %Main.T.08d600.2 = import_ref Main//a, T, unloaded +// CHECK:STDOUT: %Main.F.5d0 = import_ref Main//a, F, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Empty = imports.%import_ref.4ea -// CHECK:STDOUT: .Basic = imports.%import_ref.4b7 -// CHECK:STDOUT: .ForwardDeclared = imports.%import_ref.e33 -// CHECK:STDOUT: .f_ref = imports.%import_ref.2ac +// CHECK:STDOUT: .Empty = imports.%Main.Empty +// CHECK:STDOUT: .Basic = imports.%Main.Basic +// CHECK:STDOUT: .ForwardDeclared = imports.%Main.ForwardDeclared +// CHECK:STDOUT: .f_ref = imports.%Main.f_ref // CHECK:STDOUT: .UseEmpty = %UseEmpty.decl // CHECK:STDOUT: .UseBasic = %UseBasic.decl // CHECK:STDOUT: .UseForwardDeclared = %UseForwardDeclared.decl @@ -211,7 +211,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %e.param_patt: %Empty.type = value_param_pattern %e.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Empty.type = value_param runtime_param0 -// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%import_ref.4ea [template = constants.%Empty.type] +// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%Main.Empty [template = constants.%Empty.type] // CHECK:STDOUT: %e: %Empty.type = bind_name e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseBasic.decl: %UseBasic.type = fn_decl @UseBasic [template = constants.%UseBasic] { @@ -219,7 +219,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %e.param_patt: %Basic.type = value_param_pattern %e.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %e.param: %Basic.type = value_param runtime_param0 -// CHECK:STDOUT: %Basic.ref: type = name_ref Basic, imports.%import_ref.4b7 [template = constants.%Basic.type] +// CHECK:STDOUT: %Basic.ref: type = name_ref Basic, imports.%Main.Basic [template = constants.%Basic.type] // CHECK:STDOUT: %e: %Basic.type = bind_name e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseForwardDeclared.decl: %UseForwardDeclared.type = fn_decl @UseForwardDeclared [template = constants.%UseForwardDeclared] { @@ -227,28 +227,28 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %f.param_patt: %ForwardDeclared.type = value_param_pattern %f.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %f.param: %ForwardDeclared.type = value_param runtime_param0 -// CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, imports.%import_ref.e33 [template = constants.%ForwardDeclared.type] +// CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.type] // CHECK:STDOUT: %f: %ForwardDeclared.type = bind_name f, %f.param // CHECK:STDOUT: } -// CHECK:STDOUT: %Basic.ref.loc10: type = name_ref Basic, imports.%import_ref.4b7 [template = constants.%Basic.type] -// CHECK:STDOUT: %T.ref.loc10: %assoc_type.6af = name_ref T, imports.%import_ref.42e [template = constants.%assoc0.1d6] -// CHECK:STDOUT: %UseBasicT: %assoc_type.6af = bind_alias UseBasicT, imports.%import_ref.42e [template = constants.%assoc0.1d6] -// CHECK:STDOUT: %Basic.ref.loc11: type = name_ref Basic, imports.%import_ref.4b7 [template = constants.%Basic.type] -// CHECK:STDOUT: %F.ref.loc11: %F.assoc_type.94b = name_ref F, imports.%import_ref.b06 [template = constants.%assoc1.d7b] -// CHECK:STDOUT: %UseBasicF: %F.assoc_type.94b = bind_alias UseBasicF, imports.%import_ref.b06 [template = constants.%assoc1.d7b] -// CHECK:STDOUT: %ForwardDeclared.ref.loc13: type = name_ref ForwardDeclared, imports.%import_ref.e33 [template = constants.%ForwardDeclared.type] -// CHECK:STDOUT: %T.ref.loc13: %assoc_type.3e8 = name_ref T, imports.%import_ref.95f [template = constants.%assoc0.910] -// CHECK:STDOUT: %UseForwardDeclaredT: %assoc_type.3e8 = bind_alias UseForwardDeclaredT, imports.%import_ref.95f [template = constants.%assoc0.910] -// CHECK:STDOUT: %ForwardDeclared.ref.loc14: type = name_ref ForwardDeclared, imports.%import_ref.e33 [template = constants.%ForwardDeclared.type] -// CHECK:STDOUT: %F.ref.loc14: %F.assoc_type.1e3 = name_ref F, imports.%import_ref.7f1 [template = constants.%assoc1.68e] -// CHECK:STDOUT: %UseForwardDeclaredF: %F.assoc_type.1e3 = bind_alias UseForwardDeclaredF, imports.%import_ref.7f1 [template = constants.%assoc1.68e] +// CHECK:STDOUT: %Basic.ref.loc10: type = name_ref Basic, imports.%Main.Basic [template = constants.%Basic.type] +// CHECK:STDOUT: %T.ref.loc10: %assoc_type.6af = name_ref T, imports.%Main.import_ref.42e [template = constants.%assoc0.1d6] +// CHECK:STDOUT: %UseBasicT: %assoc_type.6af = bind_alias UseBasicT, imports.%Main.import_ref.42e [template = constants.%assoc0.1d6] +// CHECK:STDOUT: %Basic.ref.loc11: type = name_ref Basic, imports.%Main.Basic [template = constants.%Basic.type] +// CHECK:STDOUT: %F.ref.loc11: %F.assoc_type.94b = name_ref F, imports.%Main.import_ref.b06 [template = constants.%assoc1.d7b] +// CHECK:STDOUT: %UseBasicF: %F.assoc_type.94b = bind_alias UseBasicF, imports.%Main.import_ref.b06 [template = constants.%assoc1.d7b] +// CHECK:STDOUT: %ForwardDeclared.ref.loc13: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.type] +// CHECK:STDOUT: %T.ref.loc13: %assoc_type.3e8 = name_ref T, imports.%Main.import_ref.95f [template = constants.%assoc0.910] +// CHECK:STDOUT: %UseForwardDeclaredT: %assoc_type.3e8 = bind_alias UseForwardDeclaredT, imports.%Main.import_ref.95f [template = constants.%assoc0.910] +// CHECK:STDOUT: %ForwardDeclared.ref.loc14: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.type] +// CHECK:STDOUT: %F.ref.loc14: %F.assoc_type.1e3 = name_ref F, imports.%Main.import_ref.7f1 [template = constants.%assoc1.68e] +// CHECK:STDOUT: %UseForwardDeclaredF: %F.assoc_type.1e3 = bind_alias UseForwardDeclaredF, imports.%Main.import_ref.7f1 [template = constants.%assoc1.68e] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %f.patt: %ptr = binding_pattern f // CHECK:STDOUT: %.loc16_1: %ptr = var_pattern %f.patt // CHECK:STDOUT: } // CHECK:STDOUT: %f.var: ref %ptr = var f // CHECK:STDOUT: %.loc16_23: type = splice_block %ptr [template = constants.%ptr] { -// CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%import_ref.e33 [template = constants.%ForwardDeclared.type] +// CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [template = constants.%ForwardDeclared.type] // CHECK:STDOUT: %ptr: type = ptr_type %ForwardDeclared.type [template = constants.%ptr] // CHECK:STDOUT: } // CHECK:STDOUT: %f: ref %ptr = bind_name f, %f.var @@ -256,24 +256,24 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty [from "a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cc0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cc0 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Basic [from "a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.37f -// CHECK:STDOUT: .T = imports.%import_ref.42e -// CHECK:STDOUT: .F = imports.%import_ref.b06 -// CHECK:STDOUT: witness = (imports.%import_ref.08d600.1, imports.%import_ref.eea) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.37f +// CHECK:STDOUT: .T = imports.%Main.import_ref.42e +// CHECK:STDOUT: .F = imports.%Main.import_ref.b06 +// CHECK:STDOUT: witness = (imports.%Main.T.08d600.1, imports.%Main.F.eea) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared [from "a.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.52b -// CHECK:STDOUT: .T = imports.%import_ref.95f -// CHECK:STDOUT: .F = imports.%import_ref.7f1 -// CHECK:STDOUT: witness = (imports.%import_ref.08d600.2, imports.%import_ref.5d0) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.52b +// CHECK:STDOUT: .T = imports.%Main.import_ref.95f +// CHECK:STDOUT: .F = imports.%Main.import_ref.7f1 +// CHECK:STDOUT: witness = (imports.%Main.T.08d600.2, imports.%Main.F.5d0) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @UseEmpty(%e.param_patt: %Empty.type) { @@ -303,7 +303,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %f_ref.ref: ref %struct_type.f.2f5 = name_ref f_ref, imports.%import_ref.2ac +// CHECK:STDOUT: %f_ref.ref: ref %struct_type.f.2f5 = name_ref f_ref, imports.%Main.f_ref // CHECK:STDOUT: %.loc16: ref %ForwardDeclared.type = struct_access %f_ref.ref, element0 // CHECK:STDOUT: %addr: %ptr = addr_of %.loc16 // CHECK:STDOUT: assign file.%f.var, %addr diff --git a/toolchain/check/testdata/interface/no_prelude/import_access.carbon b/toolchain/check/testdata/interface/no_prelude/import_access.carbon index 60ab34895d90..94ab046ecfbe 100644 --- a/toolchain/check/testdata/interface/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import_access.carbon @@ -206,13 +206,13 @@ private interface Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.5e5: type = import_ref Test//def, Def, loaded [template = constants.%Def.type] -// CHECK:STDOUT: %import_ref.cd6 = import_ref Test//def, inst15 [no loc], unloaded +// CHECK:STDOUT: %Test.Def: type = import_ref Test//def, Def, loaded [template = constants.%Def.type] +// CHECK:STDOUT: %Test.import_ref = import_ref Test//def, inst15 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Def [private] = imports.%import_ref.5e5 +// CHECK:STDOUT: .Def [private] = imports.%Test.Def // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -222,14 +222,14 @@ private interface Redecl {} // CHECK:STDOUT: %i.param_patt: %Def.type = value_param_pattern %i.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %Def.type = value_param runtime_param0 -// CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%import_ref.5e5 [template = constants.%Def.type] +// CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%Test.Def [template = constants.%Def.type] // CHECK:STDOUT: %i: %Def.type = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Def [from "def.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cd6 +// CHECK:STDOUT: .Self = imports.%Test.import_ref // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: @@ -311,13 +311,13 @@ private interface Redecl {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.247: type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef.type] -// CHECK:STDOUT: %import_ref.aa5 = import_ref Test//forward_with_def, inst16 [no loc], unloaded +// CHECK:STDOUT: %Test.ForwardWithDef: type = import_ref Test//forward_with_def, ForwardWithDef, loaded [template = constants.%ForwardWithDef.type] +// CHECK:STDOUT: %Test.import_ref = import_ref Test//forward_with_def, inst16 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .ForwardWithDef [private] = imports.%import_ref.247 +// CHECK:STDOUT: .ForwardWithDef [private] = imports.%Test.ForwardWithDef // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -327,14 +327,14 @@ private interface Redecl {} // CHECK:STDOUT: %i.param_patt: %ForwardWithDef.type = value_param_pattern %i.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %i.param: %ForwardWithDef.type = value_param runtime_param0 -// CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%import_ref.247 [template = constants.%ForwardWithDef.type] +// CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [template = constants.%ForwardWithDef.type] // CHECK:STDOUT: %i: %ForwardWithDef.type = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardWithDef [from "forward_with_def.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.aa5 +// CHECK:STDOUT: .Self = imports.%Test.import_ref // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon b/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon index 06d1b242b3f9..a6bec9552dc8 100644 --- a/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon @@ -45,12 +45,12 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: --- a.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//a, A, unloaded +// CHECK:STDOUT: %Main.A = import_ref Main//a, A, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Main.A // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc1_6.1 = import // CHECK:STDOUT: %default.import.loc1_6.2 = import @@ -96,15 +96,15 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.8b9 = import_ref Main//b, B, unloaded -// CHECK:STDOUT: %import_ref.420 = import_ref Main//b, inst15 [no loc], unloaded -// CHECK:STDOUT: %import_ref.e5c: type = import_ref Main//b, loc7_7, loaded [template = constants.%empty_tuple.type] -// CHECK:STDOUT: %import_ref.171: type = import_ref Main//b, loc7_12, loaded [template = constants.%B.type] +// CHECK:STDOUT: %Main.B = import_ref Main//b, B, unloaded +// CHECK:STDOUT: %Main.import_ref.420 = import_ref Main//b, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.e5c: type = import_ref Main//b, loc7_7, loaded [template = constants.%empty_tuple.type] +// CHECK:STDOUT: %Main.import_ref.171: type = import_ref Main//b, loc7_12, loaded [template = constants.%B.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .B = imports.%import_ref.8b9 +// CHECK:STDOUT: .B = imports.%Main.B // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc1_6.1 = import // CHECK:STDOUT: %default.import.loc1_6.2 = import @@ -112,9 +112,9 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: // CHECK:STDOUT: interface @B [from "fail_b.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.420 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.420 // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl: imports.%import_ref.e5c as imports.%import_ref.171 [from "fail_b.carbon"]; +// CHECK:STDOUT: impl @impl: imports.%Main.import_ref.e5c as imports.%Main.import_ref.171 [from "fail_b.carbon"]; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon index 710cc796cbdd..cdfe67cf3e9a 100644 --- a/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon @@ -625,20 +625,20 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.05a: type = import_ref Main//two_file, D, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.c61: %Foo.type = import_ref Main//two_file, Foo, loaded [template = constants.%Foo.generic] -// CHECK:STDOUT: %import_ref.feb: %Bar.type = import_ref Main//two_file, Bar, loaded [template = constants.%Bar.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//two_file, D, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.Foo: %Foo.type = import_ref Main//two_file, Foo, loaded [template = constants.%Foo.generic] +// CHECK:STDOUT: %Main.Bar: %Bar.type = import_ref Main//two_file, Bar, loaded [template = constants.%Bar.generic] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .D = imports.%import_ref.05a -// CHECK:STDOUT: .Foo = imports.%import_ref.c61 -// CHECK:STDOUT: .Bar = imports.%import_ref.feb +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D +// CHECK:STDOUT: .Foo = imports.%Main.Foo +// CHECK:STDOUT: .Bar = imports.%Main.Bar // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import @@ -647,7 +647,7 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc12_15.1, runtime_param [symbolic = %a.patt.loc12_15.2 (constants.%a.patt)] // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %a.loc12_15.1: %C = bind_symbolic_name a, 0, %a.param [symbolic = %a.loc12_15.2 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc21: %.type.abf52e.2 = interface_decl @.2 [template = constants.%.generic.0a9e18.2] { @@ -655,7 +655,7 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc21_15.1, runtime_param [symbolic = %a.patt.loc21_15.2 (constants.%a.patt)] // CHECK:STDOUT: } { // CHECK:STDOUT: %a.param: %C = value_param runtime_param -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.05a [template = constants.%C] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%C] // CHECK:STDOUT: %a.loc21_15.1: %C = bind_symbolic_name a, 0, %a.param [symbolic = %a.loc21_15.2 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -709,10 +709,10 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { @@ -1067,22 +1067,22 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.c61: %Foo.type = import_ref Main//alias_two_file, Foo, loaded [template = constants.%Foo.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//alias_two_file, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.Foo: %Foo.type = import_ref Main//alias_two_file, Foo, loaded [template = constants.%Foo.generic] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//alias_two_file, loc4_10, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//alias_two_file, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 -// CHECK:STDOUT: .Foo = imports.%import_ref.c61 +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .Foo = imports.%Main.Foo // CHECK:STDOUT: .D = %D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import // CHECK:STDOUT: %default.import.loc2_6.2 = import -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %D: type = bind_alias D, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %.decl: %.type.abf = interface_decl @.1 [template = constants.%.generic] { // CHECK:STDOUT: %a.patt.loc17_15.1: %C = symbolic_binding_pattern a, 0 [symbolic = %a.patt.loc17_15.2 (constants.%a.patt)] // CHECK:STDOUT: %a.param_patt: %C = value_param_pattern %a.patt.loc17_15.1, runtime_param [symbolic = %a.patt.loc17_15.2 (constants.%a.patt)] @@ -1118,10 +1118,10 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "alias_two_file.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { diff --git a/toolchain/check/testdata/interface/todo_define_not_default.carbon b/toolchain/check/testdata/interface/todo_define_not_default.carbon index 00f2eb8e6eec..ca072cd3cc14 100644 --- a/toolchain/check/testdata/interface/todo_define_not_default.carbon +++ b/toolchain/check/testdata/interface/todo_define_not_default.carbon @@ -42,7 +42,7 @@ interface I { // CHECK:STDOUT: %assoc3: %assoc_type.4fb = assoc_entity element3, @I.%N [template] // CHECK:STDOUT: %int_42.20e: Core.IntLiteral = int_value 42 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_42.20e, %Convert.956 [template] @@ -52,8 +52,8 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index 4d91134e3adc..9ee9522e93ab 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -20,7 +20,7 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -34,8 +34,8 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/compile_time_bindings.carbon b/toolchain/check/testdata/let/compile_time_bindings.carbon index 5804abfddb9b..fda5dce6fdf0 100644 --- a/toolchain/check/testdata/let/compile_time_bindings.carbon +++ b/toolchain/check/testdata/let/compile_time_bindings.carbon @@ -594,7 +594,7 @@ impl i32 as Empty { // CHECK:STDOUT: %Zero.patt: %i32 = symbolic_binding_pattern Zero, 0 [symbolic] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -604,8 +604,8 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -661,7 +661,7 @@ impl i32 as Empty { // CHECK:STDOUT: %Zero.patt: %i32 = symbolic_binding_pattern Zero, 0 [symbolic] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -675,8 +675,8 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -751,8 +751,8 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -812,7 +812,7 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -864,7 +864,7 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -910,7 +910,7 @@ impl i32 as Empty { // CHECK:STDOUT: %impl_witness.1bc: = impl_witness () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -920,8 +920,8 @@ impl i32 as Empty { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 84978d52424a..f346eaa86e74 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -29,7 +29,7 @@ fn F() -> i32 { // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %tuple.type.37f: type = tuple_type (Core.IntLiteral, Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -46,8 +46,8 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index b3c7d3c4b577..e37b12f0be09 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -29,7 +29,7 @@ fn F() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -43,8 +43,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 82227ee43dfb..f3c54d6142d5 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -43,8 +43,8 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_generic_import.carbon b/toolchain/check/testdata/let/fail_generic_import.carbon index edea8884a068..f8274f8f3bc0 100644 --- a/toolchain/check/testdata/let/fail_generic_import.carbon +++ b/toolchain/check/testdata/let/fail_generic_import.carbon @@ -38,7 +38,7 @@ let a: T = 0; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -70,7 +70,7 @@ let a: T = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: type = import_ref Implicit//default, T, loaded +// CHECK:STDOUT: %Implicit.T: type = import_ref Implicit//default, T, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -79,7 +79,7 @@ let a: T = 0; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .T = imports.%import_ref +// CHECK:STDOUT: .T = imports.%Implicit.T // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: } @@ -89,7 +89,7 @@ let a: T = 0; // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a.patt: = binding_pattern a // CHECK:STDOUT: } -// CHECK:STDOUT: %T.ref: type = name_ref T, imports.%import_ref +// CHECK:STDOUT: %T.ref: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %a: = bind_name a, // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_missing_value.carbon b/toolchain/check/testdata/let/fail_missing_value.carbon index 8ddb27846634..167dfcbfc14c 100644 --- a/toolchain/check/testdata/let/fail_missing_value.carbon +++ b/toolchain/check/testdata/let/fail_missing_value.carbon @@ -33,7 +33,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index 373c6a7e34e4..6ac40bcab490 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -91,7 +91,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -101,8 +101,8 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index 5a40d6e51d4a..c11abef22aa0 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -27,7 +27,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index af031d113095..f43a388e5e5f 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -28,7 +28,7 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index c495bf709882..fcb195fb7f20 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -42,7 +42,7 @@ var b: T = *a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -70,7 +70,7 @@ var b: T = *a; // CHECK:STDOUT: --- fail_implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: type = import_ref Implicit//default, T, loaded +// CHECK:STDOUT: %Implicit.T: type = import_ref Implicit//default, T, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -79,7 +79,7 @@ var b: T = *a; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .T = imports.%import_ref +// CHECK:STDOUT: .T = imports.%Implicit.T // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b @@ -93,7 +93,7 @@ var b: T = *a; // CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref = var a // CHECK:STDOUT: %.loc8_9: type = splice_block %ptr [template = ] { -// CHECK:STDOUT: %T.ref.loc8: type = name_ref T, imports.%import_ref +// CHECK:STDOUT: %T.ref.loc8: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %ptr: type = ptr_type [template = ] // CHECK:STDOUT: } // CHECK:STDOUT: %a: = bind_name a, @@ -102,7 +102,7 @@ var b: T = *a; // CHECK:STDOUT: %.loc13: = var_pattern %b.patt // CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref = var b -// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, imports.%import_ref +// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %b: = bind_name b, // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 85676cd60059..39661f03d3e1 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -19,7 +19,7 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -31,8 +31,8 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index b15fa0038564..684649f14f7d 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -24,7 +24,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/no_prelude/import.carbon b/toolchain/check/testdata/let/no_prelude/import.carbon index b2f7cc69d01e..fc8124c00e0a 100644 --- a/toolchain/check/testdata/let/no_prelude/import.carbon +++ b/toolchain/check/testdata/let/no_prelude/import.carbon @@ -68,12 +68,12 @@ let b: () = Other.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %empty_tuple.type = import_ref Implicit//default, a, loaded +// CHECK:STDOUT: %Implicit.a: %empty_tuple.type = import_ref Implicit//default, a, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a = imports.%import_ref +// CHECK:STDOUT: .a = imports.%Implicit.a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: } // CHECK:STDOUT: %Implicit.import = import Implicit @@ -90,7 +90,7 @@ let b: () = Other.a; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a.ref: %empty_tuple.type = name_ref a, imports.%import_ref +// CHECK:STDOUT: %a.ref: %empty_tuple.type = name_ref a, imports.%Implicit.a // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -131,10 +131,10 @@ let b: () = Other.a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .a = %import_ref +// CHECK:STDOUT: .a = %Other.a // CHECK:STDOUT: import Other//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: %empty_tuple.type = import_ref Other//default, a, loaded +// CHECK:STDOUT: %Other.a: %empty_tuple.type = import_ref Other//default, a, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -156,7 +156,7 @@ let b: () = Other.a; // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %a.ref: %empty_tuple.type = name_ref a, imports.%import_ref +// CHECK:STDOUT: %a.ref: %empty_tuple.type = name_ref a, imports.%Other.a // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/no_prelude/import_access.carbon b/toolchain/check/testdata/let/no_prelude/import_access.carbon index d1ce06bda416..d85164d19390 100644 --- a/toolchain/check/testdata/let/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/let/no_prelude/import_access.carbon @@ -88,12 +88,12 @@ let v2: () = Test.v; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %empty_tuple.type = import_ref Test//def, v, loaded +// CHECK:STDOUT: %Test.v: %empty_tuple.type = import_ref Test//def, v, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .v [private] = imports.%import_ref +// CHECK:STDOUT: .v [private] = imports.%Test.v // CHECK:STDOUT: .v2 = %v2 // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -110,7 +110,7 @@ let v2: () = Test.v; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %v.ref: %empty_tuple.type = name_ref v, imports.%import_ref +// CHECK:STDOUT: %v.ref: %empty_tuple.type = name_ref v, imports.%Test.v // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index 1dce299d3c95..1382220032d6 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -23,7 +23,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -33,8 +33,8 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index 846c6d89dcdc..7172eb2e117e 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -49,7 +49,7 @@ var a: i32 = NS.A(); // CHECK:STDOUT: %A: %A.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -58,13 +58,13 @@ var a: i32 = NS.A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Implicit//default, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { +// CHECK:STDOUT: %Implicit.NS: = import_ref Implicit//default, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Implicit.NS, [template] { // CHECK:STDOUT: .A = file.%A.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/alias.carbon b/toolchain/check/testdata/namespace/alias.carbon index 11605ef10ad4..c45548fcd18b 100644 --- a/toolchain/check/testdata/namespace/alias.carbon +++ b/toolchain/check/testdata/namespace/alias.carbon @@ -29,7 +29,7 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: %A: %A.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -43,8 +43,8 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon index fdc50b8f273b..cbd8825a0ed5 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon @@ -76,8 +76,8 @@ fn NS(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: = import_ref Example//namespace, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref, [template] {} +// CHECK:STDOUT: %Example.NS: = import_ref Example//namespace, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Example.NS, [template] {} // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon index 34273c6cc0ee..b9f1652796f2 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon @@ -60,8 +60,8 @@ fn NS.Foo(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: = import_ref Example//namespace, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref, [template] { +// CHECK:STDOUT: %Example.NS: = import_ref Example//namespace, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Example.NS, [template] { // CHECK:STDOUT: .Foo = file.%Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon index 7a991a124b17..6c62fcc57c74 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_nested.carbon @@ -68,8 +68,8 @@ fn Other.Nested.F(); // CHECK:STDOUT: .Nested = %Nested // CHECK:STDOUT: import Other//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: = import_ref Other//default, Nested, loaded -// CHECK:STDOUT: %Nested: = namespace %import_ref, [template] { +// CHECK:STDOUT: %Other.Nested: = import_ref Other//default, Nested, loaded +// CHECK:STDOUT: %Nested: = namespace %Other.Nested, [template] { // CHECK:STDOUT: .F = file.%F.decl // CHECK:STDOUT: import Other//default // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon index 557b53a3b2e8..c8de8a50f459 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon @@ -75,7 +75,7 @@ fn NS.Foo(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %NS.type = import_ref Example//fn, NS, loaded [template = constants.%NS] +// CHECK:STDOUT: %Example.NS: %NS.type = import_ref Example//fn, NS, loaded [template = constants.%NS] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -84,7 +84,7 @@ fn NS.Foo(); // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .NS = imports.%import_ref +// CHECK:STDOUT: .NS = imports.%Example.NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon index efe90a96d9d2..aefdee3bd713 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon @@ -106,9 +106,9 @@ fn NS.Bar() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Example//namespace, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .Foo = %import_ref.32e +// CHECK:STDOUT: %Example.NS: = import_ref Example//namespace, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Example.NS, [template] { +// CHECK:STDOUT: .Foo = %Example.Foo // CHECK:STDOUT: .Bar = file.%Bar.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon index d8b44b7b1a85..0986a5615190 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon @@ -106,9 +106,9 @@ fn NS.Bar() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Example//namespace, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .Foo = %import_ref.32e +// CHECK:STDOUT: %Example.NS.d58: = import_ref Example//namespace, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Example.NS.d58, [template] { +// CHECK:STDOUT: .Foo = %Example.Foo // CHECK:STDOUT: .Bar = file.%Bar.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { diff --git a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon index 8753b7466cc1..ce1bbc405875 100644 --- a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon +++ b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon @@ -31,7 +31,7 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: %.d85: %.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -41,8 +41,8 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_params.carbon b/toolchain/check/testdata/namespace/fail_params.carbon index 5bc1b7dc4c2e..cf775be6b6a1 100644 --- a/toolchain/check/testdata/namespace/fail_params.carbon +++ b/toolchain/check/testdata/namespace/fail_params.carbon @@ -54,7 +54,7 @@ fn D(T:! type).F() {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index b17c955f621c..329f0eae6a80 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -76,17 +76,17 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Implicit//default, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .A = %import_ref.e9b +// CHECK:STDOUT: %Implicit.NS: = import_ref Implicit//default, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Implicit.NS, [template] { +// CHECK:STDOUT: .A = %Implicit.A // CHECK:STDOUT: .ChildNS = %ChildNS // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.e9b: %A.type = import_ref Implicit//default, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.e9d: = import_ref Implicit//default, ChildNS, loaded -// CHECK:STDOUT: %ChildNS: = namespace %import_ref.e9d, [template] { -// CHECK:STDOUT: .B = %import_ref.f00 +// CHECK:STDOUT: %Implicit.A: %A.type = import_ref Implicit//default, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Implicit.ChildNS: = import_ref Implicit//default, ChildNS, loaded +// CHECK:STDOUT: %ChildNS: = namespace %Implicit.ChildNS, [template] { +// CHECK:STDOUT: .B = %Implicit.B // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f00: %B.type = import_ref Implicit//default, B, loaded [template = constants.%B] +// CHECK:STDOUT: %Implicit.B: %B.type = import_ref Implicit//default, B, loaded [template = constants.%B] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -154,23 +154,23 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %NS.ref.loc4: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %A.ref.loc4: %A.type = name_ref A, imports.%import_ref.e9b [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc4: %A.type = name_ref A, imports.%Implicit.A [template = constants.%A] // CHECK:STDOUT: %A.call.loc4: init %empty_tuple.type = call %A.ref.loc4() // CHECK:STDOUT: assign file.%a.var, %A.call.loc4 // CHECK:STDOUT: %NS.ref.loc5: = name_ref NS, imports.%NS [template = imports.%NS] // CHECK:STDOUT: %ChildNS.ref.loc5: = name_ref ChildNS, imports.%ChildNS [template = imports.%ChildNS] -// CHECK:STDOUT: %B.ref.loc5: %B.type = name_ref B, imports.%import_ref.f00 [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc5: %B.type = name_ref B, imports.%Implicit.B [template = constants.%B] // CHECK:STDOUT: %B.call.loc5: init %empty_tuple.type = call %B.ref.loc5() // CHECK:STDOUT: assign file.%b.var, %B.call.loc5 // CHECK:STDOUT: %package.ref.loc7: = name_ref package, package [template = package] // CHECK:STDOUT: %NS.ref.loc7: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %A.ref.loc7: %A.type = name_ref A, imports.%import_ref.e9b [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc7: %A.type = name_ref A, imports.%Implicit.A [template = constants.%A] // CHECK:STDOUT: %A.call.loc7: init %empty_tuple.type = call %A.ref.loc7() // CHECK:STDOUT: assign file.%package_a.var, %A.call.loc7 // CHECK:STDOUT: %package.ref.loc8: = name_ref package, package [template = package] // CHECK:STDOUT: %NS.ref.loc8: = name_ref NS, imports.%NS [template = imports.%NS] // CHECK:STDOUT: %ChildNS.ref.loc8: = name_ref ChildNS, imports.%ChildNS [template = imports.%ChildNS] -// CHECK:STDOUT: %B.ref.loc8: %B.type = name_ref B, imports.%import_ref.f00 [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc8: %B.type = name_ref B, imports.%Implicit.B [template = constants.%B] // CHECK:STDOUT: %B.call.loc8: init %empty_tuple.type = call %B.ref.loc8() // CHECK:STDOUT: assign file.%package_b.var, %B.call.loc8 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index 4ffe6a07daf9..c51a42633d8c 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -124,12 +124,12 @@ fn G() { Same.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.7e6: = import_ref Same//a, A, loaded -// CHECK:STDOUT: %A: = namespace %import_ref.7e6, [template] { -// CHECK:STDOUT: .C = %import_ref.711 +// CHECK:STDOUT: %Same.A: = import_ref Same//a, A, loaded +// CHECK:STDOUT: %A: = namespace %Same.A, [template] { +// CHECK:STDOUT: .C = %Same.C // CHECK:STDOUT: .B = file.%B // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.711: type = import_ref Same//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Same.C: type = import_ref Same//a, C, loaded [template = constants.%C] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -150,7 +150,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: %return.param_patt: %C = out_param_pattern %return.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %A.ref: = name_ref A, imports.%A [template = imports.%A] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.711 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Same.C [template = constants.%C] // CHECK:STDOUT: %return.param: ref %C = out_param runtime_param0 // CHECK:STDOUT: %return: ref %C = return_slot %return.param // CHECK:STDOUT: } @@ -163,11 +163,11 @@ fn G() { Same.F(); } // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.de6: = import_ref Same//b, A, loaded -// CHECK:STDOUT: %A: = namespace %import_ref.de6, [template] { +// CHECK:STDOUT: %Same.A: = import_ref Same//b, A, loaded +// CHECK:STDOUT: %A: = namespace %Same.A, [template] { // CHECK:STDOUT: .B = %B // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.bde = import_ref Same//b, F, unloaded +// CHECK:STDOUT: %Same.F = import_ref Same//b, F, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -177,7 +177,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = imports.%A -// CHECK:STDOUT: .F = imports.%import_ref.bde +// CHECK:STDOUT: .F = imports.%Same.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -193,8 +193,8 @@ fn G() { Same.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.bb7: = import_ref Same//c, A, loaded -// CHECK:STDOUT: %A: = namespace %import_ref.bb7, [template] { +// CHECK:STDOUT: %Same.A: = import_ref Same//c, A, loaded +// CHECK:STDOUT: %A: = namespace %Same.A, [template] { // CHECK:STDOUT: .B = %B // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { @@ -227,19 +227,19 @@ fn G() { Same.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b75: = import_ref Same//d, A, loaded -// CHECK:STDOUT: %A: = namespace %import_ref.b75, [template] { +// CHECK:STDOUT: %Same.A: = import_ref Same//d, A, loaded +// CHECK:STDOUT: %A: = namespace %Same.A, [template] { // CHECK:STDOUT: .B = %B // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.153: = import_ref Same//d, B, loaded -// CHECK:STDOUT: %B: = namespace %import_ref.153, [template] { +// CHECK:STDOUT: %Same.B: = import_ref Same//d, B, loaded +// CHECK:STDOUT: %B: = namespace %Same.B, [template] { // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.cee: = import_ref Same//d, C, loaded -// CHECK:STDOUT: %C: = namespace %import_ref.cee, [template] { -// CHECK:STDOUT: .D = %import_ref.293 +// CHECK:STDOUT: %Same.C: = import_ref Same//d, C, loaded +// CHECK:STDOUT: %C: = namespace %Same.C, [template] { +// CHECK:STDOUT: .D = %Same.D // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.293: %D.type = import_ref Same//d, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Same.D: %D.type = import_ref Same//d, D, loaded [template = constants.%D] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -273,7 +273,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: %A.ref: = name_ref A, imports.%A [template = imports.%A] // CHECK:STDOUT: %B.ref: = name_ref B, imports.%B [template = imports.%B] // CHECK:STDOUT: %C.ref: = name_ref C, imports.%C [template = imports.%C] -// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%import_ref.293 [template = constants.%D] +// CHECK:STDOUT: %D.ref: %D.type = name_ref D, imports.%Same.D [template = constants.%D] // CHECK:STDOUT: %D.call: init %empty_tuple.type = call %D.ref() // CHECK:STDOUT: assign file.%e.var, %D.call // CHECK:STDOUT: return @@ -290,11 +290,11 @@ fn G() { Same.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.de6: = import_ref Same//b, A, loaded -// CHECK:STDOUT: %A: = namespace %import_ref.de6, [template] { +// CHECK:STDOUT: %Same.A: = import_ref Same//b, A, loaded +// CHECK:STDOUT: %A: = namespace %Same.A, [template] { // CHECK:STDOUT: .B = %B // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Same//b, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Same.F: %F.type = import_ref Same//b, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -304,7 +304,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = imports.%A -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .F = imports.%Same.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } @@ -317,7 +317,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Same.F [template = constants.%F] // CHECK:STDOUT: %F.call: init = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -340,10 +340,10 @@ fn G() { Same.F(); } // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Same: = namespace file.%Same.import, [template] { -// CHECK:STDOUT: .F = %import_ref +// CHECK:STDOUT: .F = %Same.F // CHECK:STDOUT: import Same//b // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: %F.type = import_ref Same//b, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Same.F: %F.type = import_ref Same//b, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -362,7 +362,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: fn @G() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Same.ref: = name_ref Same, imports.%Same [template = imports.%Same] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Same.F [template = constants.%F] // CHECK:STDOUT: %F.call: init = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/merging.carbon b/toolchain/check/testdata/namespace/merging.carbon index 72bea80a31c6..bf921fcaa180 100644 --- a/toolchain/check/testdata/namespace/merging.carbon +++ b/toolchain/check/testdata/namespace/merging.carbon @@ -138,16 +138,16 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Example//a, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .A = %import_ref.e9b -// CHECK:STDOUT: .B1 = %import_ref.7c2 -// CHECK:STDOUT: .B2 = %import_ref.531 +// CHECK:STDOUT: %Example.NS: = import_ref Example//a, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Example.NS, [template] { +// CHECK:STDOUT: .A = %Example.A +// CHECK:STDOUT: .B1 = %Example.B1 +// CHECK:STDOUT: .B2 = %Example.B2 // CHECK:STDOUT: .C = file.%C.decl // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.e9b: %A.type = import_ref Example//a, A, loaded [template = constants.%A] -// CHECK:STDOUT: %import_ref.7c2: %B1.type = import_ref Example//b, B1, loaded [template = constants.%B1] -// CHECK:STDOUT: %import_ref.531: %B2.type = import_ref Example//b, B2, loaded [template = constants.%B2] +// CHECK:STDOUT: %Example.A: %A.type = import_ref Example//a, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Example.B1: %B1.type = import_ref Example//b, B1, loaded [template = constants.%B1] +// CHECK:STDOUT: %Example.B2: %B2.type = import_ref Example//b, B2, loaded [template = constants.%B2] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -163,9 +163,9 @@ fn Run() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %NS: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.e9b -// CHECK:STDOUT: .B1 = imports.%import_ref.7c2 -// CHECK:STDOUT: .B2 = imports.%import_ref.531 +// CHECK:STDOUT: .A = imports.%Example.A +// CHECK:STDOUT: .B1 = imports.%Example.B1 +// CHECK:STDOUT: .B2 = imports.%Example.B2 // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] {} {} @@ -180,13 +180,13 @@ fn Run() { // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %NS.ref.loc12: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%import_ref.e9b [template = constants.%A] +// CHECK:STDOUT: %A.ref: %A.type = name_ref A, imports.%Example.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref() // CHECK:STDOUT: %NS.ref.loc13: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %B1.ref: %B1.type = name_ref B1, imports.%import_ref.7c2 [template = constants.%B1] +// CHECK:STDOUT: %B1.ref: %B1.type = name_ref B1, imports.%Example.B1 [template = constants.%B1] // CHECK:STDOUT: %B1.call: init %empty_tuple.type = call %B1.ref() // CHECK:STDOUT: %NS.ref.loc14: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %B2.ref: %B2.type = name_ref B2, imports.%import_ref.531 [template = constants.%B2] +// CHECK:STDOUT: %B2.ref: %B2.type = name_ref B2, imports.%Example.B2 [template = constants.%B2] // CHECK:STDOUT: %B2.call: init %empty_tuple.type = call %B2.ref() // CHECK:STDOUT: %NS.ref.loc15: = name_ref NS, imports.%NS [template = imports.%NS] // CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C] diff --git a/toolchain/check/testdata/namespace/merging_with_indirections.carbon b/toolchain/check/testdata/namespace/merging_with_indirections.carbon index 7334315a1480..dfefa544fee2 100644 --- a/toolchain/check/testdata/namespace/merging_with_indirections.carbon +++ b/toolchain/check/testdata/namespace/merging_with_indirections.carbon @@ -89,18 +89,18 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.503: = import_ref Other//a, NS1, loaded -// CHECK:STDOUT: %NS1: = namespace %import_ref.503, [template] { -// CHECK:STDOUT: .A = %import_ref.257 +// CHECK:STDOUT: %Other.NS1: = import_ref Other//a, NS1, loaded +// CHECK:STDOUT: %NS1: = namespace %Other.NS1, [template] { +// CHECK:STDOUT: .A = %Other.A // CHECK:STDOUT: .B = file.%B.decl // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.257: type = import_ref Other//a, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Other.A: type = import_ref Other//a, A, loaded [template = constants.%A] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Other//a, loc5_14, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.ca8 = import_ref Other//a, inst17 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.8f2: = import_ref Other//a, loc5_14, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.ca8 = import_ref Other//a, inst17 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -112,7 +112,7 @@ fn Run() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %NS1: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref.257 +// CHECK:STDOUT: .A = imports.%Other.A // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} {} @@ -121,7 +121,7 @@ fn Run() { // CHECK:STDOUT: %return.param_patt: %A = out_param_pattern %return.patt, runtime_param0 // CHECK:STDOUT: } { // CHECK:STDOUT: %NS1.ref: = name_ref NS1, imports.%NS1 [template = imports.%NS1] -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.257 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Other.A [template = constants.%A] // CHECK:STDOUT: %return.param: ref %A = out_param runtime_param0 // CHECK:STDOUT: %return: ref %A = return_slot %return.param // CHECK:STDOUT: } @@ -136,10 +136,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ca8 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.ca8 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return.param_patt: %A { @@ -168,21 +168,21 @@ fn Run() { // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .F = %import_ref.f04 +// CHECK:STDOUT: .F = %Other.F // CHECK:STDOUT: .NS1 = %NS1 // CHECK:STDOUT: import Other//b // CHECK:STDOUT: import Other//a // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f04: %F.type = import_ref Other//b, F, loaded [template = constants.%F] -// CHECK:STDOUT: %import_ref.8db: = import_ref Other//b, inst28 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.bbd = import_ref Other//b, inst29 [indirect], unloaded -// CHECK:STDOUT: %import_ref.a85: = import_ref Other//b, NS1, loaded -// CHECK:STDOUT: %NS1: = namespace %import_ref.a85, [template] { -// CHECK:STDOUT: .A = %import_ref.257 +// CHECK:STDOUT: %Other.F: %F.type = import_ref Other//b, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Other.import_ref.8db: = import_ref Other//b, inst28 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.bbd = import_ref Other//b, inst29 [indirect], unloaded +// CHECK:STDOUT: %Other.NS1: = import_ref Other//b, NS1, loaded +// CHECK:STDOUT: %NS1: = namespace %Other.NS1, [template] { +// CHECK:STDOUT: .A = %Other.A // CHECK:STDOUT: import Other//b // CHECK:STDOUT: import Other//a // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.257: type = import_ref Other//a, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Other.A: type = import_ref Other//a, A, loaded [template = constants.%A] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -197,16 +197,16 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A [from "b.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8db +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8db // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.bbd +// CHECK:STDOUT: .Self = imports.%Other.import_ref.bbd // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Other.ref.loc7: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F.ref.loc7: %F.type = name_ref F, imports.%import_ref.f04 [template = constants.%F] +// CHECK:STDOUT: %F.ref.loc7: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %.loc7_11.1: ref %A = temporary_storage // CHECK:STDOUT: %F.call.loc7: init %A = call %F.ref.loc7() to %.loc7_11.1 // CHECK:STDOUT: %.loc7_11.2: ref %A = temporary %.loc7_11.1, %F.call.loc7 @@ -218,12 +218,12 @@ fn Run() { // CHECK:STDOUT: %.loc10_19: type = splice_block %A.ref [template = constants.%A] { // CHECK:STDOUT: %Other.ref.loc10: = name_ref Other, imports.%Other [template = imports.%Other] // CHECK:STDOUT: %NS1.ref: = name_ref NS1, imports.%NS1 [template = imports.%NS1] -// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.257 [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Other.A [template = constants.%A] // CHECK:STDOUT: } // CHECK:STDOUT: %a: ref %A = bind_name a, %a.var // CHECK:STDOUT: %a.ref: ref %A = name_ref a, %a // CHECK:STDOUT: %Other.ref.loc13: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F.ref.loc13: %F.type = name_ref F, imports.%import_ref.f04 [template = constants.%F] +// CHECK:STDOUT: %F.ref.loc13: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %.loc13: ref %A = splice_block %a.ref {} // CHECK:STDOUT: %F.call.loc13: init %A = call %F.ref.loc13() to %.loc13 // CHECK:STDOUT: assign %a.ref, %F.call.loc13 diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 06b3ddb8d27f..a472d345879f 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -42,7 +42,7 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: %true: bool = bool_literal true [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -52,8 +52,8 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/and.carbon b/toolchain/check/testdata/operators/builtin/and.carbon index 03569c5002bc..6ccc1b6e8fc2 100644 --- a/toolchain/check/testdata/operators/builtin/and.carbon +++ b/toolchain/check/testdata/operators/builtin/and.carbon @@ -49,7 +49,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/assignment.carbon b/toolchain/check/testdata/operators/builtin/assignment.carbon index 78b52f9d6d54..1ba7b2ead7c2 100644 --- a/toolchain/check/testdata/operators/builtin/assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/assignment.carbon @@ -35,7 +35,7 @@ fn Main() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_12.6a3: Core.IntLiteral = int_value 12 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -83,8 +83,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon b/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon index bb502a7adaca..88f0e5672e1c 100644 --- a/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_and_or_not_in_function.carbon @@ -84,9 +84,9 @@ var or_val: bool = true or true; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon b/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon index 4600adead174..053f6a919c1a 100644 --- a/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_and_or_partial_constant.carbon @@ -58,7 +58,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -178,7 +178,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon index bcfc901a037f..900f7a3b98e7 100644 --- a/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_assignment_to_non_assignable.carbon @@ -69,7 +69,7 @@ fn Main() { // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -105,8 +105,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon index 84cfaa0c2461..10211469cabc 100644 --- a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon @@ -33,7 +33,7 @@ fn Main() { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -49,8 +49,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon index 22f01816007d..9eba5cb0aed7 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon @@ -31,8 +31,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon index afb8f98a31dc..773a8f912fc8 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon @@ -29,7 +29,7 @@ fn Main() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_3.1ba, %Convert.956 [template] @@ -40,8 +40,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon index 91dc89990883..ac2b64ff6565 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon @@ -33,8 +33,8 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Add = %import_ref.fe6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Add = %Core.Add // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon b/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon index cb64b68f63e2..c95e737dbe20 100644 --- a/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon @@ -29,8 +29,8 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Add = %import_ref.fe6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Add = %Core.Add // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/or.carbon b/toolchain/check/testdata/operators/builtin/or.carbon index 79299b89cb15..7f849e7e88a9 100644 --- a/toolchain/check/testdata/operators/builtin/or.carbon +++ b/toolchain/check/testdata/operators/builtin/or.carbon @@ -49,7 +49,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/builtin/unary_op.carbon b/toolchain/check/testdata/operators/builtin/unary_op.carbon index 16f6af713b72..753fb0d9d3b5 100644 --- a/toolchain/check/testdata/operators/builtin/unary_op.carbon +++ b/toolchain/check/testdata/operators/builtin/unary_op.carbon @@ -37,7 +37,7 @@ fn Constant() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/add.carbon b/toolchain/check/testdata/operators/overloaded/add.carbon index 9e2ceb3ef524..550917beed29 100644 --- a/toolchain/check/testdata/operators/overloaded/add.carbon +++ b/toolchain/check/testdata/operators/overloaded/add.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Add = %import_ref.fe6 -// CHECK:STDOUT: .AddAssign = %import_ref.e1b +// CHECK:STDOUT: .Add = %Core.Add +// CHECK:STDOUT: .AddAssign = %Core.AddAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.fe6: type = import_ref Core//prelude/operators/arithmetic, Add, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.e1b: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] +// CHECK:STDOUT: %Core.Add: type = import_ref Core//prelude/operators/arithmetic, Add, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Core.AddAssign: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.fe6 [template = constants.%Add.type] +// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%Core.Add [template = constants.%Add.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.796] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%import_ref.e1b [template = constants.%AddAssign.type] +// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%Core.AddAssign [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.95d] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/bit_and.carbon b/toolchain/check/testdata/operators/overloaded/bit_and.carbon index bbd86f1943b9..2070389800a1 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_and.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_and.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .BitAnd = %import_ref.b14 -// CHECK:STDOUT: .BitAndAssign = %import_ref.d81 +// CHECK:STDOUT: .BitAnd = %Core.BitAnd +// CHECK:STDOUT: .BitAndAssign = %Core.BitAndAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b14: type = import_ref Core//prelude/operators/bitwise, BitAnd, loaded [template = constants.%BitAnd.type] -// CHECK:STDOUT: %import_ref.d81: type = import_ref Core//prelude/operators/bitwise, BitAndAssign, loaded [template = constants.%BitAndAssign.type] +// CHECK:STDOUT: %Core.BitAnd: type = import_ref Core//prelude/operators/bitwise, BitAnd, loaded [template = constants.%BitAnd.type] +// CHECK:STDOUT: %Core.BitAndAssign: type = import_ref Core//prelude/operators/bitwise, BitAndAssign, loaded [template = constants.%BitAndAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitAnd.ref: type = name_ref BitAnd, imports.%import_ref.b14 [template = constants.%BitAnd.type] +// CHECK:STDOUT: %BitAnd.ref: type = name_ref BitAnd, imports.%Core.BitAnd [template = constants.%BitAnd.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.5af] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitAndAssign.ref: type = name_ref BitAndAssign, imports.%import_ref.d81 [template = constants.%BitAndAssign.type] +// CHECK:STDOUT: %BitAndAssign.ref: type = name_ref BitAndAssign, imports.%Core.BitAndAssign [template = constants.%BitAndAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.762] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon index c0e579bda95d..7c4bb298286b 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon @@ -42,11 +42,11 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .BitComplement = %import_ref.009 +// CHECK:STDOUT: .BitComplement = %Core.BitComplement // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.009: type = import_ref Core//prelude/operators/bitwise, BitComplement, loaded [template = constants.%BitComplement.type] +// CHECK:STDOUT: %Core.BitComplement: type = import_ref Core//prelude/operators/bitwise, BitComplement, loaded [template = constants.%BitComplement.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -60,7 +60,7 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitComplement.ref: type = name_ref BitComplement, imports.%import_ref.009 [template = constants.%BitComplement.type] +// CHECK:STDOUT: %BitComplement.ref: type = name_ref BitComplement, imports.%Core.BitComplement [template = constants.%BitComplement.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/bit_or.carbon b/toolchain/check/testdata/operators/overloaded/bit_or.carbon index 17d162d4abb5..823b4504771c 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_or.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_or.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .BitOr = %import_ref.8fa -// CHECK:STDOUT: .BitOrAssign = %import_ref.545 +// CHECK:STDOUT: .BitOr = %Core.BitOr +// CHECK:STDOUT: .BitOrAssign = %Core.BitOrAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8fa: type = import_ref Core//prelude/operators/bitwise, BitOr, loaded [template = constants.%BitOr.type] -// CHECK:STDOUT: %import_ref.545: type = import_ref Core//prelude/operators/bitwise, BitOrAssign, loaded [template = constants.%BitOrAssign.type] +// CHECK:STDOUT: %Core.BitOr: type = import_ref Core//prelude/operators/bitwise, BitOr, loaded [template = constants.%BitOr.type] +// CHECK:STDOUT: %Core.BitOrAssign: type = import_ref Core//prelude/operators/bitwise, BitOrAssign, loaded [template = constants.%BitOrAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitOr.ref: type = name_ref BitOr, imports.%import_ref.8fa [template = constants.%BitOr.type] +// CHECK:STDOUT: %BitOr.ref: type = name_ref BitOr, imports.%Core.BitOr [template = constants.%BitOr.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.e68] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitOrAssign.ref: type = name_ref BitOrAssign, imports.%import_ref.545 [template = constants.%BitOrAssign.type] +// CHECK:STDOUT: %BitOrAssign.ref: type = name_ref BitOrAssign, imports.%Core.BitOrAssign [template = constants.%BitOrAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.85b] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon index 1d7815127abf..2380489b23b0 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .BitXor = %import_ref.73c -// CHECK:STDOUT: .BitXorAssign = %import_ref.9b8d +// CHECK:STDOUT: .BitXor = %Core.BitXor +// CHECK:STDOUT: .BitXorAssign = %Core.BitXorAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.73c: type = import_ref Core//prelude/operators/bitwise, BitXor, loaded [template = constants.%BitXor.type] -// CHECK:STDOUT: %import_ref.9b8d: type = import_ref Core//prelude/operators/bitwise, BitXorAssign, loaded [template = constants.%BitXorAssign.type] +// CHECK:STDOUT: %Core.BitXor: type = import_ref Core//prelude/operators/bitwise, BitXor, loaded [template = constants.%BitXor.type] +// CHECK:STDOUT: %Core.BitXorAssign: type = import_ref Core//prelude/operators/bitwise, BitXorAssign, loaded [template = constants.%BitXorAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitXor.ref: type = name_ref BitXor, imports.%import_ref.73c [template = constants.%BitXor.type] +// CHECK:STDOUT: %BitXor.ref: type = name_ref BitXor, imports.%Core.BitXor [template = constants.%BitXor.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.01d] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %BitXorAssign.ref: type = name_ref BitXorAssign, imports.%import_ref.9b8d [template = constants.%BitXorAssign.type] +// CHECK:STDOUT: %BitXorAssign.ref: type = name_ref BitXorAssign, imports.%Core.BitXorAssign [template = constants.%BitXorAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.8dc] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/dec.carbon b/toolchain/check/testdata/operators/overloaded/dec.carbon index 0884a448c1c0..9af3b45f1cfc 100644 --- a/toolchain/check/testdata/operators/overloaded/dec.carbon +++ b/toolchain/check/testdata/operators/overloaded/dec.carbon @@ -43,11 +43,11 @@ fn TestOp() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Dec = %import_ref.64d +// CHECK:STDOUT: .Dec = %Core.Dec // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.64d: type = import_ref Core//prelude/operators/arithmetic, Dec, loaded [template = constants.%Dec.type] +// CHECK:STDOUT: %Core.Dec: type = import_ref Core//prelude/operators/arithmetic, Dec, loaded [template = constants.%Dec.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -61,7 +61,7 @@ fn TestOp() { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Dec.ref: type = name_ref Dec, imports.%import_ref.64d [template = constants.%Dec.type] +// CHECK:STDOUT: %Dec.ref: type = name_ref Dec, imports.%Core.Dec [template = constants.%Dec.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] {} {} diff --git a/toolchain/check/testdata/operators/overloaded/div.carbon b/toolchain/check/testdata/operators/overloaded/div.carbon index 2e20f873226f..63e8c9d6b5f7 100644 --- a/toolchain/check/testdata/operators/overloaded/div.carbon +++ b/toolchain/check/testdata/operators/overloaded/div.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Div = %import_ref.abc -// CHECK:STDOUT: .DivAssign = %import_ref.ed3 +// CHECK:STDOUT: .Div = %Core.Div +// CHECK:STDOUT: .DivAssign = %Core.DivAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.abc: type = import_ref Core//prelude/operators/arithmetic, Div, loaded [template = constants.%Div.type] -// CHECK:STDOUT: %import_ref.ed3: type = import_ref Core//prelude/operators/arithmetic, DivAssign, loaded [template = constants.%DivAssign.type] +// CHECK:STDOUT: %Core.Div: type = import_ref Core//prelude/operators/arithmetic, Div, loaded [template = constants.%Div.type] +// CHECK:STDOUT: %Core.DivAssign: type = import_ref Core//prelude/operators/arithmetic, DivAssign, loaded [template = constants.%DivAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Div.ref: type = name_ref Div, imports.%import_ref.abc [template = constants.%Div.type] +// CHECK:STDOUT: %Div.ref: type = name_ref Div, imports.%Core.Div [template = constants.%Div.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.745] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %DivAssign.ref: type = name_ref DivAssign, imports.%import_ref.ed3 [template = constants.%DivAssign.type] +// CHECK:STDOUT: %DivAssign.ref: type = name_ref DivAssign, imports.%Core.DivAssign [template = constants.%DivAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.d13] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/eq.carbon b/toolchain/check/testdata/operators/overloaded/eq.carbon index 2ca2706bc8ca..be99afcba89b 100644 --- a/toolchain/check/testdata/operators/overloaded/eq.carbon +++ b/toolchain/check/testdata/operators/overloaded/eq.carbon @@ -107,12 +107,12 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Eq = %import_ref.822 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Eq = %Core.Eq +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.822: type = import_ref Core//prelude/operators/comparison, Eq, loaded [template = constants.%Eq.type] +// CHECK:STDOUT: %Core.Eq: type = import_ref Core//prelude/operators/comparison, Eq, loaded [template = constants.%Eq.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -127,7 +127,7 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Eq.ref: type = name_ref Eq, imports.%import_ref.822 [template = constants.%Eq.type] +// CHECK:STDOUT: %Eq.ref: type = name_ref Eq, imports.%Core.Eq [template = constants.%Eq.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Equal.decl, @impl.1.%NotEqual.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestEqual.decl: %TestEqual.type = fn_decl @TestEqual [template = constants.%TestEqual] { @@ -272,8 +272,8 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Eq = %import_ref.822 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Eq = %Core.Eq // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -376,13 +376,13 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Eq = %import_ref.822 -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Eq = %Core.Eq +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.822: type = import_ref Core//prelude/operators/comparison, Eq, loaded [template = constants.%Eq.type] +// CHECK:STDOUT: %Core.Eq: type = import_ref Core//prelude/operators/comparison, Eq, loaded [template = constants.%Eq.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -399,7 +399,7 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Eq.ref: type = name_ref Eq, imports.%import_ref.822 [template = constants.%Eq.type] +// CHECK:STDOUT: %Eq.ref: type = name_ref Eq, imports.%Core.Eq [template = constants.%Eq.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Equal.decl, @impl.1.%NotEqual.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestRhsBad.decl: %TestRhsBad.type = fn_decl @TestRhsBad [template = constants.%TestRhsBad] { 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 c33481ba2866..9eb7eceef5e6 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon @@ -67,13 +67,13 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Inc = %import_ref.04f -// CHECK:STDOUT: .AddAssign = %import_ref.e1b +// CHECK:STDOUT: .Inc = %Core.Inc +// CHECK:STDOUT: .AddAssign = %Core.AddAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.04f: type = import_ref Core//prelude/operators/arithmetic, Inc, loaded [template = constants.%Inc.type] -// CHECK:STDOUT: %import_ref.e1b: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] +// CHECK:STDOUT: %Core.Inc: type = import_ref Core//prelude/operators/arithmetic, Inc, loaded [template = constants.%Inc.type] +// CHECK:STDOUT: %Core.AddAssign: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -88,13 +88,13 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Inc.ref: type = name_ref Inc, imports.%import_ref.04f [template = constants.%Inc.type] +// CHECK:STDOUT: %Inc.ref: type = name_ref Inc, imports.%Core.Inc [template = constants.%Inc.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc15: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.ec3] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%import_ref.e1b [template = constants.%AddAssign.type] +// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%Core.AddAssign [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc18: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.95d] // CHECK:STDOUT: %TestIncNonRef.decl: %TestIncNonRef.type = fn_decl @TestIncNonRef [template = constants.%TestIncNonRef] { diff --git a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon index d2d4358780ab..1d05861b18ee 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_error_recovery.carbon @@ -38,15 +38,15 @@ fn G(n: i32) { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %G.type: type = fn_type @G [template] // CHECK:STDOUT: %G: %G.type = struct_value () [template] -// CHECK:STDOUT: %impl_witness.01d: = impl_witness (imports.%import_ref.344), @impl.14(%int_32) [template] +// CHECK:STDOUT: %impl_witness.01d: = impl_witness (imports.%Core.import_ref.344), @impl.14(%int_32) [template] // CHECK:STDOUT: %Op.type.210: type = fn_type @Op.2, @impl.14(%int_32) [template] // CHECK:STDOUT: %Op.c82: %Op.type.210 = struct_value () [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Add = %import_ref.fe6 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Add = %Core.Add +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon index 92a708395aad..d8aa18095437 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon @@ -59,10 +59,10 @@ fn TestRef(b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Negate = %import_ref.6e9 -// CHECK:STDOUT: .Add = %import_ref.fe6 -// CHECK:STDOUT: .AddAssign = %import_ref.e1b -// CHECK:STDOUT: .Inc = %import_ref.04f +// CHECK:STDOUT: .Negate = %Core.Negate +// CHECK:STDOUT: .Add = %Core.Add +// CHECK:STDOUT: .AddAssign = %Core.AddAssign +// CHECK:STDOUT: .Inc = %Core.Inc // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } 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 f2800e314c41..60f3be5b28f4 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 @@ -77,14 +77,14 @@ fn TestAssign(b: D) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Add = %import_ref.fe6 -// CHECK:STDOUT: .AddAssign = %import_ref.e1b -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Add = %Core.Add +// CHECK:STDOUT: .AddAssign = %Core.AddAssign +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.fe6: type = import_ref Core//prelude/operators/arithmetic, Add, loaded [template = constants.%Add.type] -// CHECK:STDOUT: %import_ref.e1b: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] +// CHECK:STDOUT: %Core.Add: type = import_ref Core//prelude/operators/arithmetic, Add, loaded [template = constants.%Add.type] +// CHECK:STDOUT: %Core.AddAssign: type = import_ref Core//prelude/operators/arithmetic, AddAssign, loaded [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -101,13 +101,13 @@ fn TestAssign(b: D) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.fe6 [template = constants.%Add.type] +// CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%Core.Add [template = constants.%Add.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc16: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.796] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%import_ref.e1b [template = constants.%AddAssign.type] +// CHECK:STDOUT: %AddAssign.ref: type = name_ref AddAssign, imports.%Core.AddAssign [template = constants.%AddAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc19: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.95d] // CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [template = constants.%Test] { diff --git a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon index 58e26a58977f..f78f74a23c3a 100644 --- a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon +++ b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon @@ -73,12 +73,12 @@ fn Test() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.d44: %ImplicitAs.type.cc7 = import_ref Core//prelude/operators/as, ImplicitAs, loaded [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.cc7 = import_ref Core//prelude/operators/as, ImplicitAs, loaded [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -96,7 +96,7 @@ fn Test() { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%X)> [template = constants.%ImplicitAs.type.ac8] // CHECK:STDOUT: } @@ -104,7 +104,7 @@ fn Test() { // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%i32)> [template = constants.%ImplicitAs.type.205] diff --git a/toolchain/check/testdata/operators/overloaded/inc.carbon b/toolchain/check/testdata/operators/overloaded/inc.carbon index 513bedeec654..6da3386851b9 100644 --- a/toolchain/check/testdata/operators/overloaded/inc.carbon +++ b/toolchain/check/testdata/operators/overloaded/inc.carbon @@ -43,11 +43,11 @@ fn TestOp() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Inc = %import_ref.04f +// CHECK:STDOUT: .Inc = %Core.Inc // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.04f: type = import_ref Core//prelude/operators/arithmetic, Inc, loaded [template = constants.%Inc.type] +// CHECK:STDOUT: %Core.Inc: type = import_ref Core//prelude/operators/arithmetic, Inc, loaded [template = constants.%Inc.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -61,7 +61,7 @@ fn TestOp() { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Inc.ref: type = name_ref Inc, imports.%import_ref.04f [template = constants.%Inc.type] +// CHECK:STDOUT: %Inc.ref: type = name_ref Inc, imports.%Core.Inc [template = constants.%Inc.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] {} {} diff --git a/toolchain/check/testdata/operators/overloaded/index.carbon b/toolchain/check/testdata/operators/overloaded/index.carbon index 0925a7ec1b37..201dd04356b4 100644 --- a/toolchain/check/testdata/operators/overloaded/index.carbon +++ b/toolchain/check/testdata/operators/overloaded/index.carbon @@ -99,11 +99,11 @@ let x: i32 = c[0]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IndexWith = %import_ref.671 +// CHECK:STDOUT: .IndexWith = %Core.IndexWith // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.671: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %Core.IndexWith: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -123,7 +123,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%import_ref.671 [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%Core.IndexWith [template = constants.%IndexWith.generic] // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, file.%SubscriptType.decl [template = constants.%SubscriptType.8ee] // CHECK:STDOUT: %ElementType.ref: type = name_ref ElementType, file.%ElementType.decl [template = constants.%ElementType.e6b] // CHECK:STDOUT: %IndexWith.type: type = facet_type <@IndexWith, @IndexWith(constants.%SubscriptType.8ee, constants.%ElementType.e6b)> [template = constants.%IndexWith.type.e80] @@ -246,7 +246,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -263,13 +263,13 @@ let x: i32 = c[0]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .IndexWith = %import_ref.671 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .IndexWith = %Core.IndexWith +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.671: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %Core.IndexWith: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -287,7 +287,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: %.loc4_15.1: %tuple.type.24b = tuple_literal (%i32.loc4_7, %i32.loc4_12) // CHECK:STDOUT: %.loc4_15.2: type = converted %.loc4_15.1, constants.%tuple.type.d07 [template = constants.%tuple.type.d07] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%import_ref.671 [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%Core.IndexWith [template = constants.%IndexWith.generic] // CHECK:STDOUT: %int_32.loc4_35: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32.loc4_35: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %int_32.loc4_40: Core.IntLiteral = int_value 32 [template = constants.%int_32] @@ -411,12 +411,12 @@ let x: i32 = c[0]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IndexWith = %import_ref.671 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .IndexWith = %Core.IndexWith +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.671: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %Core.IndexWith: %IndexWith.type.504 = import_ref Core//prelude/operators/index, IndexWith, loaded [template = constants.%IndexWith.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -435,7 +435,7 @@ let x: i32 = c[0]; // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%import_ref.671 [template = constants.%IndexWith.generic] +// CHECK:STDOUT: %IndexWith.ref: %IndexWith.type.504 = name_ref IndexWith, imports.%Core.IndexWith [template = constants.%IndexWith.generic] // CHECK:STDOUT: %SubscriptType.ref: type = name_ref SubscriptType, file.%SubscriptType.decl [template = constants.%SubscriptType.8ee] // CHECK:STDOUT: %ElementType.ref: type = name_ref ElementType, file.%ElementType.decl [template = constants.%ElementType.e6b] // CHECK:STDOUT: %IndexWith.type: type = facet_type <@IndexWith, @IndexWith(constants.%SubscriptType.8ee, constants.%ElementType.e6b)> [template = constants.%IndexWith.type.e80] @@ -543,8 +543,8 @@ let x: i32 = c[0]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .IndexWith = %import_ref.671 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .IndexWith = %Core.IndexWith // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/left_shift.carbon b/toolchain/check/testdata/operators/overloaded/left_shift.carbon index cdc509ee7903..6f7856a9bfe2 100644 --- a/toolchain/check/testdata/operators/overloaded/left_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/left_shift.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .LeftShift = %import_ref.644 -// CHECK:STDOUT: .LeftShiftAssign = %import_ref.269 +// CHECK:STDOUT: .LeftShift = %Core.LeftShift +// CHECK:STDOUT: .LeftShiftAssign = %Core.LeftShiftAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.644: type = import_ref Core//prelude/operators/bitwise, LeftShift, loaded [template = constants.%LeftShift.type] -// CHECK:STDOUT: %import_ref.269: type = import_ref Core//prelude/operators/bitwise, LeftShiftAssign, loaded [template = constants.%LeftShiftAssign.type] +// CHECK:STDOUT: %Core.LeftShift: type = import_ref Core//prelude/operators/bitwise, LeftShift, loaded [template = constants.%LeftShift.type] +// CHECK:STDOUT: %Core.LeftShiftAssign: type = import_ref Core//prelude/operators/bitwise, LeftShiftAssign, loaded [template = constants.%LeftShiftAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %LeftShift.ref: type = name_ref LeftShift, imports.%import_ref.644 [template = constants.%LeftShift.type] +// CHECK:STDOUT: %LeftShift.ref: type = name_ref LeftShift, imports.%Core.LeftShift [template = constants.%LeftShift.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.df4] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %LeftShiftAssign.ref: type = name_ref LeftShiftAssign, imports.%import_ref.269 [template = constants.%LeftShiftAssign.type] +// CHECK:STDOUT: %LeftShiftAssign.ref: type = name_ref LeftShiftAssign, imports.%Core.LeftShiftAssign [template = constants.%LeftShiftAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.842] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/mod.carbon b/toolchain/check/testdata/operators/overloaded/mod.carbon index 16021fcbbce1..5e088cac868b 100644 --- a/toolchain/check/testdata/operators/overloaded/mod.carbon +++ b/toolchain/check/testdata/operators/overloaded/mod.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Mod = %import_ref.a4e -// CHECK:STDOUT: .ModAssign = %import_ref.246 +// CHECK:STDOUT: .Mod = %Core.Mod +// CHECK:STDOUT: .ModAssign = %Core.ModAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.a4e: type = import_ref Core//prelude/operators/arithmetic, Mod, loaded [template = constants.%Mod.type] -// CHECK:STDOUT: %import_ref.246: type = import_ref Core//prelude/operators/arithmetic, ModAssign, loaded [template = constants.%ModAssign.type] +// CHECK:STDOUT: %Core.Mod: type = import_ref Core//prelude/operators/arithmetic, Mod, loaded [template = constants.%Mod.type] +// CHECK:STDOUT: %Core.ModAssign: type = import_ref Core//prelude/operators/arithmetic, ModAssign, loaded [template = constants.%ModAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Mod.ref: type = name_ref Mod, imports.%import_ref.a4e [template = constants.%Mod.type] +// CHECK:STDOUT: %Mod.ref: type = name_ref Mod, imports.%Core.Mod [template = constants.%Mod.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.5d5] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ModAssign.ref: type = name_ref ModAssign, imports.%import_ref.246 [template = constants.%ModAssign.type] +// CHECK:STDOUT: %ModAssign.ref: type = name_ref ModAssign, imports.%Core.ModAssign [template = constants.%ModAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.5ee] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/mul.carbon b/toolchain/check/testdata/operators/overloaded/mul.carbon index adfd5b69b715..2f92c29474d4 100644 --- a/toolchain/check/testdata/operators/overloaded/mul.carbon +++ b/toolchain/check/testdata/operators/overloaded/mul.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Mul = %import_ref.45c -// CHECK:STDOUT: .MulAssign = %import_ref.e02 +// CHECK:STDOUT: .Mul = %Core.Mul +// CHECK:STDOUT: .MulAssign = %Core.MulAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.45c: type = import_ref Core//prelude/operators/arithmetic, Mul, loaded [template = constants.%Mul.type] -// CHECK:STDOUT: %import_ref.e02: type = import_ref Core//prelude/operators/arithmetic, MulAssign, loaded [template = constants.%MulAssign.type] +// CHECK:STDOUT: %Core.Mul: type = import_ref Core//prelude/operators/arithmetic, Mul, loaded [template = constants.%Mul.type] +// CHECK:STDOUT: %Core.MulAssign: type = import_ref Core//prelude/operators/arithmetic, MulAssign, loaded [template = constants.%MulAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Mul.ref: type = name_ref Mul, imports.%import_ref.45c [template = constants.%Mul.type] +// CHECK:STDOUT: %Mul.ref: type = name_ref Mul, imports.%Core.Mul [template = constants.%Mul.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.289] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %MulAssign.ref: type = name_ref MulAssign, imports.%import_ref.e02 [template = constants.%MulAssign.type] +// CHECK:STDOUT: %MulAssign.ref: type = name_ref MulAssign, imports.%Core.MulAssign [template = constants.%MulAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.de9] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/negate.carbon b/toolchain/check/testdata/operators/overloaded/negate.carbon index 4e0d31773bd4..271822e636cd 100644 --- a/toolchain/check/testdata/operators/overloaded/negate.carbon +++ b/toolchain/check/testdata/operators/overloaded/negate.carbon @@ -42,11 +42,11 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Negate = %import_ref.6e9 +// CHECK:STDOUT: .Negate = %Core.Negate // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.6e9: type = import_ref Core//prelude/operators/arithmetic, Negate, loaded [template = constants.%Negate.type] +// CHECK:STDOUT: %Core.Negate: type = import_ref Core//prelude/operators/arithmetic, Negate, loaded [template = constants.%Negate.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -60,7 +60,7 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Negate.ref: type = name_ref Negate, imports.%import_ref.6e9 [template = constants.%Negate.type] +// CHECK:STDOUT: %Negate.ref: type = name_ref Negate, imports.%Core.Negate [template = constants.%Negate.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/ordered.carbon b/toolchain/check/testdata/operators/overloaded/ordered.carbon index 82a68a357525..d42852b6fa8b 100644 --- a/toolchain/check/testdata/operators/overloaded/ordered.carbon +++ b/toolchain/check/testdata/operators/overloaded/ordered.carbon @@ -109,12 +109,12 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Ordered = %import_ref.467 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Ordered = %Core.Ordered +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.467: type = import_ref Core//prelude/operators/comparison, Ordered, loaded [template = constants.%Ordered.type] +// CHECK:STDOUT: %Core.Ordered: type = import_ref Core//prelude/operators/comparison, Ordered, loaded [template = constants.%Ordered.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -131,7 +131,7 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Ordered.ref: type = name_ref Ordered, imports.%import_ref.467 [template = constants.%Ordered.type] +// CHECK:STDOUT: %Ordered.ref: type = name_ref Ordered, imports.%Core.Ordered [template = constants.%Ordered.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness (@impl.1.%Less.decl, @impl.1.%LessOrEquivalent.decl, @impl.1.%Greater.decl, @impl.1.%GreaterOrEquivalent.decl) [template = constants.%impl_witness] // CHECK:STDOUT: %TestLess.decl: %TestLess.type = fn_decl @TestLess [template = constants.%TestLess] { @@ -390,8 +390,8 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Ordered = %import_ref.467 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Ordered = %Core.Ordered // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/right_shift.carbon b/toolchain/check/testdata/operators/overloaded/right_shift.carbon index 215a068b58fd..de302c8e69ea 100644 --- a/toolchain/check/testdata/operators/overloaded/right_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/right_shift.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .RightShift = %import_ref.fe3 -// CHECK:STDOUT: .RightShiftAssign = %import_ref.9f1 +// CHECK:STDOUT: .RightShift = %Core.RightShift +// CHECK:STDOUT: .RightShiftAssign = %Core.RightShiftAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.fe3: type = import_ref Core//prelude/operators/bitwise, RightShift, loaded [template = constants.%RightShift.type] -// CHECK:STDOUT: %import_ref.9f1: type = import_ref Core//prelude/operators/bitwise, RightShiftAssign, loaded [template = constants.%RightShiftAssign.type] +// CHECK:STDOUT: %Core.RightShift: type = import_ref Core//prelude/operators/bitwise, RightShift, loaded [template = constants.%RightShift.type] +// CHECK:STDOUT: %Core.RightShiftAssign: type = import_ref Core//prelude/operators/bitwise, RightShiftAssign, loaded [template = constants.%RightShiftAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %RightShift.ref: type = name_ref RightShift, imports.%import_ref.fe3 [template = constants.%RightShift.type] +// CHECK:STDOUT: %RightShift.ref: type = name_ref RightShift, imports.%Core.RightShift [template = constants.%RightShift.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.404] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %RightShiftAssign.ref: type = name_ref RightShiftAssign, imports.%import_ref.9f1 [template = constants.%RightShiftAssign.type] +// CHECK:STDOUT: %RightShiftAssign.ref: type = name_ref RightShiftAssign, imports.%Core.RightShiftAssign [template = constants.%RightShiftAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.686] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/operators/overloaded/sub.carbon b/toolchain/check/testdata/operators/overloaded/sub.carbon index d22cf586b456..8ea6f29e54aa 100644 --- a/toolchain/check/testdata/operators/overloaded/sub.carbon +++ b/toolchain/check/testdata/operators/overloaded/sub.carbon @@ -58,13 +58,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Sub = %import_ref.59c -// CHECK:STDOUT: .SubAssign = %import_ref.941 +// CHECK:STDOUT: .Sub = %Core.Sub +// CHECK:STDOUT: .SubAssign = %Core.SubAssign // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.59c: type = import_ref Core//prelude/operators/arithmetic, Sub, loaded [template = constants.%Sub.type] -// CHECK:STDOUT: %import_ref.941: type = import_ref Core//prelude/operators/arithmetic, SubAssign, loaded [template = constants.%SubAssign.type] +// CHECK:STDOUT: %Core.Sub: type = import_ref Core//prelude/operators/arithmetic, Sub, loaded [template = constants.%Sub.type] +// CHECK:STDOUT: %Core.SubAssign: type = import_ref Core//prelude/operators/arithmetic, SubAssign, loaded [template = constants.%SubAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -79,13 +79,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl_decl @impl.1 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %Sub.ref: type = name_ref Sub, imports.%import_ref.59c [template = constants.%Sub.type] +// CHECK:STDOUT: %Sub.ref: type = name_ref Sub, imports.%Core.Sub [template = constants.%Sub.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc17: = impl_witness (@impl.1.%Op.decl) [template = constants.%impl_witness.3b8] // CHECK:STDOUT: impl_decl @impl.2 [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %SubAssign.ref: type = name_ref SubAssign, imports.%import_ref.941 [template = constants.%SubAssign.type] +// CHECK:STDOUT: %SubAssign.ref: type = name_ref SubAssign, imports.%Core.SubAssign [template = constants.%SubAssign.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness.loc22: = impl_witness (@impl.2.%Op.decl) [template = constants.%impl_witness.91c] // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index 320c4b76f136..27af746375b3 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -27,7 +27,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index b110de5354c3..5dae67e6920b 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -48,7 +48,7 @@ fn Main() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -58,8 +58,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -117,7 +117,7 @@ fn Main() { // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -133,8 +133,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 5fc149064139..13d7f4e867d1 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -70,7 +70,7 @@ import library "var"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -97,7 +97,7 @@ import library "var"; // CHECK:STDOUT: --- fail_conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.a7d = import_ref Example//fn, Foo, unloaded +// CHECK:STDOUT: %Example.Foo = import_ref Example//fn, Foo, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -106,7 +106,7 @@ import library "var"; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Foo = imports.%import_ref.a7d +// CHECK:STDOUT: .Foo = imports.%Example.Foo // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 9999dcdb478d..4c705c5d8d5e 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -109,12 +109,12 @@ var d: i32 = d_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.6d1: = import_ref Implicit//default, a_ref, loaded -// CHECK:STDOUT: %import_ref.6de: = import_ref Implicit//default, b_ref, loaded -// CHECK:STDOUT: %import_ref.6cd: = import_ref Implicit//default, c_ref, loaded -// CHECK:STDOUT: %import_ref.a1f: = import_ref Implicit//default, d_ref, loaded +// CHECK:STDOUT: %Implicit.a_ref: = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.b_ref: = import_ref Implicit//default, b_ref, loaded +// CHECK:STDOUT: %Implicit.c_ref: = import_ref Implicit//default, c_ref, loaded +// CHECK:STDOUT: %Implicit.d_ref: = import_ref Implicit//default, d_ref, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -122,10 +122,10 @@ var d: i32 = d_ref; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.6d1 -// CHECK:STDOUT: .b_ref = imports.%import_ref.6de -// CHECK:STDOUT: .c_ref = imports.%import_ref.6cd -// CHECK:STDOUT: .d_ref = imports.%import_ref.a1f +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .c_ref = imports.%Implicit.c_ref +// CHECK:STDOUT: .d_ref = imports.%Implicit.d_ref // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b @@ -179,13 +179,13 @@ var d: i32 = d_ref; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: = name_ref a_ref, imports.%import_ref.6d1 +// CHECK:STDOUT: %a_ref.ref: = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: assign file.%a.var, -// CHECK:STDOUT: %b_ref.ref: = name_ref b_ref, imports.%import_ref.6de +// CHECK:STDOUT: %b_ref.ref: = name_ref b_ref, imports.%Implicit.b_ref // CHECK:STDOUT: assign file.%b.var, -// CHECK:STDOUT: %c_ref.ref: = name_ref c_ref, imports.%import_ref.6cd +// CHECK:STDOUT: %c_ref.ref: = name_ref c_ref, imports.%Implicit.c_ref // CHECK:STDOUT: assign file.%c.var, -// CHECK:STDOUT: %d_ref.ref: = name_ref d_ref, imports.%import_ref.a1f +// CHECK:STDOUT: %d_ref.ref: = name_ref d_ref, imports.%Implicit.d_ref // CHECK:STDOUT: assign file.%d.var, // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon index a4ba30e930ee..77b26955604e 100644 --- a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon @@ -29,7 +29,7 @@ var b: i32 = a; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -39,8 +39,8 @@ var b: i32 = a; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -84,9 +84,9 @@ var b: i32 = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.40d: ref %i32 = import_ref Main//lib, a, loaded +// CHECK:STDOUT: %Main.a: ref %i32 = import_ref Main//lib, a, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -94,7 +94,7 @@ var b: i32 = a; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a = imports.%import_ref.40d +// CHECK:STDOUT: .a = imports.%Main.a // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .b = %b // CHECK:STDOUT: } @@ -115,7 +115,7 @@ var b: i32 = a; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a.ref: ref %i32 = name_ref a, imports.%import_ref.40d +// CHECK:STDOUT: %a.ref: ref %i32 = name_ref a, imports.%Main.a // CHECK:STDOUT: %.loc4: %i32 = bind_value %a.ref // CHECK:STDOUT: assign file.%b.var, %.loc4 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index 05e8aebcdb8e..7342b920459a 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -72,7 +72,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %A.type = import_ref Implicit//default, A, loaded [template = constants.%A] +// CHECK:STDOUT: %Implicit.A: %A.type = import_ref Implicit//default, A, loaded [template = constants.%A] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -81,7 +81,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Implicit.A // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .package_a = %package_a @@ -115,11 +115,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %A.ref.loc4: %A.type = name_ref A, imports.%import_ref [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc4: %A.type = name_ref A, imports.%Implicit.A [template = constants.%A] // CHECK:STDOUT: %A.call.loc4: init %empty_tuple.type = call %A.ref.loc4() // CHECK:STDOUT: assign file.%a.var, %A.call.loc4 // CHECK:STDOUT: %package.ref: = name_ref package, package [template = package] -// CHECK:STDOUT: %A.ref.loc6: %A.type = name_ref A, imports.%import_ref [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc6: %A.type = name_ref A, imports.%Implicit.A [template = constants.%A] // CHECK:STDOUT: %A.call.loc6: init %empty_tuple.type = call %A.ref.loc6() // CHECK:STDOUT: assign file.%package_a.var, %A.call.loc6 // CHECK:STDOUT: return @@ -159,7 +159,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %B.type = import_ref SamePackage//default, B, loaded [template = constants.%B] +// CHECK:STDOUT: %SamePackage.B: %B.type = import_ref SamePackage//default, B, loaded [template = constants.%B] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -168,7 +168,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .B = imports.%import_ref +// CHECK:STDOUT: .B = imports.%SamePackage.B // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .package_b = %package_b @@ -201,11 +201,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %B.ref.loc6: %B.type = name_ref B, imports.%import_ref [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc6: %B.type = name_ref B, imports.%SamePackage.B [template = constants.%B] // CHECK:STDOUT: %B.call.loc6: init %empty_tuple.type = call %B.ref.loc6() // CHECK:STDOUT: assign file.%b.var, %B.call.loc6 // CHECK:STDOUT: %package.ref: = name_ref package, package [template = package] -// CHECK:STDOUT: %B.ref.loc8: %B.type = name_ref B, imports.%import_ref [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc8: %B.type = name_ref B, imports.%SamePackage.B [template = constants.%B] // CHECK:STDOUT: %B.call.loc8: init %empty_tuple.type = call %B.ref.loc8() // CHECK:STDOUT: assign file.%package_b.var, %B.call.loc8 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/packages/no_prelude/cross_package_export.carbon b/toolchain/check/testdata/packages/no_prelude/cross_package_export.carbon index 4c84486bdf8b..80a211ada800 100644 --- a/toolchain/check/testdata/packages/no_prelude/cross_package_export.carbon +++ b/toolchain/check/testdata/packages/no_prelude/cross_package_export.carbon @@ -245,12 +245,12 @@ alias C = Other.C; // CHECK:STDOUT: --- export_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Other//base, C, unloaded +// CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Other.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -258,12 +258,12 @@ alias C = Other.C; // CHECK:STDOUT: --- export_import_copy.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Other//base, C, unloaded +// CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Other.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -271,12 +271,12 @@ alias C = Other.C; // CHECK:STDOUT: --- export_import_indirect.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Other//base, C, unloaded +// CHECK:STDOUT: %Other.C = import_ref Other//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Other.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -291,10 +291,10 @@ alias C = Other.C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Other//base, loc5_8, unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.276 = import_ref Other//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -302,15 +302,15 @@ alias C = Other.C; // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Other.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_name_copy.carbon @@ -323,10 +323,10 @@ alias C = Other.C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Other//base, loc5_8, unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.276 = import_ref Other//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -334,15 +334,15 @@ alias C = Other.C; // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Other.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_name_indirect.carbon @@ -355,10 +355,10 @@ alias C = Other.C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Other//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -366,15 +366,15 @@ alias C = Other.C; // CHECK:STDOUT: .C = %C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Other.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- use_export_import.carbon @@ -390,14 +390,14 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_import // CHECK:STDOUT: import Other//base // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Other//base, loc5_8, unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.276 = import_ref Other//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -413,17 +413,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc6_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Other.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -452,15 +452,15 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_import // CHECK:STDOUT: import Other//export_import_copy // CHECK:STDOUT: import Other//base // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Other//base, loc5_8, unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.276 = import_ref Other//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -476,17 +476,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc7_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Other.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -515,15 +515,15 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.3b0 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_import_indirect // CHECK:STDOUT: import Other//export_import // CHECK:STDOUT: import Other//base // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Other//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Other//base, loc5_8, unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.56d: = import_ref Other//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2c4 = import_ref Other//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.import_ref.276 = import_ref Other//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -539,17 +539,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc6_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Other.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -578,13 +578,13 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.06e +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_name // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.06e: type = import_ref Other//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -600,17 +600,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc6_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Other.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -639,14 +639,14 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.06e +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_name // CHECK:STDOUT: import Other//export_name_copy // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.06e: type = import_ref Other//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -662,17 +662,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc7_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Other.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -701,13 +701,13 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.f43 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_name_indirect // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f43: type = import_ref Other//export_name_indirect, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.328: = import_ref Other//export_name_indirect, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.db8 = import_ref Other//export_name_indirect, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.3ef = import_ref Other//export_name_indirect, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name_indirect, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.328: = import_ref Other//export_name_indirect, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.db8 = import_ref Other//export_name_indirect, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.3ef = import_ref Other//export_name_indirect, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -723,17 +723,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc6_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.f43 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name_indirect.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.328 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.328 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.db8 -// CHECK:STDOUT: .x = imports.%import_ref.3ef +// CHECK:STDOUT: .Self = imports.%Other.import_ref.db8 +// CHECK:STDOUT: .x = imports.%Other.import_ref.3ef // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -762,7 +762,7 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.06e +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_import // CHECK:STDOUT: import Other//export_name // CHECK:STDOUT: import Other//export_import_copy @@ -771,10 +771,10 @@ alias C = Other.C; // CHECK:STDOUT: import Other//export_name_indirect // CHECK:STDOUT: import Other//base // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.06e: type = import_ref Other//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -790,17 +790,17 @@ alias C = Other.C; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc11_13: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Other.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -858,12 +858,12 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.991 +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_import // CHECK:STDOUT: import Other//conflict // CHECK:STDOUT: import Other//base // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.991: %C.type = import_ref Other//conflict, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.C: %C.type = import_ref Other//conflict, C, loaded [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -873,8 +873,8 @@ alias C = Other.C; // CHECK:STDOUT: } // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.991 [template = constants.%C] -// CHECK:STDOUT: %C: %C.type = bind_alias C, imports.%import_ref.991 [template = constants.%C] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Other.C [template = constants.%C] +// CHECK:STDOUT: %C: %C.type = bind_alias C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @C() [from "conflict.carbon"]; @@ -890,14 +890,14 @@ alias C = Other.C; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .C = %import_ref.06e +// CHECK:STDOUT: .C = %Other.C // CHECK:STDOUT: import Other//export_name // CHECK:STDOUT: import Other//conflict // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.06e: type = import_ref Other//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Other.C: type = import_ref Other//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Other.import_ref.ad3: = import_ref Other//export_name, inst20 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.6a9 = import_ref Other//export_name, inst21 [indirect], unloaded +// CHECK:STDOUT: %Other.import_ref.f67 = import_ref Other//export_name, inst22 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -907,15 +907,15 @@ alias C = Other.C; // CHECK:STDOUT: } // CHECK:STDOUT: %Other.import = import Other // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] -// CHECK:STDOUT: %C: type = bind_alias C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [template = constants.%C] +// CHECK:STDOUT: %C: type = bind_alias C, imports.%Other.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Other.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: 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 fb15256ebe7d..80fb6f11d1ef 100644 --- a/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon +++ b/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon @@ -302,12 +302,12 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Other.F: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .F = imports.%import_ref +// CHECK:STDOUT: .F = imports.%Other.F // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -316,7 +316,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -346,13 +346,13 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .F = %import_ref.f04 -// CHECK:STDOUT: .F2 = %import_ref.b85 +// CHECK:STDOUT: .F = %Other.F +// CHECK:STDOUT: .F2 = %Other.F2 // CHECK:STDOUT: import Other//other_fn // CHECK:STDOUT: import Other//other_fn2 // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f04: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] -// CHECK:STDOUT: %import_ref.b85: %F2.type = import_ref Other//other_fn2, F2, loaded [template = constants.%F2] +// CHECK:STDOUT: %Other.F: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Other.F2: %F2.type = import_ref Other//other_fn2, F2, loaded [template = constants.%F2] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -367,10 +367,10 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Other.ref.loc8: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.f04 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: %Other.ref.loc9: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F2.ref: %F2.type = name_ref F2, imports.%import_ref.b85 [template = constants.%F2] +// CHECK:STDOUT: %F2.ref: %F2.type = name_ref F2, imports.%Other.F2 [template = constants.%F2] // CHECK:STDOUT: %F2.call: init %empty_tuple.type = call %F2.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -391,11 +391,11 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .F = %import_ref.f04 +// CHECK:STDOUT: .F = %Other.F // CHECK:STDOUT: import Other//other_fn // CHECK:STDOUT: import Other//other_fn_extern // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f04: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Other.F: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -410,7 +410,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.f04 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -445,11 +445,11 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .F = %import_ref.f04 +// CHECK:STDOUT: .F = %Other.F // CHECK:STDOUT: import Other//other_fn // CHECK:STDOUT: import Other//other_fn_conflict // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.f04: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Other.F: %F.type = import_ref Other//other_fn, F, loaded [template = constants.%F] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -464,7 +464,7 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.f04 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Other.F [template = constants.%F] // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -479,9 +479,9 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.b6b: = import_ref Main//main_other_ns, Other, loaded -// CHECK:STDOUT: %Other: = namespace %import_ref.b6b, [template] { -// CHECK:STDOUT: .F = %import_ref.db9 +// CHECK:STDOUT: %Main.Other: = import_ref Main//main_other_ns, Other, loaded +// CHECK:STDOUT: %Other: = namespace %Main.Other, [template] { +// CHECK:STDOUT: .F = %Other.F // CHECK:STDOUT: import Other//other_fn // 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 f0be8b2558c6..4fb2f74c48f6 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_import.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_import.carbon @@ -205,12 +205,12 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: --- export.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -218,12 +218,12 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: --- export_copy.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -231,12 +231,12 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: --- non_export.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -244,12 +244,12 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: --- export_export.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -257,12 +257,12 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: --- import_then_export.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -285,15 +285,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -302,16 +302,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -343,15 +343,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f68: type = import_ref Main//export_export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f68 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import @@ -361,16 +361,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc4: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.f68 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -398,15 +398,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -415,16 +415,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -452,15 +452,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -469,16 +469,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -506,15 +506,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -523,16 +523,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -560,15 +560,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -577,16 +577,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -614,15 +614,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -631,16 +631,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -668,15 +668,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -685,16 +685,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -733,15 +733,15 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -750,16 +750,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -787,17 +787,17 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.39e = import_ref Main//use_non_export_then_base, c, unloaded -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.c = import_ref Main//use_non_export_then_base, c, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .c = imports.%import_ref.39e -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .c = imports.%Main.c +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .indirect_c = %indirect_c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -806,16 +806,16 @@ var indirect_c: C = {.x = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %indirect_c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %indirect_c.var: ref %C = var indirect_c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %indirect_c: ref %C = bind_name indirect_c, %indirect_c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon b/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon index 12445d363530..27ac08acfc42 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_mixed.carbon @@ -168,14 +168,14 @@ var d: D = {.y = ()}; // CHECK:STDOUT: --- export_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//base, C, unloaded -// CHECK:STDOUT: %import_ref.e8f = import_ref Main//base, D, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.D = import_ref Main//base, D, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 -// CHECK:STDOUT: .D = imports.%import_ref.e8f +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -190,28 +190,28 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.e8f = import_ref Main//base, D, unloaded -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D = import_ref Main//base, D, unloaded +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: .D = imports.%import_ref.e8f +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_name.carbon @@ -224,39 +224,39 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.e8f = import_ref Main//base, D, unloaded -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D = import_ref Main//base, D, unloaded +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: .D = imports.%import_ref.e8f +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_name_then_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//export_name, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//export_name, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -273,15 +273,15 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -290,16 +290,16 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -327,15 +327,15 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export_name, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_name, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export_name, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export_name, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export_name, inst23 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -344,16 +344,16 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -381,15 +381,15 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -398,16 +398,16 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -431,12 +431,12 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//export_import_then_name, C, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//export_import_then_name, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .d = %d // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -469,15 +469,15 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -486,16 +486,16 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -527,20 +527,20 @@ var d: D = {.y = ()}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.b0a: type = import_ref Main//base, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded -// CHECK:STDOUT: %import_ref.5ab: = import_ref Main//base, loc10_1, loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.cab = import_ref Main//base, inst27 [no loc], unloaded -// CHECK:STDOUT: %import_ref.950 = import_ref Main//base, loc9_8, unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_import_then_name, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.D: type = import_ref Main//base, D, loaded [template = constants.%D] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export_import_then_name, inst21 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export_import_then_name, inst22 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export_import_then_name, inst23 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.5ab: = import_ref Main//base, loc10_1, loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.cab = import_ref Main//base, inst27 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.950 = import_ref Main//base, loc9_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e -// CHECK:STDOUT: .D = imports.%import_ref.b0a +// CHECK:STDOUT: .C = imports.%Main.C +// CHECK:STDOUT: .D = imports.%Main.D // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d // CHECK:STDOUT: } @@ -550,31 +550,31 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %.loc8: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %D = binding_pattern d // CHECK:STDOUT: %.loc9: %D = var_pattern %d.patt // CHECK:STDOUT: } // CHECK:STDOUT: %d.var: ref %D = var d -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [template = constants.%D] // CHECK:STDOUT: %d: ref %D = bind_name d, %d.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_import_then_name.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.5ab +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.5ab // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab -// CHECK:STDOUT: .y = imports.%import_ref.950 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.cab +// CHECK:STDOUT: .y = imports.%Main.import_ref.950 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/packages/no_prelude/export_name.carbon b/toolchain/check/testdata/packages/no_prelude/export_name.carbon index 19c164cb2774..592c264c2c37 100644 --- a/toolchain/check/testdata/packages/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/packages/no_prelude/export_name.carbon @@ -268,18 +268,18 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { // CHECK:STDOUT: .NSC = file.%NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.1a1: type = import_ref Main//base, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded -// CHECK:STDOUT: %import_ref.5ab: = import_ref Main//base, loc11_1, loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.31c = import_ref Main//base, inst28 [no loc], unloaded -// CHECK:STDOUT: %import_ref.be6 = import_ref Main//base, loc10_8, unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//base, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.5ab: = import_ref Main//base, loc11_1, loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.31c = import_ref Main//base, inst28 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.be6 = import_ref Main//base, loc10_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -288,39 +288,39 @@ private export C; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] -// CHECK:STDOUT: %NSC: type = export NSC, imports.%import_ref.1a1 [template = constants.%NSC] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %NSC: type = export NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.5ab +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.5ab // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.31c -// CHECK:STDOUT: .y = imports.%import_ref.be6 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.31c +// CHECK:STDOUT: .y = imports.%Main.import_ref.be6 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_reexporting.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.be7 = import_ref Main//export, C, unloaded -// CHECK:STDOUT: %import_ref.0f6: = import_ref Main//export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.0f6, [template] { -// CHECK:STDOUT: .NSC = %import_ref.309 +// CHECK:STDOUT: %Main.C = import_ref Main//export, C, unloaded +// CHECK:STDOUT: %Main.NS: = import_ref Main//export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.be7 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -339,18 +339,18 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0f6: = import_ref Main//export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.0f6, [template] { +// CHECK:STDOUT: %Main.C: type = import_ref Main//export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { // CHECK:STDOUT: .NSC = file.%NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.231: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded -// CHECK:STDOUT: %import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded -// CHECK:STDOUT: %import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -359,24 +359,24 @@ private export C; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.06e [template = constants.%C] -// CHECK:STDOUT: %NSC: type = export NSC, imports.%import_ref.231 [template = constants.%NSC] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] +// CHECK:STDOUT: %NSC: type = export NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.63c +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.63c // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f0b -// CHECK:STDOUT: .y = imports.%import_ref.ebc +// CHECK:STDOUT: .Self = imports.%Main.import_ref.f0b +// CHECK:STDOUT: .y = imports.%Main.import_ref.ebc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- export_in_impl.carbon @@ -401,23 +401,23 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0f6: = import_ref Main//export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.0f6, [template] { -// CHECK:STDOUT: .NSC = %import_ref.231 +// CHECK:STDOUT: %Main.C: type = import_ref Main//export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.231: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded -// CHECK:STDOUT: %import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded -// CHECK:STDOUT: %import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .nsc = %nsc @@ -428,7 +428,7 @@ private export C; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %NSC = binding_pattern nsc @@ -437,25 +437,25 @@ private export C; // CHECK:STDOUT: %nsc.var: ref %NSC = var nsc // CHECK:STDOUT: %.loc7_12: type = splice_block %NSC.ref [template = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%import_ref.231 [template = constants.%NSC] +// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: %nsc: ref %NSC = bind_name nsc, %nsc.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.63c +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.63c // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f0b -// CHECK:STDOUT: .y = imports.%import_ref.ebc +// CHECK:STDOUT: .Self = imports.%Main.import_ref.f0b +// CHECK:STDOUT: .y = imports.%Main.import_ref.ebc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -495,23 +495,23 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f43: type = import_ref Main//export_export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.06f: = import_ref Main//export_export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.06f, [template] { -// CHECK:STDOUT: .NSC = %import_ref.bb8 +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//export_export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.bb8: type = import_ref Main//export_export, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.328: = import_ref Main//export_export, inst23 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.db8 = import_ref Main//export_export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.3ef = import_ref Main//export_export, inst25 [indirect], unloaded -// CHECK:STDOUT: %import_ref.c12: = import_ref Main//export_export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.1cb = import_ref Main//export_export, inst32 [indirect], unloaded -// CHECK:STDOUT: %import_ref.b18 = import_ref Main//export_export, inst33 [indirect], unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//export_export, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.328: = import_ref Main//export_export, inst23 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.db8 = import_ref Main//export_export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.3ef = import_ref Main//export_export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.c12: = import_ref Main//export_export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.1cb = import_ref Main//export_export, inst32 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.b18 = import_ref Main//export_export, inst33 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f43 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .nsc = %nsc @@ -523,7 +523,7 @@ private export C; // CHECK:STDOUT: %.loc4: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.f43 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %NSC = binding_pattern nsc @@ -532,25 +532,25 @@ private export C; // CHECK:STDOUT: %nsc.var: ref %NSC = var nsc // CHECK:STDOUT: %.loc5_12: type = splice_block %NSC.ref [template = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%import_ref.bb8 [template = constants.%NSC] +// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: %nsc: ref %NSC = bind_name nsc, %nsc.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.328 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.328 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.db8 -// CHECK:STDOUT: .x = imports.%import_ref.3ef +// CHECK:STDOUT: .Self = imports.%Main.import_ref.db8 +// CHECK:STDOUT: .x = imports.%Main.import_ref.3ef // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "export_export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.c12 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.c12 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1cb -// CHECK:STDOUT: .y = imports.%import_ref.b18 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.1cb +// CHECK:STDOUT: .y = imports.%Main.import_ref.b18 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -590,23 +590,23 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f43: type = import_ref Main//export_export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.06f: = import_ref Main//export_export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.06f, [template] { -// CHECK:STDOUT: .NSC = %import_ref.bb8 +// CHECK:STDOUT: %Main.C: type = import_ref Main//export_export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//export_export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.bb8: type = import_ref Main//export_export, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.328: = import_ref Main//export_export, inst23 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.db8 = import_ref Main//export_export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.3ef = import_ref Main//export_export, inst25 [indirect], unloaded -// CHECK:STDOUT: %import_ref.c12: = import_ref Main//export_export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.1cb = import_ref Main//export_export, inst32 [indirect], unloaded -// CHECK:STDOUT: %import_ref.b18 = import_ref Main//export_export, inst33 [indirect], unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//export_export, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.328: = import_ref Main//export_export, inst23 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.db8 = import_ref Main//export_export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.3ef = import_ref Main//export_export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.c12: = import_ref Main//export_export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.1cb = import_ref Main//export_export, inst32 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.b18 = import_ref Main//export_export, inst33 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f43 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .nsc = %nsc @@ -617,7 +617,7 @@ private export C; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.f43 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %NSC = binding_pattern nsc @@ -626,25 +626,25 @@ private export C; // CHECK:STDOUT: %nsc.var: ref %NSC = var nsc // CHECK:STDOUT: %.loc7_12: type = splice_block %NSC.ref [template = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%import_ref.bb8 [template = constants.%NSC] +// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: %nsc: ref %NSC = bind_name nsc, %nsc.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export_export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.328 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.328 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.db8 -// CHECK:STDOUT: .x = imports.%import_ref.3ef +// CHECK:STDOUT: .Self = imports.%Main.import_ref.db8 +// CHECK:STDOUT: .x = imports.%Main.import_ref.3ef // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "export_export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.c12 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.c12 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.1cb -// CHECK:STDOUT: .y = imports.%import_ref.b18 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.1cb +// CHECK:STDOUT: .y = imports.%Main.import_ref.b18 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -671,16 +671,16 @@ private export C; // CHECK:STDOUT: --- fail_export_ns.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f42 = import_ref Main//base, C, unloaded -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .NSC = %import_ref.461 +// CHECK:STDOUT: %Main.C = import_ref Main//base, C, unloaded +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.f42 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -719,30 +719,30 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .NSC = %import_ref.461 +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- import_both.carbon @@ -761,23 +761,23 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .NSC = %import_ref.1a1 +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.1a1: type = import_ref Main//base, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded -// CHECK:STDOUT: %import_ref.5ab: = import_ref Main//base, loc11_1, loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.31c = import_ref Main//base, inst28 [no loc], unloaded -// CHECK:STDOUT: %import_ref.be6 = import_ref Main//base, loc10_8, unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//base, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.5ab: = import_ref Main//base, loc11_1, loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.31c = import_ref Main//base, inst28 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.be6 = import_ref Main//base, loc10_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .nsc = %nsc @@ -788,7 +788,7 @@ private export C; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %NSC = binding_pattern nsc @@ -797,25 +797,25 @@ private export C; // CHECK:STDOUT: %nsc.var: ref %NSC = var nsc // CHECK:STDOUT: %.loc8_12: type = splice_block %NSC.ref [template = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%import_ref.1a1 [template = constants.%NSC] +// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: %nsc: ref %NSC = bind_name nsc, %nsc.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.5ab +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.5ab // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.31c -// CHECK:STDOUT: .y = imports.%import_ref.be6 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.31c +// CHECK:STDOUT: .y = imports.%Main.import_ref.be6 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -855,23 +855,23 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.0f6: = import_ref Main//export, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.0f6, [template] { -// CHECK:STDOUT: .NSC = %import_ref.231 +// CHECK:STDOUT: %Main.C: type = import_ref Main//export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//export, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.231: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded -// CHECK:STDOUT: %import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] -// CHECK:STDOUT: %import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded -// CHECK:STDOUT: %import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded +// CHECK:STDOUT: %Main.NSC: type = import_ref Main//export, NSC, loaded [template = constants.%NSC] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//export, inst23 [indirect], loaded [template = constants.%complete_type.9be] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.63c: = import_ref Main//export, inst31 [indirect], loaded [template = constants.%complete_type.9f4] +// CHECK:STDOUT: %Main.import_ref.f0b = import_ref Main//export, inst32 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.ebc = import_ref Main//export, inst33 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .nsc = %nsc @@ -882,7 +882,7 @@ private export C; // CHECK:STDOUT: %.loc7: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %NSC = binding_pattern nsc @@ -891,25 +891,25 @@ private export C; // CHECK:STDOUT: %nsc.var: ref %NSC = var nsc // CHECK:STDOUT: %.loc8_12: type = splice_block %NSC.ref [template = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%import_ref.231 [template = constants.%NSC] +// CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [template = constants.%NSC] // CHECK:STDOUT: } // CHECK:STDOUT: %nsc: ref %NSC = bind_name nsc, %nsc.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @NSC [from "export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.63c +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.63c // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.f0b -// CHECK:STDOUT: .y = imports.%import_ref.ebc +// CHECK:STDOUT: .Self = imports.%Main.import_ref.f0b +// CHECK:STDOUT: .y = imports.%Main.import_ref.ebc // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -958,14 +958,14 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .NSC = %import_ref.461 +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -974,15 +974,15 @@ private export C; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- use_repeat_export.carbon @@ -997,15 +997,15 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.06e: type = import_ref Main//repeat_export, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.ad3: = import_ref Main//repeat_export, inst23 [indirect], loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.6a9 = import_ref Main//repeat_export, inst24 [indirect], unloaded -// CHECK:STDOUT: %import_ref.f67 = import_ref Main//repeat_export, inst25 [indirect], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//repeat_export, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.ad3: = import_ref Main//repeat_export, inst23 [indirect], loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.6a9 = import_ref Main//repeat_export, inst24 [indirect], unloaded +// CHECK:STDOUT: %Main.import_ref.f67 = import_ref Main//repeat_export, inst25 [indirect], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.06e +// CHECK:STDOUT: .C = imports.%Main.C // CHECK:STDOUT: .c = %c // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -1014,16 +1014,16 @@ private export C; // CHECK:STDOUT: %.loc6: %C = var_pattern %c.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C = var c -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.06e [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "repeat_export.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.ad3 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.ad3 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.6a9 -// CHECK:STDOUT: .x = imports.%import_ref.f67 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.6a9 +// CHECK:STDOUT: .x = imports.%Main.import_ref.f67 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -1049,14 +1049,14 @@ private export C; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Main//base, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//base, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .NSC = %import_ref.461 +// CHECK:STDOUT: %Main.C: type = import_ref Main//base, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.NS: = import_ref Main//base, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .NSC = %Main.NSC // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.276 = import_ref Main//base, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.56d: = import_ref Main//base, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2c4 = import_ref Main//base, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.276 = import_ref Main//base, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1065,14 +1065,14 @@ private export C; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C: type = export C, imports.%import_ref.3b0 [template = constants.%C] +// CHECK:STDOUT: %C: type = export C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "base.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.56d +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.56d // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .x = imports.%import_ref.276 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2c4 +// CHECK:STDOUT: .x = imports.%Main.import_ref.276 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/no_prelude/fail_export_name_member.carbon b/toolchain/check/testdata/packages/no_prelude/fail_export_name_member.carbon index cf8f05782c59..c07443ebbdf0 100644 --- a/toolchain/check/testdata/packages/no_prelude/fail_export_name_member.carbon +++ b/toolchain/check/testdata/packages/no_prelude/fail_export_name_member.carbon @@ -75,24 +75,24 @@ export C.n; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.3b0: type = import_ref Foo//a, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.9fc: = import_ref Foo//a, loc6_1, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2c4 = import_ref Foo//a, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.4cb = import_ref Foo//a, loc5_8, unloaded +// CHECK:STDOUT: %Foo.C: type = import_ref Foo//a, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Foo.import_ref.9fc: = import_ref Foo//a, loc6_1, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Foo.import_ref.2c4 = import_ref Foo//a, inst14 [no loc], unloaded +// CHECK:STDOUT: %Foo.import_ref.4cb = import_ref Foo//a, loc5_8, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C = imports.%import_ref.3b0 +// CHECK:STDOUT: .C = imports.%Foo.C // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "a.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.9fc +// CHECK:STDOUT: complete_type_witness = imports.%Foo.import_ref.9fc // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2c4 -// CHECK:STDOUT: .n = imports.%import_ref.4cb +// CHECK:STDOUT: .Self = imports.%Foo.import_ref.2c4 +// CHECK:STDOUT: .n = imports.%Foo.import_ref.4cb // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/no_prelude/fail_export_name_params.carbon b/toolchain/check/testdata/packages/no_prelude/fail_export_name_params.carbon index 195804a01541..20c8bd237dfe 100644 --- a/toolchain/check/testdata/packages/no_prelude/fail_export_name_params.carbon +++ b/toolchain/check/testdata/packages/no_prelude/fail_export_name_params.carbon @@ -97,8 +97,8 @@ export C2(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.393: %C1.type = import_ref Foo//a, C1, loaded [template = constants.%C1.generic] -// CHECK:STDOUT: %import_ref.5d7: %C2.type = import_ref Foo//a, C2, loaded [template = constants.%C2.generic] +// CHECK:STDOUT: %Foo.C1: %C1.type = import_ref Foo//a, C1, loaded [template = constants.%C1.generic] +// CHECK:STDOUT: %Foo.C2: %C2.type = import_ref Foo//a, C2, loaded [template = constants.%C2.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -107,10 +107,10 @@ export C2(T:! type); // CHECK:STDOUT: .C2 = %C2 // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %C1: %C1.type = export C1, imports.%import_ref.393 [template = constants.%C1.generic] +// CHECK:STDOUT: %C1: %C1.type = export C1, imports.%Foo.C1 [template = constants.%C1.generic] // CHECK:STDOUT: %T.param: type = value_param runtime_param // CHECK:STDOUT: %T: type = bind_symbolic_name T, 0, %T.param [symbolic = constants.%T] -// CHECK:STDOUT: %C2: %C2.type = export C2, imports.%import_ref.5d7 [template = constants.%C2.generic] +// CHECK:STDOUT: %C2: %C2.type = export C2, imports.%Foo.C2 [template = constants.%C2.generic] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C1(constants.%T: type) [from "a.carbon"] { diff --git a/toolchain/check/testdata/packages/no_prelude/implicit_imports_entities.carbon b/toolchain/check/testdata/packages/no_prelude/implicit_imports_entities.carbon index e2d1dd1ef351..5f75e53301f8 100644 --- a/toolchain/check/testdata/packages/no_prelude/implicit_imports_entities.carbon +++ b/toolchain/check/testdata/packages/no_prelude/implicit_imports_entities.carbon @@ -309,12 +309,12 @@ import Other library "o1"; // CHECK:STDOUT: --- mix_current_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//c1, C1, unloaded +// CHECK:STDOUT: %Main.C1 = import_ref Main//c1, C1, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C1 = imports.%import_ref +// CHECK:STDOUT: .C1 = imports.%Main.C1 // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -331,18 +331,18 @@ import Other library "o1"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0d9: type = import_ref Main//mix_current_package, C1, loaded [template = constants.%C1] -// CHECK:STDOUT: %import_ref.09c: type = import_ref Main//c2, C2, loaded [template = constants.%C2] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Main//c1, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.eb7 = import_ref Main//c1, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Main//c2, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.5b0 = import_ref Main//c2, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C1: type = import_ref Main//mix_current_package, C1, loaded [template = constants.%C1] +// CHECK:STDOUT: %Main.C2: type = import_ref Main//c2, C2, loaded [template = constants.%C2] +// CHECK:STDOUT: %Main.import_ref.8f24d3.1: = import_ref Main//c1, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.eb7 = import_ref Main//c1, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.8f24d3.2: = import_ref Main//c2, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.5b0 = import_ref Main//c2, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C1 = imports.%import_ref.0d9 -// CHECK:STDOUT: .C2 = imports.%import_ref.09c +// CHECK:STDOUT: .C1 = imports.%Main.C1 +// CHECK:STDOUT: .C2 = imports.%Main.C2 // CHECK:STDOUT: .c1 = %c1 // CHECK:STDOUT: .c2 = %c2 // CHECK:STDOUT: } @@ -353,29 +353,29 @@ import Other library "o1"; // CHECK:STDOUT: %.loc6: %C1 = var_pattern %c1.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c1.var: ref %C1 = var c1 -// CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%import_ref.0d9 [template = constants.%C1] +// CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [template = constants.%C1] // CHECK:STDOUT: %c1: ref %C1 = bind_name c1, %c1.var // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %C2 = binding_pattern c2 // CHECK:STDOUT: %.loc7: %C2 = var_pattern %c2.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c2.var: ref %C2 = var c2 -// CHECK:STDOUT: %C2.ref: type = name_ref C2, imports.%import_ref.09c [template = constants.%C2] +// CHECK:STDOUT: %C2.ref: type = name_ref C2, imports.%Main.C2 [template = constants.%C2] // CHECK:STDOUT: %c2: ref %C2 = bind_name c2, %c2.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C1 [from "c1.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.eb7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.eb7 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C2 [from "c2.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.5b0 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.5b0 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -394,12 +394,12 @@ import Other library "o1"; // CHECK:STDOUT: --- dup_c1.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//c1, C1, unloaded +// CHECK:STDOUT: %Main.C1 = import_ref Main//c1, C1, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C1 = imports.%import_ref +// CHECK:STDOUT: .C1 = imports.%Main.C1 // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } @@ -414,14 +414,14 @@ import Other library "o1"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0d9: type = import_ref Main//dup_c1, C1, loaded [template = constants.%C1] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//c1, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.eb7 = import_ref Main//c1, inst14 [no loc], unloaded +// CHECK:STDOUT: %Main.C1: type = import_ref Main//dup_c1, C1, loaded [template = constants.%C1] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//c1, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.eb7 = import_ref Main//c1, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .C1 = imports.%import_ref.0d9 +// CHECK:STDOUT: .C1 = imports.%Main.C1 // CHECK:STDOUT: .c1 = %c1 // CHECK:STDOUT: } // CHECK:STDOUT: %default.import.loc2_6.1 = import @@ -431,15 +431,15 @@ import Other library "o1"; // CHECK:STDOUT: %.loc6: %C1 = var_pattern %c1.patt // CHECK:STDOUT: } // CHECK:STDOUT: %c1.var: ref %C1 = var c1 -// CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%import_ref.0d9 [template = constants.%C1] +// CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [template = constants.%C1] // CHECK:STDOUT: %c1: ref %C1 = bind_name c1, %c1.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C1 [from "c1.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.eb7 +// CHECK:STDOUT: .Self = imports.%Main.import_ref.eb7 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -454,9 +454,9 @@ import Other library "o1"; // CHECK:STDOUT: --- use_ns.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.d58: = import_ref Main//ns, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.d58, [template] { -// CHECK:STDOUT: .C = %import_ref.50d +// CHECK:STDOUT: %Main.NS: = import_ref Main//ns, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .C = %Main.C // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -477,13 +477,13 @@ import Other library "o1"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.0f6: = import_ref Main//use_ns, NS, loaded -// CHECK:STDOUT: %NS: = namespace %import_ref.0f6, [template] { -// CHECK:STDOUT: .C = %import_ref.1c4 +// CHECK:STDOUT: %Main.NS: = import_ref Main//use_ns, NS, loaded +// CHECK:STDOUT: %NS: = namespace %Main.NS, [template] { +// CHECK:STDOUT: .C = %Main.C // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.1c4: type = import_ref Main//use_ns, C, loaded [template = constants.%C] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Main//ns, loc5_13, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2dd = import_ref Main//ns, inst15 [no loc], unloaded +// CHECK:STDOUT: %Main.C: type = import_ref Main//use_ns, C, loaded [template = constants.%C] +// CHECK:STDOUT: %Main.import_ref.8f2: = import_ref Main//ns, loc5_13, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Main.import_ref.2dd = import_ref Main//ns, inst15 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -500,16 +500,16 @@ import Other library "o1"; // CHECK:STDOUT: %c.var: ref %C = var c // CHECK:STDOUT: %.loc4_10: type = splice_block %C.ref [template = constants.%C] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [template = imports.%NS] -// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1c4 [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: %c: ref %C = bind_name c, %c.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C [from "ns.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Main.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2dd +// CHECK:STDOUT: .Self = imports.%Main.import_ref.2dd // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -549,17 +549,17 @@ import Other library "o1"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .O1 = %import_ref.880 -// CHECK:STDOUT: .O2 = %import_ref.328 +// CHECK:STDOUT: .O1 = %Other.O1 +// CHECK:STDOUT: .O2 = %Other.O2 // CHECK:STDOUT: import Other//o2 // CHECK:STDOUT: import Other//o1 // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.880: type = import_ref Other//o1, O1, loaded [template = constants.%O1] -// CHECK:STDOUT: %import_ref.8f24d3.1: = import_ref Other//o1, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.481 = import_ref Other//o1, inst14 [no loc], unloaded -// CHECK:STDOUT: %import_ref.328: type = import_ref Other//o2, O2, loaded [template = constants.%O2] -// CHECK:STDOUT: %import_ref.8f24d3.2: = import_ref Other//o2, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.2eb = import_ref Other//o2, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.O1: type = import_ref Other//o1, O1, loaded [template = constants.%O1] +// CHECK:STDOUT: %Other.import_ref.8f24d3.1: = import_ref Other//o1, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.481 = import_ref Other//o1, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.O2: type = import_ref Other//o2, O2, loaded [template = constants.%O2] +// CHECK:STDOUT: %Other.import_ref.8f24d3.2: = import_ref Other//o2, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.2eb = import_ref Other//o2, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -578,7 +578,7 @@ import Other library "o1"; // CHECK:STDOUT: %o1.var: ref %O1 = var o1 // CHECK:STDOUT: %.loc6_14: type = splice_block %O1.ref [template = constants.%O1] { // CHECK:STDOUT: %Other.ref.loc6: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%import_ref.880 [template = constants.%O1] +// CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [template = constants.%O1] // CHECK:STDOUT: } // CHECK:STDOUT: %o1: ref %O1 = bind_name o1, %o1.var // CHECK:STDOUT: name_binding_decl { @@ -588,23 +588,23 @@ import Other library "o1"; // CHECK:STDOUT: %o2.var: ref %O2 = var o2 // CHECK:STDOUT: %.loc7_14: type = splice_block %O2.ref [template = constants.%O2] { // CHECK:STDOUT: %Other.ref.loc7: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %O2.ref: type = name_ref O2, imports.%import_ref.328 [template = constants.%O2] +// CHECK:STDOUT: %O2.ref: type = name_ref O2, imports.%Other.O2 [template = constants.%O2] // CHECK:STDOUT: } // CHECK:STDOUT: %o2: ref %O2 = bind_name o2, %o2.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O1 [from "o1.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.1 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f24d3.1 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.481 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.481 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O2 [from "o2.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f24d3.2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f24d3.2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.2eb +// CHECK:STDOUT: .Self = imports.%Other.import_ref.2eb // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -646,12 +646,12 @@ import Other library "o1"; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Other: = namespace file.%Other.import, [template] { -// CHECK:STDOUT: .O1 = %import_ref.880 +// CHECK:STDOUT: .O1 = %Other.O1 // CHECK:STDOUT: import Other//o1 // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.880: type = import_ref Other//o1, O1, loaded [template = constants.%O1] -// CHECK:STDOUT: %import_ref.8f2: = import_ref Other//o1, loc4_11, loaded [template = constants.%complete_type] -// CHECK:STDOUT: %import_ref.481 = import_ref Other//o1, inst14 [no loc], unloaded +// CHECK:STDOUT: %Other.O1: type = import_ref Other//o1, O1, loaded [template = constants.%O1] +// CHECK:STDOUT: %Other.import_ref.8f2: = import_ref Other//o1, loc4_11, loaded [template = constants.%complete_type] +// CHECK:STDOUT: %Other.import_ref.481 = import_ref Other//o1, inst14 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -669,16 +669,16 @@ import Other library "o1"; // CHECK:STDOUT: %o1.var: ref %O1 = var o1 // CHECK:STDOUT: %.loc6_14: type = splice_block %O1.ref [template = constants.%O1] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [template = imports.%Other] -// CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%import_ref.880 [template = constants.%O1] +// CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [template = constants.%O1] // CHECK:STDOUT: } // CHECK:STDOUT: %o1: ref %O1 = bind_name o1, %o1.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @O1 [from "o1.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Other.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.481 +// CHECK:STDOUT: .Self = imports.%Other.import_ref.481 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { @@ -725,12 +725,12 @@ import Other library "o1"; // CHECK:STDOUT: --- import_conflict_reverse.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Main//local_other, Other, unloaded +// CHECK:STDOUT: %Main.Other = import_ref Main//local_other, Other, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .Other = imports.%import_ref +// CHECK:STDOUT: .Other = imports.%Main.Other // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon b/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon index a4fe5a6406cd..8f77c0df8a40 100644 --- a/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon @@ -215,7 +215,7 @@ var n: {} = i32; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude_fake_int // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/unused_lazy_import.carbon b/toolchain/check/testdata/packages/unused_lazy_import.carbon index 7d934b4c1e6c..2f0c8db5b3c6 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -46,7 +46,7 @@ impl package Implicit; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref = import_ref Implicit//default, A, unloaded +// CHECK:STDOUT: %Implicit.A = import_ref Implicit//default, A, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... @@ -55,7 +55,7 @@ impl package Implicit; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .A = imports.%import_ref +// CHECK:STDOUT: .A = imports.%Implicit.A // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: } // CHECK:STDOUT: %Implicit.import = import Implicit diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 291a4f7ddeca..eb0e863ec4ef 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -22,7 +22,7 @@ fn F() -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -33,8 +33,8 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index c44d5e5a1005..9db37640a2bc 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -33,7 +33,7 @@ fn F() { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -53,8 +53,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 45195537ff31..35dab8a96f25 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -24,7 +24,7 @@ fn F() -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -35,8 +35,8 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 7f0c853b4c81..1ee48e4e7b0c 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -147,7 +147,7 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index e4802ce67c0c..58225bffabae 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -28,7 +28,7 @@ let n2: i32 = undeclared->foo; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index 38c6f51e06ee..17b0904ca360 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -56,7 +56,7 @@ fn Deref(n: i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 6f8c86e27457..51f606afd162 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -31,7 +31,7 @@ var p2: i32->foo; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 7a6b001ebb28..41fabb62df4e 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -33,7 +33,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index 4dfb567715b9..5a8e2ea5844a 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -28,7 +28,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -39,8 +39,8 @@ var a: i32* = a_ref; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -100,10 +100,10 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.505 = import_ref Implicit//default, a_orig, unloaded -// CHECK:STDOUT: %import_ref.524: ref %ptr = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.a_orig = import_ref Implicit//default, a_orig, unloaded +// CHECK:STDOUT: %Implicit.a_ref: ref %ptr = import_ref Implicit//default, a_ref, loaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -111,8 +111,8 @@ var a: i32* = a_ref; // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_orig = imports.%import_ref.505 -// CHECK:STDOUT: .a_ref = imports.%import_ref.524 +// CHECK:STDOUT: .a_orig = imports.%Implicit.a_orig +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: } @@ -134,7 +134,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref %ptr = name_ref a_ref, imports.%import_ref.524 +// CHECK:STDOUT: %a_ref.ref: ref %ptr = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: %.loc4: %ptr = bind_value %a_ref.ref // CHECK:STDOUT: assign file.%a.var, %.loc4 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index 836d39eaabe5..8a21b3a24ede 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -29,7 +29,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index a17a4c4ecc33..8a0a20586c0b 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -32,7 +32,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index 3f8b370b2d32..965d9fe6b8dd 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -22,8 +22,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index c942d160bc60..1770eeb82975 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -31,7 +31,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -41,9 +41,9 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index 2849c0682ac2..034de1b9836c 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -31,7 +31,7 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 86efed946192..822b192d83ea 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -26,7 +26,7 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon index 92ef87a28b32..92d75fce69d8 100644 --- a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon @@ -27,7 +27,7 @@ fn Procedure() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon index 7e5ddbc0e76a..677ac10ceae2 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -42,7 +42,7 @@ fn G() -> C { // CHECK:STDOUT: %F: %F.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -68,8 +68,8 @@ fn G() -> C { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index 9d84141aeff0..9074bf6b5f23 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -50,7 +50,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %true: bool = bool_literal true [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -66,8 +66,8 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 961f7bb9272d..773f549a7709 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -35,8 +35,8 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 161c7bc6ab92..44cbd5b8b929 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -31,8 +31,8 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 0622aa8eeb12..2fc39a190c2b 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -30,7 +30,7 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index dba31d8e3348..2573a643c562 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -27,7 +27,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } 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 5b2b3ce5e7e2..6252a70856c2 100644 --- a/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon +++ b/toolchain/check/testdata/return/no_prelude/import_convert_function.carbon @@ -292,14 +292,14 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.42e: %Convert.type.275 = struct_value () [symbolic] // CHECK:STDOUT: %Self.as_type: type = facet_access_type %Self [symbolic] // CHECK:STDOUT: %Convert.assoc_type.c0e: type = assoc_entity_type %ImplicitAs.type.d62, %Convert.type.275 [symbolic] -// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.1 [symbolic] +// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic] // CHECK:STDOUT: %ImplicitAs.type.61e: type = facet_type <@ImplicitAs, @ImplicitAs(%i32.builtin)> [template] // CHECK:STDOUT: %Convert.type.059: type = fn_type @Convert.1, @ImplicitAs(%i32.builtin) [template] // CHECK:STDOUT: %Convert.4d7: %Convert.type.059 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.40f: type = assoc_entity_type %ImplicitAs.type.61e, %Convert.type.059 [template] -// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%import_ref.207961.1 [template] -// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.2 [symbolic] -// CHECK:STDOUT: %impl_witness.39c7: = impl_witness (imports.%import_ref.f35) [template] +// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%Core.import_ref.207961.1 [template] +// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.2 [symbolic] +// CHECK:STDOUT: %impl_witness.39c7: = impl_witness (imports.%Core.import_ref.f35) [template] // CHECK:STDOUT: %Convert.type.49f: type = fn_type @Convert.2 [template] // CHECK:STDOUT: %Convert.cb5: %Convert.type.49f = struct_value () [template] // CHECK:STDOUT: %Convert.bound.04a: = bound_method %int_0.5c6, %Convert.cb5 [template] @@ -310,7 +310,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.type.010: type = fn_type @Convert.1, @ImplicitAs(%D) [template] // CHECK:STDOUT: %Convert.d38: %Convert.type.010 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.514: type = assoc_entity_type %ImplicitAs.type.94e, %Convert.type.010 [template] -// CHECK:STDOUT: %assoc0.bce: %Convert.assoc_type.514 = assoc_entity element0, imports.%import_ref.207961.1 [template] +// CHECK:STDOUT: %assoc0.bce: %Convert.assoc_type.514 = assoc_entity element0, imports.%Core.import_ref.207961.1 [template] // CHECK:STDOUT: %impl_witness.39cb: = impl_witness (@impl.2.%Convert.decl) [template] // CHECK:STDOUT: %Convert.type.fff: type = fn_type @Convert.3 [template] // CHECK:STDOUT: %Convert.606: %Convert.type.fff = struct_value () [template] @@ -375,18 +375,18 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.3b9 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.d44: %ImplicitAs.type.cc7 = import_ref Core//default, ImplicitAs, loaded [template = constants.%ImplicitAs.generic] -// CHECK:STDOUT: %import_ref.ff5 = import_ref Core//default, inst49 [no loc], unloaded -// CHECK:STDOUT: %import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc9_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] -// CHECK:STDOUT: %import_ref.582: @ImplicitAs.%Convert.type (%Convert.type.275) = import_ref Core//default, Convert, loaded [symbolic = @ImplicitAs.%Convert (constants.%Convert.42e)] -// CHECK:STDOUT: %import_ref.207961.1 = import_ref Core//default, loc9_32, unloaded -// CHECK:STDOUT: %import_ref.de9: = import_ref Core//default, loc12_38, loaded [template = constants.%impl_witness.39c7] -// CHECK:STDOUT: %import_ref.872: type = import_ref Core//default, loc12_17, loaded [template = Core.IntLiteral] -// CHECK:STDOUT: %import_ref.4d9: type = import_ref Core//default, loc12_36, loaded [template = constants.%ImplicitAs.type.61e] +// CHECK:STDOUT: %Core.ImplicitAs: %ImplicitAs.type.cc7 = import_ref Core//default, ImplicitAs, loaded [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %Core.import_ref.ff5 = import_ref Core//default, inst49 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc9_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] +// CHECK:STDOUT: %Core.Convert: @ImplicitAs.%Convert.type (%Convert.type.275) = import_ref Core//default, Convert, loaded [symbolic = @ImplicitAs.%Convert (constants.%Convert.42e)] +// CHECK:STDOUT: %Core.import_ref.207961.1 = import_ref Core//default, loc9_32, unloaded +// CHECK:STDOUT: %Core.import_ref.de9: = import_ref Core//default, loc12_38, loaded [template = constants.%impl_witness.39c7] +// CHECK:STDOUT: %Core.import_ref.872: type = import_ref Core//default, loc12_17, loaded [template = Core.IntLiteral] +// CHECK:STDOUT: %Core.import_ref.4d9: type = import_ref Core//default, loc12_36, loaded [template = constants.%ImplicitAs.type.61e] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -429,7 +429,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc10_9.2: %i32.builtin = converted %int_0, %.loc10_9.1 [template = constants.%int_0.a54] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_0.a54) [template = constants.%C.808] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -444,7 +444,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc11_9.2: %i32.builtin = converted %int_1, %.loc11_9.1 [template = constants.%int_1.f38] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_1.f38) [template = constants.%C.8be] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -459,7 +459,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc12_9.2: %i32.builtin = converted %int_2, %.loc12_9.1 [template = constants.%int_2.5a1] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_2.5a1) [template = constants.%C.c17] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -474,7 +474,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc13_9.2: %i32.builtin = converted %int_3, %.loc13_9.1 [template = constants.%int_3.a0f] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_3.a0f) [template = constants.%C.414] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -489,7 +489,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc14_9.2: %i32.builtin = converted %int_4, %.loc14_9.1 [template = constants.%int_4.4f1] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_4.4f1) [template = constants.%C.488] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -504,7 +504,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc15_9.2: %i32.builtin = converted %int_5, %.loc15_9.1 [template = constants.%int_5.967] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_5.967) [template = constants.%C.3e2] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -519,7 +519,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc16_9.2: %i32.builtin = converted %int_6, %.loc16_9.1 [template = constants.%int_6.ec5] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_6.ec5) [template = constants.%C.78c] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -534,7 +534,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %.loc17_9.2: %i32.builtin = converted %int_7, %.loc17_9.1 [template = constants.%int_7.6ae] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%int_7.6ae) [template = constants.%C.6aa] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%import_ref.d44 [template = constants.%ImplicitAs.generic] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type.cc7 = name_ref ImplicitAs, imports.%Core.ImplicitAs [template = constants.%ImplicitAs.generic] // CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %ImplicitAs.type: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%D)> [template = constants.%ImplicitAs.type.94e] // CHECK:STDOUT: } @@ -551,19 +551,19 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.type: type = fn_type @Convert.1, @ImplicitAs(%T) [symbolic = %Convert.type (constants.%Convert.type.275)] // CHECK:STDOUT: %Convert: @ImplicitAs.%Convert.type (%Convert.type.275) = struct_value () [symbolic = %Convert (constants.%Convert.42e)] // CHECK:STDOUT: %Convert.assoc_type: type = assoc_entity_type @ImplicitAs.%ImplicitAs.type (%ImplicitAs.type.d62), @ImplicitAs.%Convert.type (%Convert.type.275) [symbolic = %Convert.assoc_type (constants.%Convert.assoc_type.c0e)] -// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] +// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ff5 -// CHECK:STDOUT: .Convert = imports.%import_ref.589 -// CHECK:STDOUT: witness = (imports.%import_ref.582) +// CHECK:STDOUT: .Self = imports.%Core.import_ref.ff5 +// CHECK:STDOUT: .Convert = imports.%Core.import_ref.589 +// CHECK:STDOUT: witness = (imports.%Core.Convert) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.872 as imports.%import_ref.4d9 [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%Core.import_ref.872 as imports.%Core.import_ref.4d9 [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.de9 +// CHECK:STDOUT: witness = imports.%Core.import_ref.de9 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %C as %ImplicitAs.type { @@ -1047,14 +1047,14 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.42e: %Convert.type.275 = struct_value () [symbolic] // CHECK:STDOUT: %Self.as_type: type = facet_access_type %Self [symbolic] // CHECK:STDOUT: %Convert.assoc_type.c0e: type = assoc_entity_type %ImplicitAs.type.d62, %Convert.type.275 [symbolic] -// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.1 [symbolic] +// CHECK:STDOUT: %assoc0.5048c6.1: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic] // CHECK:STDOUT: %ImplicitAs.type.61e: type = facet_type <@ImplicitAs, @ImplicitAs(%i32.builtin)> [template] // CHECK:STDOUT: %Convert.type.059: type = fn_type @Convert.1, @ImplicitAs(%i32.builtin) [template] // CHECK:STDOUT: %Convert.4d7: %Convert.type.059 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.40f: type = assoc_entity_type %ImplicitAs.type.61e, %Convert.type.059 [template] -// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%import_ref.207961.1 [template] -// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%import_ref.207961.2 [symbolic] -// CHECK:STDOUT: %impl_witness.39c: = impl_witness (imports.%import_ref.f35) [template] +// CHECK:STDOUT: %assoc0.44d: %Convert.assoc_type.40f = assoc_entity element0, imports.%Core.import_ref.207961.1 [template] +// CHECK:STDOUT: %assoc0.5048c6.2: %Convert.assoc_type.c0e = assoc_entity element0, imports.%Core.import_ref.207961.2 [symbolic] +// CHECK:STDOUT: %impl_witness.39c: = impl_witness (imports.%Core.import_ref.f35) [template] // CHECK:STDOUT: %Convert.type.49f: type = fn_type @Convert.2 [template] // CHECK:STDOUT: %Convert.cb5: %Convert.type.49f = struct_value () [template] // CHECK:STDOUT: %Convert.bound.04a: = bound_method %int_0.5c6, %Convert.cb5 [template] @@ -1065,7 +1065,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.type.334: type = fn_type @Convert.1, @ImplicitAs(%D) [template] // CHECK:STDOUT: %Convert.87c: %Convert.type.334 = struct_value () [template] // CHECK:STDOUT: %Convert.assoc_type.f99: type = assoc_entity_type %ImplicitAs.type.5f9, %Convert.type.334 [template] -// CHECK:STDOUT: %assoc0.4b2: %Convert.assoc_type.f99 = assoc_entity element0, imports.%import_ref.207961.1 [template] +// CHECK:STDOUT: %assoc0.4b2: %Convert.assoc_type.f99 = assoc_entity element0, imports.%Core.import_ref.207961.1 [template] // CHECK:STDOUT: %int_1.f38: %i32.builtin = int_value 1 [template] // CHECK:STDOUT: %C.012: type = class_type @C, @C(%int_1.f38) [template] // CHECK:STDOUT: %int_2.5a1: %i32.builtin = int_value 2 [template] @@ -1080,49 +1080,49 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %C.898: type = class_type @C, @C(%int_6.ec5) [template] // CHECK:STDOUT: %int_7.6ae: %i32.builtin = int_value 7 [template] // CHECK:STDOUT: %C.f0a: type = class_type @C, @C(%int_7.6ae) [template] -// CHECK:STDOUT: %impl_witness.368: = impl_witness (imports.%import_ref.5f3) [template] +// CHECK:STDOUT: %impl_witness.368: = impl_witness (imports.%P.import_ref.5f3) [template] // CHECK:STDOUT: %Convert.type.c72: type = fn_type @Convert.3 [template] // CHECK:STDOUT: %Convert.4f5: %Convert.type.c72 = struct_value () [template] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %Convert.bound.92d: = bound_method %int_1.5b8, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.172: %C.012 = struct_value () [template] -// CHECK:STDOUT: %impl_witness.29f: = impl_witness (imports.%import_ref.4da) [template] +// CHECK:STDOUT: %impl_witness.29f: = impl_witness (imports.%P.import_ref.4da) [template] // CHECK:STDOUT: %Convert.type.d88: type = fn_type @Convert.4 [template] // CHECK:STDOUT: %Convert.ecc: %Convert.type.d88 = struct_value () [template] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %Convert.bound.1b9: = bound_method %int_2.ecc, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.418: %C.3e6 = struct_value () [template] -// CHECK:STDOUT: %impl_witness.3ac: = impl_witness (imports.%import_ref.ebf) [template] +// CHECK:STDOUT: %impl_witness.3ac: = impl_witness (imports.%P.import_ref.ebf) [template] // CHECK:STDOUT: %Convert.type.c17: type = fn_type @Convert.5 [template] // CHECK:STDOUT: %Convert.c2b: %Convert.type.c17 = struct_value () [template] // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %Convert.bound.b6b: = bound_method %int_3.1ba, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.bba: %C.4d9 = struct_value () [template] -// CHECK:STDOUT: %impl_witness.b40: = impl_witness (imports.%import_ref.f13) [template] +// CHECK:STDOUT: %impl_witness.b40: = impl_witness (imports.%P.import_ref.f13) [template] // CHECK:STDOUT: %Convert.type.70f: type = fn_type @Convert.6 [template] // CHECK:STDOUT: %Convert.2b5: %Convert.type.70f = struct_value () [template] // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %Convert.bound.626: = bound_method %int_4.0c1, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.4b6: %C.a67 = struct_value () [template] -// CHECK:STDOUT: %impl_witness.20f: = impl_witness (imports.%import_ref.97a) [template] +// CHECK:STDOUT: %impl_witness.20f: = impl_witness (imports.%P.import_ref.97a) [template] // CHECK:STDOUT: %Convert.type.782: type = fn_type @Convert.7 [template] // CHECK:STDOUT: %Convert.625: %Convert.type.782 = struct_value () [template] // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %Convert.bound.910: = bound_method %int_5.64b, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.75e: %C.65c = struct_value () [template] -// CHECK:STDOUT: %impl_witness.9b3: = impl_witness (imports.%import_ref.e04) [template] +// CHECK:STDOUT: %impl_witness.9b3: = impl_witness (imports.%P.import_ref.e04) [template] // CHECK:STDOUT: %Convert.type.0e6: type = fn_type @Convert.8 [template] // CHECK:STDOUT: %Convert.73d: %Convert.type.0e6 = struct_value () [template] // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %Convert.bound.e3a: = bound_method %int_6.462, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.02a: %C.898 = struct_value () [template] -// CHECK:STDOUT: %impl_witness.b5b: = impl_witness (imports.%import_ref.6aa) [template] +// CHECK:STDOUT: %impl_witness.b5b: = impl_witness (imports.%P.import_ref.6aa) [template] // CHECK:STDOUT: %Convert.type.9e9: type = fn_type @Convert.9 [template] // CHECK:STDOUT: %Convert.e8e: %Convert.type.9e9 = struct_value () [template] // CHECK:STDOUT: %int_7.29f: Core.IntLiteral = int_value 7 [template] // CHECK:STDOUT: %Convert.bound.06a: = bound_method %int_7.29f, %Convert.cb5 [template] // CHECK:STDOUT: %C.val.654: %C.f0a = struct_value () [template] -// CHECK:STDOUT: %impl_witness.dfb: = impl_witness (imports.%import_ref.243) [template] +// CHECK:STDOUT: %impl_witness.dfb: = impl_witness (imports.%P.import_ref.243) [template] // CHECK:STDOUT: %Convert.type.fc1: type = fn_type @Convert.10 [template] // CHECK:STDOUT: %Convert.430: %Convert.type.fc1 = struct_value () [template] // CHECK:STDOUT: %Make.type: type = fn_type @Make [template] @@ -1131,56 +1131,56 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %P: = namespace file.%P.import, [template] { -// CHECK:STDOUT: .D = %import_ref.b0a -// CHECK:STDOUT: .C = %import_ref.f9e -// CHECK:STDOUT: .Make = %import_ref.981 +// CHECK:STDOUT: .D = %P.D +// CHECK:STDOUT: .C = %P.C +// CHECK:STDOUT: .Make = %P.Make // CHECK:STDOUT: import P//library // CHECK:STDOUT: } // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.3b9 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.b0a: type = import_ref P//library, D, loaded [template = constants.%D] -// CHECK:STDOUT: %import_ref.7e5: = import_ref P//library, loc7_35, loaded [template = constants.%complete_type.682] -// CHECK:STDOUT: %import_ref.cab = import_ref P//library, inst47 [no loc], unloaded -// CHECK:STDOUT: %import_ref.a99 = import_ref P//library, loc7_16, unloaded -// CHECK:STDOUT: %import_ref.9d2 = import_ref P//library, loc7_28, unloaded -// CHECK:STDOUT: %import_ref.f9e: %C.type = import_ref P//library, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.8f2: = import_ref P//library, loc6_19, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.d9b = import_ref P//library, inst42 [no loc], unloaded -// CHECK:STDOUT: %import_ref.ff5 = import_ref Core//default, inst49 [no loc], unloaded -// CHECK:STDOUT: %import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc9_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] -// CHECK:STDOUT: %import_ref.e69 = import_ref Core//default, Convert, unloaded -// CHECK:STDOUT: %import_ref.207961.1 = import_ref Core//default, loc9_32, unloaded -// CHECK:STDOUT: %import_ref.de9: = import_ref Core//default, loc12_38, loaded [template = constants.%impl_witness.39c] -// CHECK:STDOUT: %import_ref.872: type = import_ref Core//default, loc12_17, loaded [template = Core.IntLiteral] -// CHECK:STDOUT: %import_ref.4d9: type = import_ref Core//default, loc12_36, loaded [template = constants.%ImplicitAs.type.61e] -// CHECK:STDOUT: %import_ref.316: = import_ref P//library, loc10_33, loaded [template = constants.%impl_witness.368] -// CHECK:STDOUT: %import_ref.624: type = import_ref P//library, loc10_9, loaded [template = constants.%C.76d] -// CHECK:STDOUT: %import_ref.b769fa.1: type = import_ref P//library, loc10_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.776: = import_ref P//library, loc11_33, loaded [template = constants.%impl_witness.29f] -// CHECK:STDOUT: %import_ref.8ff: type = import_ref P//library, loc11_9, loaded [template = constants.%C.012] -// CHECK:STDOUT: %import_ref.b769fa.2: type = import_ref P//library, loc11_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.848: = import_ref P//library, loc12_33, loaded [template = constants.%impl_witness.3ac] -// CHECK:STDOUT: %import_ref.f4d: type = import_ref P//library, loc12_9, loaded [template = constants.%C.3e6] -// CHECK:STDOUT: %import_ref.b769fa.3: type = import_ref P//library, loc12_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.036: = import_ref P//library, loc13_33, loaded [template = constants.%impl_witness.b40] -// CHECK:STDOUT: %import_ref.dd2: type = import_ref P//library, loc13_9, loaded [template = constants.%C.4d9] -// CHECK:STDOUT: %import_ref.b769fa.4: type = import_ref P//library, loc13_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.e33: = import_ref P//library, loc14_33, loaded [template = constants.%impl_witness.20f] -// CHECK:STDOUT: %import_ref.2c7: type = import_ref P//library, loc14_9, loaded [template = constants.%C.a67] -// CHECK:STDOUT: %import_ref.b769fa.5: type = import_ref P//library, loc14_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.1aa: = import_ref P//library, loc15_33, loaded [template = constants.%impl_witness.9b3] -// CHECK:STDOUT: %import_ref.759: type = import_ref P//library, loc15_9, loaded [template = constants.%C.65c] -// CHECK:STDOUT: %import_ref.b769fa.6: type = import_ref P//library, loc15_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.058: = import_ref P//library, loc16_33, loaded [template = constants.%impl_witness.b5b] -// CHECK:STDOUT: %import_ref.56e: type = import_ref P//library, loc16_9, loaded [template = constants.%C.898] -// CHECK:STDOUT: %import_ref.b769fa.7: type = import_ref P//library, loc16_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.d6f: = import_ref P//library, loc17_33, loaded [template = constants.%impl_witness.dfb] -// CHECK:STDOUT: %import_ref.8ba: type = import_ref P//library, loc17_9, loaded [template = constants.%C.f0a] -// CHECK:STDOUT: %import_ref.b769fa.8: type = import_ref P//library, loc17_31, loaded [template = constants.%ImplicitAs.type.5f9] -// CHECK:STDOUT: %import_ref.981: %Make.type = import_ref P//library, Make, loaded [template = constants.%Make] +// CHECK:STDOUT: %P.D: type = import_ref P//library, D, loaded [template = constants.%D] +// CHECK:STDOUT: %P.import_ref.7e5: = import_ref P//library, loc7_35, loaded [template = constants.%complete_type.682] +// CHECK:STDOUT: %P.import_ref.cab = import_ref P//library, inst47 [no loc], unloaded +// CHECK:STDOUT: %P.import_ref.a99 = import_ref P//library, loc7_16, unloaded +// CHECK:STDOUT: %P.import_ref.9d2 = import_ref P//library, loc7_28, unloaded +// CHECK:STDOUT: %P.C: %C.type = import_ref P//library, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %P.import_ref.8f2: = import_ref P//library, loc6_19, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %P.import_ref.d9b = import_ref P//library, inst42 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.ff5 = import_ref Core//default, inst49 [no loc], unloaded +// CHECK:STDOUT: %Core.import_ref.589: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = import_ref Core//default, loc9_32, loaded [symbolic = @ImplicitAs.%assoc0 (constants.%assoc0.5048c6.2)] +// CHECK:STDOUT: %Core.Convert = import_ref Core//default, Convert, unloaded +// CHECK:STDOUT: %Core.import_ref.207961.1 = import_ref Core//default, loc9_32, unloaded +// CHECK:STDOUT: %Core.import_ref.de9: = import_ref Core//default, loc12_38, loaded [template = constants.%impl_witness.39c] +// CHECK:STDOUT: %Core.import_ref.872: type = import_ref Core//default, loc12_17, loaded [template = Core.IntLiteral] +// CHECK:STDOUT: %Core.import_ref.4d9: type = import_ref Core//default, loc12_36, loaded [template = constants.%ImplicitAs.type.61e] +// CHECK:STDOUT: %P.import_ref.316: = import_ref P//library, loc10_33, loaded [template = constants.%impl_witness.368] +// CHECK:STDOUT: %P.import_ref.624: type = import_ref P//library, loc10_9, loaded [template = constants.%C.76d] +// CHECK:STDOUT: %P.import_ref.b769fa.1: type = import_ref P//library, loc10_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.776: = import_ref P//library, loc11_33, loaded [template = constants.%impl_witness.29f] +// CHECK:STDOUT: %P.import_ref.8ff: type = import_ref P//library, loc11_9, loaded [template = constants.%C.012] +// CHECK:STDOUT: %P.import_ref.b769fa.2: type = import_ref P//library, loc11_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.848: = import_ref P//library, loc12_33, loaded [template = constants.%impl_witness.3ac] +// CHECK:STDOUT: %P.import_ref.f4d: type = import_ref P//library, loc12_9, loaded [template = constants.%C.3e6] +// CHECK:STDOUT: %P.import_ref.b769fa.3: type = import_ref P//library, loc12_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.036: = import_ref P//library, loc13_33, loaded [template = constants.%impl_witness.b40] +// CHECK:STDOUT: %P.import_ref.dd2: type = import_ref P//library, loc13_9, loaded [template = constants.%C.4d9] +// CHECK:STDOUT: %P.import_ref.b769fa.4: type = import_ref P//library, loc13_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.e33: = import_ref P//library, loc14_33, loaded [template = constants.%impl_witness.20f] +// CHECK:STDOUT: %P.import_ref.2c7: type = import_ref P//library, loc14_9, loaded [template = constants.%C.a67] +// CHECK:STDOUT: %P.import_ref.b769fa.5: type = import_ref P//library, loc14_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.1aa: = import_ref P//library, loc15_33, loaded [template = constants.%impl_witness.9b3] +// CHECK:STDOUT: %P.import_ref.759: type = import_ref P//library, loc15_9, loaded [template = constants.%C.65c] +// CHECK:STDOUT: %P.import_ref.b769fa.6: type = import_ref P//library, loc15_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.058: = import_ref P//library, loc16_33, loaded [template = constants.%impl_witness.b5b] +// CHECK:STDOUT: %P.import_ref.56e: type = import_ref P//library, loc16_9, loaded [template = constants.%C.898] +// CHECK:STDOUT: %P.import_ref.b769fa.7: type = import_ref P//library, loc16_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.import_ref.d6f: = import_ref P//library, loc17_33, loaded [template = constants.%impl_witness.dfb] +// CHECK:STDOUT: %P.import_ref.8ba: type = import_ref P//library, loc17_9, loaded [template = constants.%C.f0a] +// CHECK:STDOUT: %P.import_ref.b769fa.8: type = import_ref P//library, loc17_31, loaded [template = constants.%ImplicitAs.type.5f9] +// CHECK:STDOUT: %P.Make: %Make.type = import_ref P//library, Make, loaded [template = constants.%Make] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -1198,7 +1198,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %return.param_patt: %D = out_param_pattern %return.patt, runtime_param1 // CHECK:STDOUT: } { // CHECK:STDOUT: %P.ref.loc7: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.b0a [template = constants.%D] +// CHECK:STDOUT: %D.ref: type = name_ref D, imports.%P.D [template = constants.%D] // CHECK:STDOUT: %n.param: %i32.builtin = value_param runtime_param0 // CHECK:STDOUT: %.loc7_10.1: type = splice_block %.loc7_10.3 [template = constants.%i32.builtin] { // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] @@ -1222,68 +1222,68 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: %Convert.type: type = fn_type @Convert.1, @ImplicitAs(%T) [symbolic = %Convert.type (constants.%Convert.type.275)] // CHECK:STDOUT: %Convert: @ImplicitAs.%Convert.type (%Convert.type.275) = struct_value () [symbolic = %Convert (constants.%Convert.42e)] // CHECK:STDOUT: %Convert.assoc_type: type = assoc_entity_type @ImplicitAs.%ImplicitAs.type (%ImplicitAs.type.d62), @ImplicitAs.%Convert.type (%Convert.type.275) [symbolic = %Convert.assoc_type (constants.%Convert.assoc_type.c0e)] -// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] +// CHECK:STDOUT: %assoc0: @ImplicitAs.%Convert.assoc_type (%Convert.assoc_type.c0e) = assoc_entity element0, imports.%Core.import_ref.207961.1 [symbolic = %assoc0 (constants.%assoc0.5048c6.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.ff5 -// CHECK:STDOUT: .Convert = imports.%import_ref.589 -// CHECK:STDOUT: witness = (imports.%import_ref.e69) +// CHECK:STDOUT: .Self = imports.%Core.import_ref.ff5 +// CHECK:STDOUT: .Convert = imports.%Core.import_ref.589 +// CHECK:STDOUT: witness = (imports.%Core.Convert) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.1: imports.%import_ref.872 as imports.%import_ref.4d9 [from "core.carbon"] { +// CHECK:STDOUT: impl @impl.1: imports.%Core.import_ref.872 as imports.%Core.import_ref.4d9 [from "core.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.de9 +// CHECK:STDOUT: witness = imports.%Core.import_ref.de9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.2: imports.%import_ref.624 as imports.%import_ref.b769fa.1 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.2: imports.%P.import_ref.624 as imports.%P.import_ref.b769fa.1 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.316 +// CHECK:STDOUT: witness = imports.%P.import_ref.316 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.3: imports.%import_ref.8ff as imports.%import_ref.b769fa.2 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.3: imports.%P.import_ref.8ff as imports.%P.import_ref.b769fa.2 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.776 +// CHECK:STDOUT: witness = imports.%P.import_ref.776 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.4: imports.%import_ref.f4d as imports.%import_ref.b769fa.3 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.4: imports.%P.import_ref.f4d as imports.%P.import_ref.b769fa.3 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.848 +// CHECK:STDOUT: witness = imports.%P.import_ref.848 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.5: imports.%import_ref.dd2 as imports.%import_ref.b769fa.4 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.5: imports.%P.import_ref.dd2 as imports.%P.import_ref.b769fa.4 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.036 +// CHECK:STDOUT: witness = imports.%P.import_ref.036 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.6: imports.%import_ref.2c7 as imports.%import_ref.b769fa.5 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.6: imports.%P.import_ref.2c7 as imports.%P.import_ref.b769fa.5 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.e33 +// CHECK:STDOUT: witness = imports.%P.import_ref.e33 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.7: imports.%import_ref.759 as imports.%import_ref.b769fa.6 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.7: imports.%P.import_ref.759 as imports.%P.import_ref.b769fa.6 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.1aa +// CHECK:STDOUT: witness = imports.%P.import_ref.1aa // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.8: imports.%import_ref.56e as imports.%import_ref.b769fa.7 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.8: imports.%P.import_ref.56e as imports.%P.import_ref.b769fa.7 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.058 +// CHECK:STDOUT: witness = imports.%P.import_ref.058 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: impl @impl.9: imports.%import_ref.8ba as imports.%import_ref.b769fa.8 [from "library.carbon"] { +// CHECK:STDOUT: impl @impl.9: imports.%P.import_ref.8ba as imports.%P.import_ref.b769fa.8 [from "library.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = imports.%import_ref.d6f +// CHECK:STDOUT: witness = imports.%P.import_ref.d6f // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @D [from "library.carbon"] { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.7e5 +// CHECK:STDOUT: complete_type_witness = imports.%P.import_ref.7e5 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.cab -// CHECK:STDOUT: .n = imports.%import_ref.a99 -// CHECK:STDOUT: .m = imports.%import_ref.9d2 +// CHECK:STDOUT: .Self = imports.%P.import_ref.cab +// CHECK:STDOUT: .n = imports.%P.import_ref.a99 +// CHECK:STDOUT: .m = imports.%P.import_ref.9d2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @C(constants.%N: %i32.builtin) [from "library.carbon"] { @@ -1293,10 +1293,10 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%P.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.d9b +// CHECK:STDOUT: .Self = imports.%P.import_ref.d9b // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1310,7 +1310,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc8: // CHECK:STDOUT: %.loc8_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc8: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc8: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc8: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [template = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc8_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc8_34: = bound_method %int_0, %impl.elem0.loc8_34 [template = constants.%Convert.bound.04a] @@ -1337,7 +1337,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc9: // CHECK:STDOUT: %.loc9_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc9: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc9: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc9: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc9_34: = bound_method %int_1, %impl.elem0.loc9_34 [template = constants.%Convert.bound.92d] @@ -1364,7 +1364,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc10: // CHECK:STDOUT: %.loc10_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc10: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc10: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc10: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0.loc10_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc10_34: = bound_method %int_2, %impl.elem0.loc10_34 [template = constants.%Convert.bound.1b9] @@ -1391,7 +1391,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc11: // CHECK:STDOUT: %.loc11_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc11: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc11: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc11: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [template = constants.%int_3.1ba] // CHECK:STDOUT: %impl.elem0.loc11_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc11_34: = bound_method %int_3, %impl.elem0.loc11_34 [template = constants.%Convert.bound.b6b] @@ -1418,7 +1418,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc12: // CHECK:STDOUT: %.loc12_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc12: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc12: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc12: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_4: Core.IntLiteral = int_value 4 [template = constants.%int_4.0c1] // CHECK:STDOUT: %impl.elem0.loc12_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc12_34: = bound_method %int_4, %impl.elem0.loc12_34 [template = constants.%Convert.bound.626] @@ -1445,7 +1445,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc13: // CHECK:STDOUT: %.loc13_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc13: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc13: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc13: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_5: Core.IntLiteral = int_value 5 [template = constants.%int_5.64b] // CHECK:STDOUT: %impl.elem0.loc13_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc13_34: = bound_method %int_5, %impl.elem0.loc13_34 [template = constants.%Convert.bound.910] @@ -1472,7 +1472,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc14: // CHECK:STDOUT: %.loc14_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc14: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc14: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc14: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_6: Core.IntLiteral = int_value 6 [template = constants.%int_6.462] // CHECK:STDOUT: %impl.elem0.loc14_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc14_34: = bound_method %int_6, %impl.elem0.loc14_34 [template = constants.%Convert.bound.e3a] @@ -1499,7 +1499,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: !if.then.loc15: // CHECK:STDOUT: %.loc15_24.1: %empty_struct_type = struct_literal () // CHECK:STDOUT: %P.ref.loc15: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %C.ref.loc15: %C.type = name_ref C, imports.%import_ref.f9e [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref.loc15: %C.type = name_ref C, imports.%P.C [template = constants.%C.generic] // CHECK:STDOUT: %int_7: Core.IntLiteral = int_value 7 [template = constants.%int_7.29f] // CHECK:STDOUT: %impl.elem0.loc15_34: %Convert.type.059 = impl_witness_access constants.%impl_witness.39c, element0 [template = constants.%Convert.cb5] // CHECK:STDOUT: %Convert.bound.loc15_34: = bound_method %int_7, %impl.elem0.loc15_34 [template = constants.%Convert.bound.06a] @@ -1521,7 +1521,7 @@ fn F0(n: i32) -> P.D { // CHECK:STDOUT: // CHECK:STDOUT: !if.else.loc15: // CHECK:STDOUT: %P.ref.loc16: = name_ref P, imports.%P [template = imports.%P] -// CHECK:STDOUT: %Make.ref: %Make.type = name_ref Make, imports.%import_ref.981 [template = constants.%Make] +// CHECK:STDOUT: %Make.ref: %Make.type = name_ref Make, imports.%P.Make [template = constants.%Make] // CHECK:STDOUT: %.loc7_15: ref %D = splice_block %return {} // CHECK:STDOUT: %Make.call: init %D = call %Make.ref() to %.loc7_15 // CHECK:STDOUT: return %Make.call to %return diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 1a30cd762453..4677426f96e6 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -38,7 +38,7 @@ fn G() -> i32 { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -58,8 +58,8 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 3a15582f9a80..79bf922e2ff2 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -37,7 +37,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %true: bool = bool_literal true [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -55,9 +55,9 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index 53177fd682a6..ef7e30a96678 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -23,7 +23,7 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_3.1ba, %Convert.956 [template] @@ -34,8 +34,8 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index dada9fd21f86..da4586c6ebb2 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -26,7 +26,7 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: %int_35.c79: Core.IntLiteral = int_value 35 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.75f: = bound_method %int_15.447, %Convert.956 [template] @@ -40,8 +40,8 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index eca5ab6107c2..a63df0e61723 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -21,7 +21,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %Main: %Main.type = struct_value () [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -31,8 +31,8 @@ fn Main() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index d55c31ebeeaa..134aa03981c1 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -25,7 +25,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 8235b1703edd..6228e0401978 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -71,7 +71,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index b2c54d646213..49220a7a6411 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -33,7 +33,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index c678e37296cb..10ddfd9ab0a8 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -26,7 +26,7 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index ba4323f6cd58..4cb2c236f81e 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -30,8 +30,8 @@ var y: i32 = x.b; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index b2f9783e9989..26c25ee178a4 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -24,7 +24,7 @@ var y: i32 = x.b; // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_4.0c1, %Convert.956 [template] @@ -35,8 +35,8 @@ var y: i32 = x.b; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index deeacc573ca9..bf7feb807207 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -26,7 +26,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 4c4883101744..95f9e2c02d0e 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -27,8 +27,8 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index bcee97492216..b204724cf3c8 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -26,7 +26,7 @@ var x: {.a = 1}; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index 5f6d07030cd5..88f1110b9fcc 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -61,7 +61,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -103,8 +103,8 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -288,7 +288,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.ea0: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%import_ref.773), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%Implicit.import_ref.773), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.e14: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.4cb: %Convert.type.e14 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.dc5: = bound_method %int_1.5b8, %Convert.4cb [template] @@ -304,26 +304,26 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.61d: ref %struct_type.a = import_ref Implicit//default, a_ref, loaded -// CHECK:STDOUT: %import_ref.1d0: ref %struct_type.a.d.9db = import_ref Implicit//default, b_ref, loaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref: ref %struct_type.a = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.b_ref: ref %struct_type.a.d.9db = import_ref Implicit//default, b_ref, loaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 -// CHECK:STDOUT: .ImplicitAs = %import_ref.e26 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.61d -// CHECK:STDOUT: .b_ref = imports.%import_ref.1d0 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b @@ -367,7 +367,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C.a8a = var c // CHECK:STDOUT: %.loc6_26.1: type = splice_block %C [template = constants.%C.a8a] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %.loc6_25.1: %struct_type.a.b.cfd = struct_literal (%int_1, %int_2) @@ -397,10 +397,10 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.b8b +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.b8b // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -408,13 +408,13 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref %struct_type.a = name_ref a_ref, imports.%import_ref.61d +// CHECK:STDOUT: %a_ref.ref: ref %struct_type.a = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: %.loc4_20.1: ref %i32 = struct_access %a_ref.ref, element0 // CHECK:STDOUT: %.loc4_20.2: %i32 = bind_value %.loc4_20.1 // CHECK:STDOUT: %.loc4_20.3: init %struct_type.a = struct_init (%.loc4_20.2) to file.%a.var // CHECK:STDOUT: %.loc4_1: init %struct_type.a = converted %a_ref.ref, %.loc4_20.3 // CHECK:STDOUT: assign file.%a.var, %.loc4_1 -// CHECK:STDOUT: %b_ref.ref: ref %struct_type.a.d.9db = name_ref b_ref, imports.%import_ref.1d0 +// CHECK:STDOUT: %b_ref.ref: ref %struct_type.a.d.9db = name_ref b_ref, imports.%Implicit.b_ref // CHECK:STDOUT: %.loc5_47.1: ref %struct_type.b.c = struct_access %b_ref.ref, element0 // CHECK:STDOUT: %.loc5_47.2: ref %i32 = struct_access %.loc5_47.1, element0 // CHECK:STDOUT: %.loc5_47.3: %i32 = bind_value %.loc5_47.2 @@ -437,7 +437,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: %.loc5_47.19: init %struct_type.a.d.9db = struct_init (%.loc5_47.14, %.loc5_47.18) to file.%b.var // CHECK:STDOUT: %.loc5_1: init %struct_type.a.d.9db = converted %b_ref.ref, %.loc5_47.19 // CHECK:STDOUT: assign file.%b.var, %.loc5_1 -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc6: ref %C.a8a = splice_block file.%c.var {} // CHECK:STDOUT: %F.call: init %C.a8a = call %F.ref() to %.loc6 // CHECK:STDOUT: assign file.%c.var, %F.call @@ -480,24 +480,24 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f64 = import_ref Implicit//default, a_ref, unloaded -// CHECK:STDOUT: %import_ref.4fb = import_ref Implicit//default, b_ref, unloaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref = import_ref Implicit//default, a_ref, unloaded +// CHECK:STDOUT: %Implicit.b_ref = import_ref Implicit//default, b_ref, unloaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.f64 -// CHECK:STDOUT: .b_ref = imports.%import_ref.4fb -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .c_bad = %c_bad // CHECK:STDOUT: } @@ -510,7 +510,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c_bad.var: ref = var c_bad // CHECK:STDOUT: %.1: = splice_block [template = ] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %.loc11_29: %struct_type.c.d = struct_literal (%int_1, %int_2) @@ -525,10 +525,10 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.b8b +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.b8b // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -536,7 +536,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc11: ref %C.a8a = temporary_storage // CHECK:STDOUT: %F.call: init %C.a8a = call %F.ref() to %.loc11 // CHECK:STDOUT: assign file.%c_bad.var, @@ -571,7 +571,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.ea0: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%import_ref.773), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%Implicit.import_ref.773), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.e14: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.4cb: %Convert.type.e14 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.a00: = bound_method %int_3.1ba, %Convert.4cb [template] @@ -591,25 +591,25 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f64 = import_ref Implicit//default, a_ref, unloaded -// CHECK:STDOUT: %import_ref.4fb = import_ref Implicit//default, b_ref, unloaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref = import_ref Implicit//default, a_ref, unloaded +// CHECK:STDOUT: %Implicit.b_ref = import_ref Implicit//default, b_ref, unloaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.e26 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc8_34, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.b8b = import_ref Implicit//default, inst1073 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.f64 -// CHECK:STDOUT: .b_ref = imports.%import_ref.4fb -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .c_bad = %c_bad // CHECK:STDOUT: } @@ -622,7 +622,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c_bad.var: ref %C.5a7 = var c_bad // CHECK:STDOUT: %.loc10_30.1: type = splice_block %C [template = constants.%C.5a7] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [template = constants.%int_3.1ba] // CHECK:STDOUT: %int_4: Core.IntLiteral = int_value 4 [template = constants.%int_4.0c1] // CHECK:STDOUT: %.loc10_29.1: %struct_type.a.b.cfd = struct_literal (%int_3, %int_4) @@ -652,10 +652,10 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.b8b +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.b8b // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -663,7 +663,7 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc10_36: ref %C.a8a = temporary_storage // CHECK:STDOUT: %F.call: init %C.a8a = call %F.ref() to %.loc10_36 // CHECK:STDOUT: %.loc10_1: %C.5a7 = converted %F.call, [template = ] diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index 6e50e01565e0..69d315b0649b 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -31,7 +31,7 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 4085a9716336..6a21cb9f876c 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -25,7 +25,7 @@ var z: i32 = y; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [template] // CHECK:STDOUT: %struct_type.a.b.fbb: type = struct_type {.a: f64, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_1.5b8, %Convert.956 [template] @@ -36,9 +36,9 @@ var z: i32 = y; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index c92366886498..d46c71f01f06 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -30,7 +30,7 @@ fn G() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index b9191f099c6a..3f4911045025 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -20,7 +20,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_4.0c1, %Convert.956 [template] @@ -31,8 +31,8 @@ var y: {.a: i32} = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/partially_const.carbon b/toolchain/check/testdata/struct/partially_const.carbon index 62de806e34a7..7bde72308946 100644 --- a/toolchain/check/testdata/struct/partially_const.carbon +++ b/toolchain/check/testdata/struct/partially_const.carbon @@ -23,7 +23,7 @@ fn Make(n: i32) -> {.a: i32, .b: i32, .c: i32} { // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %struct_type.a.b.c.1ee: type = struct_type {.a: Core.IntLiteral, .b: %i32, .c: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -33,8 +33,8 @@ fn Make(n: i32) -> {.a: i32, .b: i32, .c: i32} { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index f5032b62a733..90fa4737c637 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -37,8 +37,8 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Float = %import_ref.1d6 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Float = %Core.Float // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 8f6b8865dc89..d0fa6c31ee2d 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -24,7 +24,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %struct_type.a.b.057: type = struct_type {.a: Core.IntLiteral, .b: %tuple.type.985} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -39,8 +39,8 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index db4c16588264..7d8c2ae5f136 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -24,7 +24,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %struct_type.a.b.cfd: type = struct_type {.a: Core.IntLiteral, .b: Core.IntLiteral} [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -38,8 +38,8 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/element_access.carbon b/toolchain/check/testdata/tuple/access/element_access.carbon index 4ce3ac5a7217..597febf4ca1a 100644 --- a/toolchain/check/testdata/tuple/access/element_access.carbon +++ b/toolchain/check/testdata/tuple/access/element_access.carbon @@ -22,7 +22,7 @@ var c: i32 = b.0; // CHECK:STDOUT: %int_12.6a3: Core.IntLiteral = int_value 12 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_12.6a3, %Convert.956 [template] @@ -34,8 +34,8 @@ var c: i32 = b.0; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_access_error.carbon b/toolchain/check/testdata/tuple/access/fail_access_error.carbon index 5d8771dd4dfe..d0b7b4765a1c 100644 --- a/toolchain/check/testdata/tuple/access/fail_access_error.carbon +++ b/toolchain/check/testdata/tuple/access/fail_access_error.carbon @@ -26,7 +26,7 @@ var b: i32 = a.(oops); // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -40,8 +40,8 @@ var b: i32 = a.(oops); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_large_index.carbon b/toolchain/check/testdata/tuple/access/fail_large_index.carbon index f213eaf841c9..1a0c9e7170ef 100644 --- a/toolchain/check/testdata/tuple/access/fail_large_index.carbon +++ b/toolchain/check/testdata/tuple/access/fail_large_index.carbon @@ -31,7 +31,7 @@ var d: i32 = b.(0x7FFF_FFFF); // CHECK:STDOUT: %int_12.6a3: Core.IntLiteral = int_value 12 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_12.6a3, %Convert.956 [template] @@ -44,8 +44,8 @@ var d: i32 = b.(0x7FFF_FFFF); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_negative_indexing.carbon b/toolchain/check/testdata/tuple/access/fail_negative_indexing.carbon index 1651f47d6724..c27da884d553 100644 --- a/toolchain/check/testdata/tuple/access/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/tuple/access/fail_negative_indexing.carbon @@ -26,7 +26,7 @@ var b: i32 = a.(-10); // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -38,7 +38,7 @@ var b: i32 = a.(-10); // CHECK:STDOUT: %tuple: %tuple.type.d07 = tuple_value (%int_12.1e1, %int_6.e56) [template] // CHECK:STDOUT: %int_10: Core.IntLiteral = int_value 10 [template] // CHECK:STDOUT: %Op.type.e42: type = fn_type @Op.13 [template] -// CHECK:STDOUT: %impl_witness.0f6: = impl_witness (imports.%import_ref.c15) [template] +// CHECK:STDOUT: %impl_witness.0f6: = impl_witness (imports.%Core.import_ref.c15) [template] // CHECK:STDOUT: %Op.type.1be: type = fn_type @Op.14 [template] // CHECK:STDOUT: %Op.bba: %Op.type.1be = struct_value () [template] // CHECK:STDOUT: %Op.bound: = bound_method %int_10, %Op.bba [template] @@ -47,9 +47,9 @@ var b: i32 = a.(-10); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Negate = %import_ref.6e9 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Negate = %Core.Negate // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_non_deterministic_type.carbon b/toolchain/check/testdata/tuple/access/fail_non_deterministic_type.carbon index 42464dffdff6..b97a8c0dd5f0 100644 --- a/toolchain/check/testdata/tuple/access/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/tuple/access/fail_non_deterministic_type.carbon @@ -27,7 +27,7 @@ var c: i32 = a.(b); // CHECK:STDOUT: %int_3.1ba: Core.IntLiteral = int_value 3 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ef9: = bound_method %int_2.ecc, %Convert.956 [template] @@ -45,8 +45,8 @@ var c: i32 = a.(b); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_non_int_indexing.carbon b/toolchain/check/testdata/tuple/access/fail_non_int_indexing.carbon index 961c95f4e264..fc8c72367e4f 100644 --- a/toolchain/check/testdata/tuple/access/fail_non_int_indexing.carbon +++ b/toolchain/check/testdata/tuple/access/fail_non_int_indexing.carbon @@ -29,7 +29,7 @@ var b: i32 = a.(2.6); // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -44,8 +44,8 @@ var b: i32 = a.(2.6); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_non_tuple_access.carbon b/toolchain/check/testdata/tuple/access/fail_non_tuple_access.carbon index d400366bef27..af5d7ab81289 100644 --- a/toolchain/check/testdata/tuple/access/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/tuple/access/fail_non_tuple_access.carbon @@ -37,7 +37,7 @@ fn Main() { // CHECK:STDOUT: %int_5.64b: Core.IntLiteral = int_value 5 [template] // CHECK:STDOUT: %tuple.type: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_5.64b, %Convert.956 [template] @@ -48,9 +48,9 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .IndexWith = %import_ref.671 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .IndexWith = %Core.IndexWith +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_out_of_bound_access.carbon b/toolchain/check/testdata/tuple/access/fail_out_of_bound_access.carbon index 5ce810d4d7fb..b3cb8d1afbcb 100644 --- a/toolchain/check/testdata/tuple/access/fail_out_of_bound_access.carbon +++ b/toolchain/check/testdata/tuple/access/fail_out_of_bound_access.carbon @@ -26,7 +26,7 @@ var b: i32 = a.2; // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -41,8 +41,8 @@ var b: i32 = a.2; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/fail_out_of_bound_not_literal.carbon b/toolchain/check/testdata/tuple/access/fail_out_of_bound_not_literal.carbon index 9f0f75fb9b73..2892b85bc266 100644 --- a/toolchain/check/testdata/tuple/access/fail_out_of_bound_not_literal.carbon +++ b/toolchain/check/testdata/tuple/access/fail_out_of_bound_not_literal.carbon @@ -26,7 +26,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %int_34.3f9: Core.IntLiteral = int_value 34 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -43,8 +43,8 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/index_not_literal.carbon b/toolchain/check/testdata/tuple/access/index_not_literal.carbon index 237e6d0848bf..68c91c37d0bb 100644 --- a/toolchain/check/testdata/tuple/access/index_not_literal.carbon +++ b/toolchain/check/testdata/tuple/access/index_not_literal.carbon @@ -27,7 +27,7 @@ var d: i32 = a.({.index = 1 as i32}.index); // CHECK:STDOUT: %tuple.type.3c2: type = tuple_type (bool, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] // CHECK:STDOUT: %Convert.type.71e: type = fn_type @Convert.1, @ImplicitAs(Core.IntLiteral) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.82c: = bound_method %int_34.3f9, %Convert.956 [template] @@ -39,13 +39,13 @@ var d: i32 = a.({.index = 1 as i32}.index); // CHECK:STDOUT: %struct.972: %struct_type.index.b1b = struct_value (%int_1.5b8) [template] // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %Convert.type.99b: type = fn_type @Convert.4, @As(%i32) [template] -// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%import_ref.78a), @impl.3(%int_32) [template] +// CHECK:STDOUT: %impl_witness.882: = impl_witness (imports.%Core.import_ref.78a), @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.type.4fd: type = fn_type @Convert.5, @impl.3(%int_32) [template] // CHECK:STDOUT: %Convert.197: %Convert.type.4fd = struct_value () [template] // CHECK:STDOUT: %Convert.bound.129: = bound_method %int_0.5c6, %Convert.197 [template] // CHECK:STDOUT: %Convert.specific_fn.dc5: = specific_function %Convert.bound.129, @Convert.5(%int_32) [template] // CHECK:STDOUT: %int_0.6a9: %i32 = int_value 0 [template] -// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%import_ref.85c), @impl.2(%int_32) [template] +// CHECK:STDOUT: %impl_witness.023: = impl_witness (imports.%Core.import_ref.85c), @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.type.4ad: type = fn_type @Convert.3, @impl.2(%int_32) [template] // CHECK:STDOUT: %Convert.960: %Convert.type.4ad = struct_value () [template] // CHECK:STDOUT: %Convert.bound.0fd: = bound_method %int_0.6a9, %Convert.960 [template] @@ -61,10 +61,10 @@ var d: i32 = a.({.index = 1 as i32}.index); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .As = %import_ref.16b +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .As = %Core.As // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/access/return_value_access.carbon b/toolchain/check/testdata/tuple/access/return_value_access.carbon index 053714911706..d7c46ca9e0dd 100644 --- a/toolchain/check/testdata/tuple/access/return_value_access.carbon +++ b/toolchain/check/testdata/tuple/access/return_value_access.carbon @@ -26,7 +26,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_0.5c6, %Convert.956 [template] @@ -39,8 +39,8 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_assign_nested.carbon b/toolchain/check/testdata/tuple/fail_assign_nested.carbon index dc49efb767a7..2d889bd61e8a 100644 --- a/toolchain/check/testdata/tuple/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuple/fail_assign_nested.carbon @@ -35,7 +35,7 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_element_type_mismatch.carbon b/toolchain/check/testdata/tuple/fail_element_type_mismatch.carbon index 8e408697f178..a5f5f62fd62b 100644 --- a/toolchain/check/testdata/tuple/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuple/fail_element_type_mismatch.carbon @@ -28,7 +28,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: %float: f64 = float_literal 65.890000000000001 [template] // CHECK:STDOUT: %tuple.type.2c1: type = tuple_type (Core.IntLiteral, f64) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_2.ecc, %Convert.956 [template] @@ -38,8 +38,8 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_nested_incomplete.carbon b/toolchain/check/testdata/tuple/fail_nested_incomplete.carbon index aa9266e48635..492f56561cea 100644 --- a/toolchain/check/testdata/tuple/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuple/fail_nested_incomplete.carbon @@ -35,7 +35,7 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_too_few_element.carbon b/toolchain/check/testdata/tuple/fail_too_few_element.carbon index db29db6bb0d5..771bc6cf1c92 100644 --- a/toolchain/check/testdata/tuple/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuple/fail_too_few_element.carbon @@ -27,7 +27,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_type_assign.carbon b/toolchain/check/testdata/tuple/fail_type_assign.carbon index 13f37dbfe37b..b89e0bfdde9f 100644 --- a/toolchain/check/testdata/tuple/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuple/fail_type_assign.carbon @@ -28,8 +28,8 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/fail_value_as_type.carbon b/toolchain/check/testdata/tuple/fail_value_as_type.carbon index b9f934238373..743fa588709b 100644 --- a/toolchain/check/testdata/tuple/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuple/fail_value_as_type.carbon @@ -26,7 +26,7 @@ var x: (1, ); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/import.carbon b/toolchain/check/testdata/tuple/import.carbon index 5001ec9394d4..ac6393ccbf74 100644 --- a/toolchain/check/testdata/tuple/import.carbon +++ b/toolchain/check/testdata/tuple/import.carbon @@ -64,7 +64,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: %int_0.5c6: Core.IntLiteral = int_value 0 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.d04: = bound_method %int_0.5c6, %Convert.956 [template] @@ -110,8 +110,8 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -317,7 +317,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.ea0: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%import_ref.773), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%Implicit.import_ref.773), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.e14: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.4cb: %Convert.type.e14 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.dc5: = bound_method %int_1.5b8, %Convert.4cb [template] @@ -333,26 +333,26 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.f99: ref %tuple.type.dd4 = import_ref Implicit//default, a_ref, loaded -// CHECK:STDOUT: %import_ref.447: ref %tuple.type.cfa = import_ref Implicit//default, b_ref, loaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref: ref %tuple.type.dd4 = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.b_ref: ref %tuple.type.cfa = import_ref Implicit//default, b_ref, loaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.2c8 -// CHECK:STDOUT: .ImplicitAs = %import_ref.e26 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.f99 -// CHECK:STDOUT: .b_ref = imports.%import_ref.447 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b @@ -403,7 +403,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c.var: ref %C.cf0 = var c // CHECK:STDOUT: %.loc6_16.1: type = splice_block %C [template = constants.%C.cf0] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %.loc6_15.1: %tuple.type.f94 = tuple_literal (%int_1, %int_2) @@ -433,10 +433,10 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.964 +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.964 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -444,13 +444,13 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref %tuple.type.dd4 = name_ref a_ref, imports.%import_ref.f99 +// CHECK:STDOUT: %a_ref.ref: ref %tuple.type.dd4 = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: %tuple.elem0.loc4: ref %i32 = tuple_access %a_ref.ref, element0 // CHECK:STDOUT: %.loc4_17.1: %i32 = bind_value %tuple.elem0.loc4 // CHECK:STDOUT: %.loc4_17.2: init %tuple.type.dd4 = tuple_init (%.loc4_17.1) to file.%a.var // CHECK:STDOUT: %.loc4_1: init %tuple.type.dd4 = converted %a_ref.ref, %.loc4_17.2 // CHECK:STDOUT: assign file.%a.var, %.loc4_1 -// CHECK:STDOUT: %b_ref.ref: ref %tuple.type.cfa = name_ref b_ref, imports.%import_ref.447 +// CHECK:STDOUT: %b_ref.ref: ref %tuple.type.cfa = name_ref b_ref, imports.%Implicit.b_ref // CHECK:STDOUT: %tuple.elem0.loc5_38.1: ref %tuple.type.154 = tuple_access %b_ref.ref, element0 // CHECK:STDOUT: %tuple.elem0.loc5_38.2: ref %tuple.type.dd4 = tuple_access %tuple.elem0.loc5_38.1, element0 // CHECK:STDOUT: %tuple.elem0.loc5_38.3: ref %i32 = tuple_access %tuple.elem0.loc5_38.2, element0 @@ -481,7 +481,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: %.loc5_38.15: init %tuple.type.cfa = tuple_init (%.loc5_38.8, %.loc5_38.14) to file.%b.var // CHECK:STDOUT: %.loc5_1: init %tuple.type.cfa = converted %b_ref.ref, %.loc5_38.15 // CHECK:STDOUT: assign file.%b.var, %.loc5_1 -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc6: ref %C.cf0 = splice_block file.%c.var {} // CHECK:STDOUT: %F.call: init %C.cf0 = call %F.ref() to %.loc6 // CHECK:STDOUT: assign file.%c.var, %F.call @@ -525,24 +525,24 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.5ad = import_ref Implicit//default, a_ref, unloaded -// CHECK:STDOUT: %import_ref.134 = import_ref Implicit//default, b_ref, unloaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref = import_ref Implicit//default, a_ref, unloaded +// CHECK:STDOUT: %Implicit.b_ref = import_ref Implicit//default, b_ref, unloaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.5ad -// CHECK:STDOUT: .b_ref = imports.%import_ref.134 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .c_bad = %c_bad // CHECK:STDOUT: } @@ -555,7 +555,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c_bad.var: ref = var c_bad // CHECK:STDOUT: %.1: = splice_block [template = ] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [template = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [template = constants.%int_2.ecc] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [template = constants.%int_3] @@ -571,10 +571,10 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.964 +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.964 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -582,7 +582,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc12: ref %C.cf0 = temporary_storage // CHECK:STDOUT: %F.call: init %C.cf0 = call %F.ref() to %.loc12 // CHECK:STDOUT: assign file.%c_bad.var, @@ -617,7 +617,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.ea0: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%import_ref.773), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.847: = impl_witness (imports.%Implicit.import_ref.773), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.e14: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.4cb: %Convert.type.e14 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.a00: = bound_method %int_3.1ba, %Convert.4cb [template] @@ -637,25 +637,25 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.5ad = import_ref Implicit//default, a_ref, unloaded -// CHECK:STDOUT: %import_ref.134 = import_ref Implicit//default, b_ref, unloaded -// CHECK:STDOUT: %import_ref.bb9: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] -// CHECK:STDOUT: %import_ref.b37: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] +// CHECK:STDOUT: %Implicit.a_ref = import_ref Implicit//default, a_ref, unloaded +// CHECK:STDOUT: %Implicit.b_ref = import_ref Implicit//default, b_ref, unloaded +// CHECK:STDOUT: %Implicit.C: %C.type = import_ref Implicit//default, C, loaded [template = constants.%C.generic] +// CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [template = constants.%F] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.e26 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] -// CHECK:STDOUT: %import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded +// CHECK:STDOUT: %Implicit.import_ref.8f2: = import_ref Implicit//default, loc7_26, loaded [template = constants.%complete_type.357] +// CHECK:STDOUT: %Implicit.import_ref.964 = import_ref Implicit//default, inst1108 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref.5ad -// CHECK:STDOUT: .b_ref = imports.%import_ref.134 -// CHECK:STDOUT: .C = imports.%import_ref.bb9 -// CHECK:STDOUT: .F = imports.%import_ref.b37 +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref +// CHECK:STDOUT: .b_ref = imports.%Implicit.b_ref +// CHECK:STDOUT: .C = imports.%Implicit.C +// CHECK:STDOUT: .F = imports.%Implicit.F // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .c_bad = %c_bad // CHECK:STDOUT: } @@ -668,7 +668,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: %c_bad.var: ref %C.ed5 = var c_bad // CHECK:STDOUT: %.loc11_20.1: type = splice_block %C [template = constants.%C.ed5] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%import_ref.bb9 [template = constants.%C.generic] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [template = constants.%C.generic] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [template = constants.%int_3.1ba] // CHECK:STDOUT: %int_4: Core.IntLiteral = int_value 4 [template = constants.%int_4.0c1] // CHECK:STDOUT: %.loc11_19.1: %tuple.type.f94 = tuple_literal (%int_3, %int_4) @@ -698,10 +698,10 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: complete_type_witness = imports.%import_ref.8f2 +// CHECK:STDOUT: complete_type_witness = imports.%Implicit.import_ref.8f2 // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.964 +// CHECK:STDOUT: .Self = imports.%Implicit.import_ref.964 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -709,7 +709,7 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%import_ref.b37 [template = constants.%F] +// CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Implicit.F [template = constants.%F] // CHECK:STDOUT: %.loc11_26: ref %C.cf0 = temporary_storage // CHECK:STDOUT: %F.call: init %C.cf0 = call %F.ref() to %.loc11_26 // CHECK:STDOUT: %.loc11_1: %C.ed5 = converted %F.call, [template = ] diff --git a/toolchain/check/testdata/tuple/nested_tuple.carbon b/toolchain/check/testdata/tuple/nested_tuple.carbon index 3ca71fddee3d..389f98f071e9 100644 --- a/toolchain/check/testdata/tuple/nested_tuple.carbon +++ b/toolchain/check/testdata/tuple/nested_tuple.carbon @@ -25,7 +25,7 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: %int_6.462: Core.IntLiteral = int_value 6 [template] // CHECK:STDOUT: %tuple.type.acf: type = tuple_type (%tuple.type.f94, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.221: = bound_method %int_12.6a3, %Convert.956 [template] @@ -43,8 +43,8 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon index 8777c2fe070f..49a52d4365d3 100644 --- a/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon @@ -39,7 +39,7 @@ fn H() { // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [template] // CHECK:STDOUT: %tuple.type.667: type = tuple_type (Core.IntLiteral, %tuple.type.189, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ab5: = bound_method %int_1.5b8, %Convert.956 [template] @@ -52,8 +52,8 @@ fn H() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/one_element.carbon b/toolchain/check/testdata/tuple/one_element.carbon index 382690f041d2..56efd1e54da7 100644 --- a/toolchain/check/testdata/tuple/one_element.carbon +++ b/toolchain/check/testdata/tuple/one_element.carbon @@ -21,7 +21,7 @@ var y: (i32,) = x; // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [template] // CHECK:STDOUT: %tuple.type.985: type = tuple_type (Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound: = bound_method %int_4.0c1, %Convert.956 [template] @@ -32,8 +32,8 @@ var y: (i32,) = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/two_elements.carbon b/toolchain/check/testdata/tuple/two_elements.carbon index e9029ffaeaa6..23bf7345263e 100644 --- a/toolchain/check/testdata/tuple/two_elements.carbon +++ b/toolchain/check/testdata/tuple/two_elements.carbon @@ -25,7 +25,7 @@ var y: (i32, i32) = x; // CHECK:STDOUT: %int_102.b54: Core.IntLiteral = int_value 102 [template] // CHECK:STDOUT: %tuple.type.f94: type = tuple_type (Core.IntLiteral, Core.IntLiteral) [template] // CHECK:STDOUT: %Convert.type.1b6: type = fn_type @Convert.1, @ImplicitAs(%i32) [template] -// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%import_ref.a5b), @impl.1(%int_32) [template] +// CHECK:STDOUT: %impl_witness.d39: = impl_witness (imports.%Core.import_ref.a5b), @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.type.035: type = fn_type @Convert.2, @impl.1(%int_32) [template] // CHECK:STDOUT: %Convert.956: %Convert.type.035 = struct_value () [template] // CHECK:STDOUT: %Convert.bound.ac3: = bound_method %int_4.0c1, %Convert.956 [template] @@ -39,8 +39,8 @@ var y: (i32, i32) = x; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 89678773472b..bb715702990f 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -29,7 +29,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon b/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon index b6ae2d43ab5c..ed3dded05938 100644 --- a/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon +++ b/toolchain/check/testdata/var/fail_todo_control_flow_init.carbon @@ -83,7 +83,7 @@ var y2: bool = false or true; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/no_prelude/export_name.carbon b/toolchain/check/testdata/var/no_prelude/export_name.carbon index 9f55258ebae6..7865eea02f2d 100644 --- a/toolchain/check/testdata/var/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/var/no_prelude/export_name.carbon @@ -73,7 +73,7 @@ var w: () = v; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: ref %empty_tuple.type = import_ref Main//base, v, loaded +// CHECK:STDOUT: %Main.v: ref %empty_tuple.type = import_ref Main//base, v, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -81,7 +81,7 @@ var w: () = v; // CHECK:STDOUT: .v = %v // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import -// CHECK:STDOUT: %v: ref %empty_tuple.type = export v, imports.%import_ref +// CHECK:STDOUT: %v: ref %empty_tuple.type = export v, imports.%Main.v // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_todo_use_export.carbon @@ -92,12 +92,12 @@ var w: () = v; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: ref %empty_tuple.type = import_ref Main//export, v, loaded [template = ] +// CHECK:STDOUT: %Main.v: ref %empty_tuple.type = import_ref Main//export, v, loaded [template = ] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .v = imports.%import_ref +// CHECK:STDOUT: .v = imports.%Main.v // CHECK:STDOUT: .w = %w // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import @@ -115,7 +115,7 @@ var w: () = v; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %v.ref: ref %empty_tuple.type = name_ref v, imports.%import_ref [template = ] +// CHECK:STDOUT: %v.ref: ref %empty_tuple.type = name_ref v, imports.%Main.v [template = ] // CHECK:STDOUT: %.loc12_13: init %empty_tuple.type = tuple_init () to file.%w.var [template = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_1: init %empty_tuple.type = converted %v.ref, %.loc12_13 [template = constants.%empty_tuple] // CHECK:STDOUT: assign file.%w.var, %.loc12_1 diff --git a/toolchain/check/testdata/var/no_prelude/import.carbon b/toolchain/check/testdata/var/no_prelude/import.carbon index 819a3ccb095b..035589ae9032 100644 --- a/toolchain/check/testdata/var/no_prelude/import.carbon +++ b/toolchain/check/testdata/var/no_prelude/import.carbon @@ -60,12 +60,12 @@ var a: () = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: ref %empty_tuple.type = import_ref Implicit//default, a_ref, loaded +// CHECK:STDOUT: %Implicit.a_ref: ref %empty_tuple.type = import_ref Implicit//default, a_ref, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .a_ref = imports.%import_ref +// CHECK:STDOUT: .a_ref = imports.%Implicit.a_ref // CHECK:STDOUT: .a = %a // CHECK:STDOUT: } // CHECK:STDOUT: %Implicit.import = import Implicit @@ -84,7 +84,7 @@ var a: () = a_ref; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a_ref.ref: ref %empty_tuple.type = name_ref a_ref, imports.%import_ref +// CHECK:STDOUT: %a_ref.ref: ref %empty_tuple.type = name_ref a_ref, imports.%Implicit.a_ref // CHECK:STDOUT: %.loc4_13: init %empty_tuple.type = tuple_init () to file.%a.var [template = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_1: init %empty_tuple.type = converted %a_ref.ref, %.loc4_13 [template = constants.%empty_tuple] // CHECK:STDOUT: assign file.%a.var, %.loc4_1 diff --git a/toolchain/check/testdata/var/no_prelude/import_access.carbon b/toolchain/check/testdata/var/no_prelude/import_access.carbon index 2bd947ed1c1c..19c45d4e84de 100644 --- a/toolchain/check/testdata/var/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/var/no_prelude/import_access.carbon @@ -92,12 +92,12 @@ var v2: () = Test.v; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref: ref %empty_tuple.type = import_ref Test//def, v, loaded +// CHECK:STDOUT: %Test.v: ref %empty_tuple.type = import_ref Test//def, v, loaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .v [private] = imports.%import_ref +// CHECK:STDOUT: .v [private] = imports.%Test.v // CHECK:STDOUT: .v2 = %v2 // CHECK:STDOUT: } // CHECK:STDOUT: %Test.import = import Test @@ -116,7 +116,7 @@ var v2: () = Test.v; // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %v.ref: ref %empty_tuple.type = name_ref v, imports.%import_ref +// CHECK:STDOUT: %v.ref: ref %empty_tuple.type = name_ref v, imports.%Test.v // CHECK:STDOUT: %.loc4_14: init %empty_tuple.type = tuple_init () to file.%v2.var [template = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_1: init %empty_tuple.type = converted %v.ref, %.loc4_14 [template = constants.%empty_tuple] // CHECK:STDOUT: assign file.%v2.var, %.loc4_1 diff --git a/toolchain/check/testdata/where_expr/constraints.carbon b/toolchain/check/testdata/where_expr/constraints.carbon index e3d785c87009..2231f0177310 100644 --- a/toolchain/check/testdata/where_expr/constraints.carbon +++ b/toolchain/check/testdata/where_expr/constraints.carbon @@ -405,7 +405,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -460,7 +460,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -517,7 +517,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -584,26 +584,26 @@ fn NotEmptyStruct() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.7c1: type = import_ref Main//state_constraints, J, loaded [template = constants.%J.type] -// CHECK:STDOUT: %import_ref.541 = import_ref Main//state_constraints, I, unloaded -// CHECK:STDOUT: %import_ref.cdb = import_ref Main//state_constraints, EqualEqual, unloaded -// CHECK:STDOUT: %import_ref.e7f: %Impls.type = import_ref Main//state_constraints, Impls, loaded [template = constants.%Impls] -// CHECK:STDOUT: %import_ref.45f = import_ref Main//state_constraints, And, unloaded +// CHECK:STDOUT: %Main.J: type = import_ref Main//state_constraints, J, loaded [template = constants.%J.type] +// CHECK:STDOUT: %Main.I = import_ref Main//state_constraints, I, unloaded +// CHECK:STDOUT: %Main.EqualEqual = import_ref Main//state_constraints, EqualEqual, unloaded +// CHECK:STDOUT: %Main.Impls: %Impls.type = import_ref Main//state_constraints, Impls, loaded [template = constants.%Impls] +// CHECK:STDOUT: %Main.And = import_ref Main//state_constraints, And, unloaded // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.8fd = import_ref Main//state_constraints, inst17 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref = import_ref Main//state_constraints, inst17 [no loc], unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .J = imports.%import_ref.7c1 -// CHECK:STDOUT: .I = imports.%import_ref.541 -// CHECK:STDOUT: .EqualEqual = imports.%import_ref.cdb -// CHECK:STDOUT: .Impls = imports.%import_ref.e7f -// CHECK:STDOUT: .And = imports.%import_ref.45f +// CHECK:STDOUT: .J = imports.%Main.J +// CHECK:STDOUT: .I = imports.%Main.I +// CHECK:STDOUT: .EqualEqual = imports.%Main.EqualEqual +// CHECK:STDOUT: .Impls = imports.%Main.Impls +// CHECK:STDOUT: .And = imports.%Main.And // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .DoesNotImplI = %DoesNotImplI.decl @@ -615,7 +615,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} {} // CHECK:STDOUT: impl_decl @impl [template] {} { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %J.ref: type = name_ref J, imports.%import_ref.7c1 [template = constants.%J.type] +// CHECK:STDOUT: %J.ref: type = name_ref J, imports.%Main.J [template = constants.%J.type] // CHECK:STDOUT: } // CHECK:STDOUT: %impl_witness: = impl_witness () [template = constants.%impl_witness] // CHECK:STDOUT: %DoesNotImplI.decl: %DoesNotImplI.type = fn_decl @DoesNotImplI [template = constants.%DoesNotImplI] {} {} @@ -625,7 +625,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: } { // CHECK:STDOUT: %Y.param: %J_where.type = value_param runtime_param // CHECK:STDOUT: %.loc26_22.1: type = splice_block %.loc26_22.2 [template = constants.%J_where.type] { -// CHECK:STDOUT: %J.ref: type = name_ref J, imports.%import_ref.7c1 [template = constants.%J.type] +// CHECK:STDOUT: %J.ref: type = name_ref J, imports.%Main.J [template = constants.%J.type] // CHECK:STDOUT: %.Self: %J.type = bind_symbolic_name .Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.Self.ref: %J.type = name_ref .Self, %.Self [symbolic = constants.%.Self] // CHECK:STDOUT: %.loc26_38: %empty_struct_type = struct_literal () @@ -640,7 +640,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: interface @J [from "state_constraints.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.8fd +// CHECK:STDOUT: .Self = imports.%Main.import_ref // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: @@ -659,7 +659,7 @@ fn NotEmptyStruct() { // CHECK:STDOUT: // CHECK:STDOUT: fn @DoesNotImplI() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Impls.ref: %Impls.type = name_ref Impls, imports.%import_ref.e7f [template = constants.%Impls] +// CHECK:STDOUT: %Impls.ref: %Impls.type = name_ref Impls, imports.%Main.Impls [template = constants.%Impls] // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23: %J_where.type = converted %C.ref, [template = ] // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/where_expr/dot_self_index.carbon b/toolchain/check/testdata/where_expr/dot_self_index.carbon index d90d14456c7a..23bec69ecf7c 100644 --- a/toolchain/check/testdata/where_expr/dot_self_index.carbon +++ b/toolchain/check/testdata/where_expr/dot_self_index.carbon @@ -70,8 +70,8 @@ fn G(U: Empty(i32) where .A = i32*) { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/where_expr/equal_rewrite.carbon b/toolchain/check/testdata/where_expr/equal_rewrite.carbon index c53696014930..dccba5d6b4e4 100644 --- a/toolchain/check/testdata/where_expr/equal_rewrite.carbon +++ b/toolchain/check/testdata/where_expr/equal_rewrite.carbon @@ -324,7 +324,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -430,7 +430,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -640,7 +640,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -803,9 +803,9 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -938,7 +938,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1082,33 +1082,33 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { -// CHECK:STDOUT: %import_ref.e5e = import_ref Main//equal_constraint, N, unloaded -// CHECK:STDOUT: %import_ref.b18: %Equal.type = import_ref Main//equal_constraint, Equal, loaded [template = constants.%Equal] -// CHECK:STDOUT: %import_ref.e84 = import_ref Main//nested_rewrites, A, unloaded -// CHECK:STDOUT: %import_ref.672: %NestedRewrite.type = import_ref Main//nested_rewrites, NestedRewrite, loaded [template = constants.%NestedRewrite] +// CHECK:STDOUT: %Main.N = import_ref Main//equal_constraint, N, unloaded +// CHECK:STDOUT: %Main.Equal: %Equal.type = import_ref Main//equal_constraint, Equal, loaded [template = constants.%Equal] +// CHECK:STDOUT: %Main.A = import_ref Main//nested_rewrites, A, unloaded +// CHECK:STDOUT: %Main.NestedRewrite: %NestedRewrite.type = import_ref Main//nested_rewrites, NestedRewrite, loaded [template = constants.%NestedRewrite] // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref.169 = import_ref Main//equal_constraint, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.d17 = import_ref Main//equal_constraint, loc5_8, unloaded -// CHECK:STDOUT: %import_ref.77a = import_ref Main//equal_constraint, P, unloaded -// CHECK:STDOUT: %import_ref.b61 = import_ref Main//nested_rewrites, inst17 [no loc], unloaded -// CHECK:STDOUT: %import_ref.2a9 = import_ref Main//nested_rewrites, loc5_8, unloaded -// CHECK:STDOUT: %import_ref.508 = import_ref Main//nested_rewrites, loc6_8, unloaded -// CHECK:STDOUT: %import_ref.75c = import_ref Main//nested_rewrites, B, unloaded -// CHECK:STDOUT: %import_ref.aff = import_ref Main//nested_rewrites, C, unloaded +// CHECK:STDOUT: %Main.import_ref.169 = import_ref Main//equal_constraint, inst17 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.d17 = import_ref Main//equal_constraint, loc5_8, unloaded +// CHECK:STDOUT: %Main.P = import_ref Main//equal_constraint, P, unloaded +// CHECK:STDOUT: %Main.import_ref.b61 = import_ref Main//nested_rewrites, inst17 [no loc], unloaded +// CHECK:STDOUT: %Main.import_ref.2a9 = import_ref Main//nested_rewrites, loc5_8, unloaded +// CHECK:STDOUT: %Main.import_ref.508 = import_ref Main//nested_rewrites, loc6_8, unloaded +// CHECK:STDOUT: %Main.B = import_ref Main//nested_rewrites, B, unloaded +// CHECK:STDOUT: %Main.C = import_ref Main//nested_rewrites, C, unloaded // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { // CHECK:STDOUT: package: = namespace [template] { -// CHECK:STDOUT: .N = imports.%import_ref.e5e -// CHECK:STDOUT: .Equal = imports.%import_ref.b18 -// CHECK:STDOUT: .A = imports.%import_ref.e84 -// CHECK:STDOUT: .NestedRewrite = imports.%import_ref.672 +// CHECK:STDOUT: .N = imports.%Main.N +// CHECK:STDOUT: .Equal = imports.%Main.Equal +// CHECK:STDOUT: .A = imports.%Main.A +// CHECK:STDOUT: .NestedRewrite = imports.%Main.NestedRewrite // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Calls = %Calls.decl // CHECK:STDOUT: } @@ -1119,25 +1119,25 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: interface @N [from "equal_constraint.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.169 -// CHECK:STDOUT: .P = imports.%import_ref.d17 -// CHECK:STDOUT: witness = (imports.%import_ref.77a) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.169 +// CHECK:STDOUT: .P = imports.%Main.import_ref.d17 +// CHECK:STDOUT: witness = (imports.%Main.P) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @A [from "nested_rewrites.carbon"] { // CHECK:STDOUT: !members: -// CHECK:STDOUT: .Self = imports.%import_ref.b61 -// CHECK:STDOUT: .B = imports.%import_ref.2a9 -// CHECK:STDOUT: .C = imports.%import_ref.508 -// CHECK:STDOUT: witness = (imports.%import_ref.75c, imports.%import_ref.aff) +// CHECK:STDOUT: .Self = imports.%Main.import_ref.b61 +// CHECK:STDOUT: .B = imports.%Main.import_ref.2a9 +// CHECK:STDOUT: .C = imports.%Main.import_ref.508 +// CHECK:STDOUT: witness = (imports.%Main.B, imports.%Main.C) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Calls() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Equal.ref: %Equal.type = name_ref Equal, imports.%import_ref.b18 [template = constants.%Equal] +// CHECK:STDOUT: %Equal.ref: %Equal.type = name_ref Equal, imports.%Main.Equal [template = constants.%Equal] // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc19: %N_where.type = converted %bool.make_type, [template = ] -// CHECK:STDOUT: %NestedRewrite.ref: %NestedRewrite.type = name_ref NestedRewrite, imports.%import_ref.672 [template = constants.%NestedRewrite] +// CHECK:STDOUT: %NestedRewrite.ref: %NestedRewrite.type = name_ref NestedRewrite, imports.%Main.NestedRewrite [template = constants.%NestedRewrite] // CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [template = constants.%int_32] // CHECK:STDOUT: %i32: type = class_type @Int, @Int(constants.%int_32) [template = constants.%i32] // CHECK:STDOUT: %.loc32: %A_where.type.791 = converted %i32, [template = ] @@ -1186,7 +1186,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1258,7 +1258,7 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -1353,10 +1353,10 @@ let K: (E where .F = .Self.G) = bool; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref.783 -// CHECK:STDOUT: .Float = %import_ref.1d6 -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Bool = %Core.Bool +// CHECK:STDOUT: .Float = %Core.Float +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // 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 e48de8ec2814..e8e26fb6afcb 100644 --- a/toolchain/check/testdata/where_expr/fail_not_facet.carbon +++ b/toolchain/check/testdata/where_expr/fail_not_facet.carbon @@ -52,8 +52,8 @@ var v: e where .x = 3; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 -// CHECK:STDOUT: .Bool = %import_ref.783 +// CHECK:STDOUT: .Int = %Core.Int +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } @@ -106,7 +106,7 @@ var v: e where .x = 3; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/where_expr/non_generic.carbon b/toolchain/check/testdata/where_expr/non_generic.carbon index 363255b7ff2c..ba63fe276012 100644 --- a/toolchain/check/testdata/where_expr/non_generic.carbon +++ b/toolchain/check/testdata/where_expr/non_generic.carbon @@ -32,7 +32,7 @@ fn NotGenericF(U: I where .T == i32) {} // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Int = %import_ref.485 +// CHECK:STDOUT: .Int = %Core.Int // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index d769e3861a86..50b3a03b04e5 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -57,7 +57,7 @@ fn While() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index 9c3d80cbf424..13b189d98c79 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -29,7 +29,7 @@ fn While() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .ImplicitAs = %import_ref.d44 +// CHECK:STDOUT: .ImplicitAs = %Core.ImplicitAs // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index 3787de6ebc0b..e50bfaf49982 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -43,7 +43,7 @@ fn While() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 922fa2bf9434..c4ba005162db 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -42,7 +42,7 @@ fn While() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Core: = namespace file.%Core.import, [template] { -// CHECK:STDOUT: .Bool = %import_ref +// CHECK:STDOUT: .Bool = %Core.Bool // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } diff --git a/toolchain/driver/testdata/compile/multifile_raw_and_textual_ir.carbon b/toolchain/driver/testdata/compile/multifile_raw_and_textual_ir.carbon index 33010f8bd9e9..266f230a3a7b 100644 --- a/toolchain/driver/testdata/compile/multifile_raw_and_textual_ir.carbon +++ b/toolchain/driver/testdata/compile/multifile_raw_and_textual_ir.carbon @@ -190,10 +190,10 @@ fn B() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %A: = namespace file.%A.import, [template] { -// CHECK:STDOUT: .A = %import_ref +// CHECK:STDOUT: .A = %A.A // CHECK:STDOUT: import A//default // CHECK:STDOUT: } -// CHECK:STDOUT: %import_ref: %A.type = import_ref A//default, A, loaded [template = constants.%A] +// CHECK:STDOUT: %A.A: %A.type = import_ref A//default, A, loaded [template = constants.%A] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -208,7 +208,7 @@ fn B() { // CHECK:STDOUT: fn @B() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %A.ref.loc6_3: = name_ref A, imports.%A [template = imports.%A] -// CHECK:STDOUT: %A.ref.loc6_4: %A.type = name_ref A, imports.%import_ref [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc6_4: %A.type = name_ref A, imports.%A.A [template = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %A.ref.loc6_4() // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/sem_ir/inst_namer.cpp b/toolchain/sem_ir/inst_namer.cpp index f28613a8375c..5182300e1b27 100644 --- a/toolchain/sem_ir/inst_namer.cpp +++ b/toolchain/sem_ir/inst_namer.cpp @@ -691,7 +691,32 @@ auto InstNamer::CollectNamesInBlock(ScopeId top_scope_id, } case ImportRefUnloaded::Kind: case ImportRefLoaded::Kind: { - add_inst_name("import_ref"); + // Build the base import name: . + RawStringOstream out; + + auto inst = untyped_inst.As(); + auto import_ir_inst = + sem_ir_->import_ir_insts().Get(inst.import_ir_inst_id); + const auto& import_ir = + *sem_ir_->import_irs().Get(import_ir_inst.ir_id).sem_ir; + if (import_ir.package_id().is_valid()) { + out << import_ir.identifiers().Get(import_ir.package_id()); + } else { + out << "Main"; + } + out << "."; + + // Add entity name if available. + if (inst.entity_name_id.is_valid()) { + auto name_id = + sem_ir_->entity_names().Get(inst.entity_name_id).name_id; + out << sem_ir_->names().GetIRBaseName(name_id); + } else { + out << "import_ref"; + } + + add_inst_name(out.TakeStr()); + // When building import refs, we frequently add instructions without // a block. Constants that refer to them need to be separately // named.