From 4a74b1046fa01dbda249a36abb21d5c623ccac58 Mon Sep 17 00:00:00 2001 From: Geoffrey Romer Date: Fri, 20 Sep 2024 16:12:05 -0700 Subject: [PATCH] Inst text format cleanups - Put decl block insts in the scope of the declared entity. - Ignore attempts to name an inst that already has a name (but require those attempts to be in the same scope). - Give `Param` insts a ".param" suffix, to avoid colliding with the corresponding `BindName`. --- .../no_prelude/fail_local_in_namespace.carbon | 2 +- .../alias/no_prelude/fail_params.carbon | 6 +- .../alias/no_prelude/in_namespace.carbon | 10 +- .../testdata/alias/no_prelude/local.carbon | 2 +- .../testdata/array/array_in_place.carbon | 2 +- .../testdata/array/assign_return_value.carbon | 2 +- .../testdata/array/canonicalize_index.carbon | 16 +- .../testdata/array/fail_bound_negative.carbon | 12 +- .../testdata/array/function_param.carbon | 18 +- .../check/testdata/array/generic_empty.carbon | 4 +- .../testdata/as/adapter_conversion.carbon | 12 +- toolchain/check/testdata/as/basic.carbon | 14 +- toolchain/check/testdata/as/identity.carbon | 16 +- .../check/testdata/as/no_prelude/tuple.carbon | 4 +- toolchain/check/testdata/as/overloaded.carbon | 68 ++-- .../check/testdata/basics/fail_bad_run.carbon | 2 +- .../testdata/basics/fail_bad_run_2.carbon | 4 +- .../no_prelude/raw_and_textual_ir.carbon | 6 +- .../basics/no_prelude/raw_identifier.carbon | 18 +- .../basics/no_prelude/textual_ir.carbon | 6 +- .../check/testdata/basics/run_i32.carbon | 6 +- .../testdata/builtins/bool/make_type.carbon | 2 +- .../check/testdata/builtins/float/add.carbon | 108 +++--- .../check/testdata/builtins/float/div.carbon | 106 +++--- .../check/testdata/builtins/float/eq.carbon | 54 +-- .../testdata/builtins/float/greater.carbon | 50 +-- .../testdata/builtins/float/greater_eq.carbon | 50 +-- .../check/testdata/builtins/float/less.carbon | 50 +-- .../testdata/builtins/float/less_eq.carbon | 50 +-- .../testdata/builtins/float/make_type.carbon | 12 +- .../check/testdata/builtins/float/mul.carbon | 108 +++--- .../testdata/builtins/float/negate.carbon | 100 ++--- .../check/testdata/builtins/float/neq.carbon | 54 +-- .../check/testdata/builtins/float/sub.carbon | 108 +++--- .../check/testdata/builtins/int/and.carbon | 20 +- .../testdata/builtins/int/complement.carbon | 22 +- .../check/testdata/builtins/int/eq.carbon | 54 +-- .../testdata/builtins/int/greater.carbon | 50 +-- .../testdata/builtins/int/greater_eq.carbon | 50 +-- .../testdata/builtins/int/left_shift.carbon | 36 +- .../check/testdata/builtins/int/less.carbon | 50 +-- .../testdata/builtins/int/less_eq.carbon | 50 +-- .../testdata/builtins/int/make_type_32.carbon | 2 +- .../builtins/int/make_type_signed.carbon | 54 +-- .../builtins/int/make_type_unsigned.carbon | 54 +-- .../check/testdata/builtins/int/neq.carbon | 44 +-- .../check/testdata/builtins/int/or.carbon | 20 +- .../testdata/builtins/int/right_shift.carbon | 52 +-- .../check/testdata/builtins/int/sadd.carbon | 112 +++--- .../check/testdata/builtins/int/sdiv.carbon | 56 +-- .../check/testdata/builtins/int/smod.carbon | 56 +-- .../check/testdata/builtins/int/smul.carbon | 30 +- .../testdata/builtins/int/snegate.carbon | 110 +++--- .../check/testdata/builtins/int/ssub.carbon | 30 +- .../check/testdata/builtins/int/uadd.carbon | 112 +++--- .../check/testdata/builtins/int/udiv.carbon | 56 +-- .../check/testdata/builtins/int/umod.carbon | 56 +-- .../check/testdata/builtins/int/umul.carbon | 30 +- .../testdata/builtins/int/unegate.carbon | 110 +++--- .../check/testdata/builtins/int/usub.carbon | 30 +- .../check/testdata/builtins/int/xor.carbon | 20 +- .../check/testdata/builtins/print.carbon | 4 +- .../testdata/class/access_modifers.carbon | 68 ++-- toolchain/check/testdata/class/adapt.carbon | 6 +- toolchain/check/testdata/class/base.carbon | 12 +- .../check/testdata/class/base_field.carbon | 8 +- .../check/testdata/class/base_method.carbon | 26 +- .../class/base_method_qualified.carbon | 100 ++--- .../testdata/class/base_method_shadow.carbon | 48 +-- toolchain/check/testdata/class/basic.carbon | 38 +- .../class/complete_in_member_fn.carbon | 22 +- .../testdata/class/compound_field.carbon | 60 +-- .../testdata/class/derived_to_base.carbon | 48 +-- .../check/testdata/class/extend_adapt.carbon | 38 +- .../check/testdata/class/fail_abstract.carbon | 12 +- .../testdata/class/fail_adapt_bad_decl.carbon | 12 +- .../testdata/class/fail_addr_not_self.carbon | 16 +- .../testdata/class/fail_addr_self.carbon | 32 +- .../testdata/class/fail_base_bad_type.carbon | 176 ++++----- .../class/fail_compound_type_mismatch.carbon | 8 +- .../class/fail_convert_to_invalid.carbon | 4 +- .../class/fail_derived_to_base.carbon | 20 +- .../testdata/class/fail_generic_method.carbon | 62 ++-- .../testdata/class/fail_incomplete.carbon | 68 ++-- .../class/fail_init_as_inplace.carbon | 6 +- .../class/fail_memaccess_category.carbon | 20 +- .../testdata/class/fail_member_of_let.carbon | 2 +- .../check/testdata/class/fail_method.carbon | 14 +- .../class/fail_method_modifiers.carbon | 38 +- .../check/testdata/class/fail_scope.carbon | 4 +- .../check/testdata/class/fail_self.carbon | 28 +- .../testdata/class/fail_unbound_field.carbon | 16 +- .../testdata/class/fail_unknown_member.carbon | 8 +- .../testdata/class/forward_declared.carbon | 10 +- .../check/testdata/class/generic/basic.carbon | 84 ++--- .../check/testdata/class/generic/call.carbon | 276 +++++++------- .../check/testdata/class/generic/field.carbon | 94 ++--- .../testdata/class/generic/import.carbon | 102 +++--- .../check/testdata/class/generic/init.carbon | 74 ++-- .../class/generic/member_access.carbon | 166 ++++----- .../class/generic/member_inline.carbon | 88 ++--- .../class/generic/member_out_of_line.carbon | 300 +++++++-------- .../class/generic/method_deduce.carbon | 110 +++--- .../testdata/class/generic/redeclare.carbon | 122 +++---- .../check/testdata/class/generic/self.carbon | 58 +-- .../testdata/class/generic_method.carbon | 68 ++-- toolchain/check/testdata/class/import.carbon | 18 +- .../check/testdata/class/import_base.carbon | 16 +- .../testdata/class/inheritance_access.carbon | 112 +++--- toolchain/check/testdata/class/init.carbon | 40 +- .../check/testdata/class/init_adapt.carbon | 16 +- toolchain/check/testdata/class/init_as.carbon | 2 +- .../check/testdata/class/init_nested.carbon | 8 +- toolchain/check/testdata/class/method.carbon | 132 +++---- toolchain/check/testdata/class/nested.carbon | 8 +- .../check/testdata/class/nested_name.carbon | 14 +- .../class/no_prelude/generic_vs_params.carbon | 58 +-- .../class/no_prelude/import_access.carbon | 12 +- .../class/no_prelude/syntactic_merge.carbon | 280 +++++++------- .../check/testdata/class/raw_self.carbon | 46 +-- .../check/testdata/class/raw_self_type.carbon | 20 +- .../check/testdata/class/redeclaration.carbon | 34 +- .../check/testdata/class/reenter_scope.carbon | 16 +- toolchain/check/testdata/class/reorder.carbon | 16 +- toolchain/check/testdata/class/scope.carbon | 18 +- toolchain/check/testdata/class/self.carbon | 38 +- .../testdata/class/self_conversion.carbon | 58 +-- .../check/testdata/class/self_type.carbon | 40 +- .../check/testdata/class/static_method.carbon | 4 +- .../class/syntactic_merge_literal.carbon | 70 ++-- toolchain/check/testdata/const/basic.carbon | 12 +- .../check/testdata/const/collapse.carbon | 6 +- .../check/testdata/const/fail_collapse.carbon | 6 +- toolchain/check/testdata/const/import.carbon | 8 +- .../check/testdata/eval/fail_symbolic.carbon | 16 +- toolchain/check/testdata/eval/symbolic.carbon | 4 +- .../expr_category/in_place_tuple_init.carbon | 16 +- .../testdata/function/builtin/call.carbon | 16 +- .../function/builtin/definition.carbon | 10 +- .../function/builtin/fail_redefined.carbon | 64 ++-- .../testdata/function/builtin/method.carbon | 70 ++-- .../no_prelude/call_from_operator.carbon | 68 ++-- .../function/builtin/no_prelude/import.carbon | 12 +- .../function/call/fail_param_count.carbon | 18 +- .../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 | 8 +- .../function/call/no_prelude/alias.carbon | 2 +- .../call/no_prelude/empty_struct.carbon | 6 +- .../call/no_prelude/empty_tuple.carbon | 6 +- .../testdata/function/call/params_one.carbon | 4 +- .../function/call/params_one_comma.carbon | 4 +- .../testdata/function/call/params_two.carbon | 8 +- .../function/call/params_two_comma.carbon | 8 +- .../declaration/fail_param_in_type.carbon | 10 +- .../declaration/fail_param_redecl.carbon | 8 +- .../function/declaration/import.carbon | 72 ++-- .../declaration/no_prelude/extern.carbon | 6 +- .../fail_import_incomplete_return.carbon | 16 +- .../declaration/no_prelude/fail_redecl.carbon | 14 +- .../declaration/param_same_name.carbon | 20 +- .../function/definition/import.carbon | 18 +- .../fail_decl_param_mismatch.carbon | 24 +- .../no_prelude/syntactic_merge.carbon | 166 ++++----- .../function/definition/params_one.carbon | 4 +- .../definition/params_one_comma.carbon | 4 +- .../function/definition/params_two.carbon | 8 +- .../definition/params_two_comma.carbon | 8 +- .../testdata/function/generic/deduce.carbon | 158 ++++---- .../generic/fail_todo_param_in_type.carbon | 10 +- .../function/generic/no_prelude/call.carbon | 118 +++--- .../fail_type_param_mismatch.carbon | 8 +- .../generic/no_prelude/forward_decl.carbon | 4 +- .../no_prelude/indirect_generic_type.carbon | 20 +- .../generic/no_prelude/type_param.carbon | 4 +- .../no_prelude/type_param_scope.carbon | 16 +- .../function/generic/redeclare.carbon | 106 +++--- .../function/generic/return_slot.carbon | 30 +- .../testdata/global/class_with_fun.carbon | 6 +- .../testdata/global/simple_with_fun.carbon | 14 +- toolchain/check/testdata/if/else.carbon | 4 +- .../if/fail_reachable_fallthrough.carbon | 54 +-- toolchain/check/testdata/if/fail_scope.carbon | 18 +- toolchain/check/testdata/if/no_else.carbon | 4 +- .../if/unreachable_fallthrough.carbon | 6 +- toolchain/check/testdata/if_expr/basic.carbon | 20 +- .../if_expr/constant_condition.carbon | 48 +-- .../testdata/if_expr/control_flow.carbon | 36 +- .../if_expr/fail_partial_constant.carbon | 8 +- .../check/testdata/if_expr/nested.carbon | 14 +- .../check/testdata/if_expr/struct.carbon | 8 +- toolchain/check/testdata/impl/compound.carbon | 86 ++--- .../check/testdata/impl/declaration.carbon | 2 +- toolchain/check/testdata/impl/empty.carbon | 6 +- .../check/testdata/impl/extend_impl.carbon | 8 +- .../testdata/impl/fail_call_invalid.carbon | 48 +-- .../impl/fail_extend_impl_forall.carbon | 52 +-- .../impl/fail_extend_impl_scope.carbon | 6 +- .../impl/fail_extend_impl_type_as.carbon | 4 +- .../impl/fail_extend_non_interface.carbon | 4 +- .../testdata/impl/fail_impl_as_scope.carbon | 2 +- .../impl/fail_impl_bad_assoc_const.carbon | 2 +- .../impl/fail_impl_bad_assoc_fn.carbon | 158 ++++---- .../impl/fail_impl_bad_interface.carbon | 4 +- .../testdata/impl/fail_redefinition.carbon | 4 +- .../check/testdata/impl/impl_forall.carbon | 10 +- .../check/testdata/impl/lookup/alias.carbon | 12 +- .../lookup/fail_alias_impl_not_found.carbon | 8 +- .../lookup/fail_todo_undefined_impl.carbon | 8 +- .../check/testdata/impl/lookup/import.carbon | 12 +- .../impl/lookup/instance_method.carbon | 36 +- .../impl/lookup/no_prelude/import.carbon | 12 +- .../testdata/impl/no_prelude/basic.carbon | 4 +- .../impl/no_prelude/fail_impl_bad_type.carbon | 6 +- .../impl/no_prelude/import_self.carbon | 62 ++-- .../impl/no_prelude/interface_args.carbon | 114 +++--- .../no_definition_in_impl_file.carbon | 12 +- .../impl/no_prelude/self_in_class.carbon | 20 +- .../impl/no_prelude/self_in_signature.carbon | 122 +++---- .../check/testdata/impl/redeclaration.carbon | 16 +- .../check/testdata/index/expr_category.carbon | 22 +- .../testdata/index/fail_expr_category.carbon | 12 +- .../fail_todo_define_default_fn_inline.carbon | 16 +- ..._todo_define_default_fn_out_of_line.carbon | 76 ++-- .../interface/no_prelude/as_type.carbon | 6 +- .../no_prelude/as_type_of_type.carbon | 6 +- .../interface/no_prelude/default_fn.carbon | 2 +- .../interface/no_prelude/export_name.carbon | 4 +- .../fail_add_member_outside_definition.carbon | 2 +- .../no_prelude/fail_duplicate.carbon | 16 +- .../fail_generic_redeclaration.carbon | 52 +-- .../no_prelude/fail_lookup_undefined.carbon | 2 +- .../no_prelude/fail_todo_facet_lookup.carbon | 22 +- .../fail_todo_generic_default_fn.carbon | 90 ++--- .../interface/no_prelude/generic.carbon | 140 +++---- .../generic_binding_after_assoc_const.carbon | 16 +- .../no_prelude/generic_import.carbon | 32 +- .../no_prelude/generic_vs_params.carbon | 116 +++--- .../interface/no_prelude/import.carbon | 20 +- .../interface/no_prelude/import_access.carbon | 36 +- .../no_prelude/import_interface_decl.carbon | 2 +- .../testdata/interface/no_prelude/self.carbon | 24 +- .../no_prelude/syntactic_merge.carbon | 342 +++++++++--------- .../interface/todo_define_not_default.carbon | 16 +- toolchain/check/testdata/let/convert.carbon | 8 +- .../check/testdata/let/fail_generic.carbon | 12 +- toolchain/check/testdata/let/global.carbon | 14 +- toolchain/check/testdata/let/local.carbon | 12 +- .../check/testdata/let/shadowed_decl.carbon | 12 +- .../testdata/namespace/add_to_import.carbon | 18 +- .../check/testdata/namespace/alias.carbon | 28 +- .../namespace/fail_decl_in_alias.carbon | 6 +- .../testdata/namespace/fail_params.carbon | 24 +- .../merging_with_indirections.carbon | 2 +- .../check/testdata/namespace/shadow.carbon | 14 +- .../testdata/operators/builtin/and.carbon | 42 +-- .../fail_and_or_partial_constant.carbon | 20 +- .../fail_assignment_to_non_assignable.carbon | 2 +- .../fail_redundant_compound_access.carbon | 6 +- .../builtin/fail_type_mismatch_once.carbon | 2 +- .../builtin/fail_unimplemented_op.carbon | 2 +- .../testdata/operators/builtin/or.carbon | 42 +-- .../operators/builtin/unary_op.carbon | 6 +- .../testdata/operators/overloaded/add.carbon | 64 ++-- .../operators/overloaded/bit_and.carbon | 64 ++-- .../overloaded/bit_complement.carbon | 24 +- .../operators/overloaded/bit_or.carbon | 64 ++-- .../operators/overloaded/bit_xor.carbon | 64 ++-- .../testdata/operators/overloaded/dec.carbon | 10 +- .../testdata/operators/overloaded/div.carbon | 64 ++-- .../testdata/operators/overloaded/eq.carbon | 196 +++++----- .../overloaded/fail_assign_non_ref.carbon | 46 +-- .../operators/overloaded/fail_no_impl.carbon | 34 +- .../overloaded/fail_no_impl_for_arg.carbon | 54 +-- .../operators/overloaded/implicit_as.carbon | 86 ++--- .../testdata/operators/overloaded/inc.carbon | 10 +- .../operators/overloaded/left_shift.carbon | 64 ++-- .../testdata/operators/overloaded/mod.carbon | 64 ++-- .../testdata/operators/overloaded/mul.carbon | 64 ++-- .../operators/overloaded/negate.carbon | 24 +- .../operators/overloaded/ordered.carbon | 234 ++++++------ .../operators/overloaded/right_shift.carbon | 64 ++-- .../testdata/operators/overloaded/sub.carbon | 64 ++-- .../no_prelude/cross_package_import.carbon | 4 +- .../no_prelude/fail_export_name_params.carbon | 24 +- .../no_prelude/missing_prelude.carbon | 8 +- .../testdata/pointer/address_of_deref.carbon | 14 +- toolchain/check/testdata/pointer/arrow.carbon | 12 +- toolchain/check/testdata/pointer/basic.carbon | 8 +- .../pointer/fail_address_of_value.carbon | 26 +- .../pointer/fail_deref_not_pointer.carbon | 4 +- .../pointer/fail_type_mismatch.carbon | 6 +- .../testdata/pointer/nested_const.carbon | 6 +- toolchain/check/testdata/pointer/types.carbon | 12 +- .../return/code_after_return_value.carbon | 6 +- .../testdata/return/fail_call_in_type.carbon | 8 +- .../testdata/return/fail_error_in_type.carbon | 2 +- .../return/fail_missing_return.carbon | 2 +- .../fail_missing_return_empty_tuple.carbon | 2 +- .../fail_return_var_no_returned_var.carbon | 2 +- .../fail_return_with_returned_var.carbon | 20 +- .../return/fail_returned_var_shadow.carbon | 4 +- .../return/fail_returned_var_type.carbon | 2 +- .../testdata/return/fail_type_mismatch.carbon | 2 +- .../testdata/return/fail_value_missing.carbon | 2 +- .../testdata/return/fail_var_in_type.carbon | 8 +- .../check/testdata/return/returned_var.carbon | 20 +- .../testdata/return/returned_var_scope.carbon | 8 +- toolchain/check/testdata/return/struct.carbon | 2 +- toolchain/check/testdata/return/tuple.carbon | 2 +- toolchain/check/testdata/return/value.carbon | 2 +- .../struct/fail_duplicate_name.carbon | 2 +- toolchain/check/testdata/struct/import.carbon | 16 +- .../struct/literal_member_access.carbon | 10 +- .../struct/nested_struct_in_place.carbon | 2 +- .../testdata/struct/reorder_fields.carbon | 18 +- .../tuple/access/return_value_access.carbon | 18 +- toolchain/check/testdata/tuple/import.carbon | 16 +- .../tuple/nested_tuple_in_place.carbon | 2 +- .../testdata/var/fail_not_copyable.carbon | 8 +- .../no_prelude/fail_designator.carbon | 4 +- .../testdata/while/break_continue.carbon | 64 ++-- .../testdata/while/unreachable_end.carbon | 2 +- toolchain/check/testdata/while/while.carbon | 2 +- toolchain/sem_ir/formatter.cpp | 8 + toolchain/sem_ir/inst_namer.cpp | 24 +- 327 files changed, 5775 insertions(+), 5761 deletions(-) diff --git a/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon b/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon index 84d49d7370f21..34ceca185498a 100644 --- a/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon +++ b/toolchain/check/testdata/alias/no_prelude/fail_local_in_namespace.carbon @@ -44,7 +44,7 @@ fn F() -> {} { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %.loc13_12.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc13_12.2: type = converted %.loc13_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/alias/no_prelude/fail_params.carbon b/toolchain/check/testdata/alias/no_prelude/fail_params.carbon index bb8639e5a3716..e22b1b699da8d 100644 --- a/toolchain/check/testdata/alias/no_prelude/fail_params.carbon +++ b/toolchain/check/testdata/alias/no_prelude/fail_params.carbon @@ -28,9 +28,9 @@ alias A(T:! type) = T*; // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: } -// CHECK:STDOUT: %T.loc18_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc18_9.2: type = bind_symbolic_name T 0, %T.loc18_9.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc18_9.2 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T] // CHECK:STDOUT: %.loc18: type = ptr_type %T [symbolic = constants.%.1] // CHECK:STDOUT: %A: = bind_alias A, [template = ] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon b/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon index 3a09375cf3633..5e90cc9c3ac6a 100644 --- a/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon +++ b/toolchain/check/testdata/alias/no_prelude/in_namespace.carbon @@ -46,12 +46,12 @@ fn F() -> NS.a { // CHECK:STDOUT: } // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %a: type = bind_alias a, %C.decl [template = constants.%C] -// CHECK:STDOUT: %NS.ref.loc16: = name_ref NS, %NS [template = %NS] -// CHECK:STDOUT: %a.ref.loc16: type = name_ref a, %a [template = constants.%C] +// CHECK:STDOUT: %NS.ref: = name_ref NS, %NS [template = %NS] +// CHECK:STDOUT: %a.ref: type = name_ref a, %a [template = constants.%C] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %NS.ref.loc18: = name_ref NS, %NS [template = %NS] -// CHECK:STDOUT: %a.ref.loc18: type = name_ref a, %a [template = constants.%C] -// CHECK:STDOUT: @F.%return: ref %C = var +// CHECK:STDOUT: %NS.ref: = name_ref NS, file.%NS [template = file.%NS] +// CHECK:STDOUT: %a.ref: type = name_ref a, file.%a [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/alias/no_prelude/local.carbon b/toolchain/check/testdata/alias/no_prelude/local.carbon index dadb761339e77..c0fb3e03bbacc 100644 --- a/toolchain/check/testdata/alias/no_prelude/local.carbon +++ b/toolchain/check/testdata/alias/no_prelude/local.carbon @@ -30,7 +30,7 @@ fn F() -> () { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %.loc11_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc11_12.2: type = converted %.loc11_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index ae7eac09d4707..a179514f12cb4 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -69,7 +69,7 @@ fn G() { // CHECK:STDOUT: %.loc11_25.6: type = value_of_initializer %int.make_type_32.loc11_22 [template = i32] // CHECK:STDOUT: %.loc11_25.7: type = converted %int.make_type_32.loc11_22, %.loc11_25.6 [template = i32] // CHECK:STDOUT: %.loc11_25.8: type = converted %.loc11_25.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index 631818cc770c9..71c3e6461d4f0 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -61,7 +61,7 @@ fn Run() { // CHECK:STDOUT: %.loc11_16.2: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_16.3: type = converted %int.make_type_32, %.loc11_16.2 [template = i32] // CHECK:STDOUT: %.loc11_16.4: type = converted %.loc11_16.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/canonicalize_index.carbon b/toolchain/check/testdata/array/canonicalize_index.carbon index 04f1b92f89c57..6fd7ffe92f3ae 100644 --- a/toolchain/check/testdata/array/canonicalize_index.carbon +++ b/toolchain/check/testdata/array/canonicalize_index.carbon @@ -50,7 +50,7 @@ let b: [i32; 3]* = &a; // CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Add = %Add.decl -// CHECK:STDOUT: .a = %a.loc13 +// CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = @__global_init.%b // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core @@ -58,17 +58,17 @@ let b: [i32; 3]* = &a; // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc11_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_27.1: type = value_of_initializer %int.make_type_32.loc11_27 [template = i32] // CHECK:STDOUT: %.loc11_27.2: type = converted %int.make_type_32.loc11_27, %.loc11_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, %Add.decl [template = constants.%Add] @@ -79,7 +79,7 @@ let b: [i32; 3]* = &a; // CHECK:STDOUT: %.loc13_9.2: type = converted %int.make_type_32.loc13, %.loc13_9.1 [template = i32] // CHECK:STDOUT: %.loc13_23: type = array_type %int.sadd, i32 [template = constants.%.5] // CHECK:STDOUT: %a.var: ref %.5 = var a -// CHECK:STDOUT: %a.loc13: ref %.5 = bind_name a, %a.var +// CHECK:STDOUT: %a: ref %.5 = bind_name a, %a.var // CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_14: i32 = int_literal 3 [template = constants.%.4] // CHECK:STDOUT: %.loc14_9.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] @@ -110,7 +110,7 @@ let b: [i32; 3]* = &a; // CHECK:STDOUT: %.loc13_35.11: init %.5 = array_init (%.loc13_35.4, %.loc13_35.7, %.loc13_35.10) to file.%a.var [template = constants.%array] // CHECK:STDOUT: %.loc13_36: init %.5 = converted %.loc13_35.1, %.loc13_35.11 [template = constants.%array] // CHECK:STDOUT: assign file.%a.var, %.loc13_36 -// CHECK:STDOUT: %a.ref: ref %.5 = name_ref a, file.%a.loc13 +// CHECK:STDOUT: %a.ref: ref %.5 = name_ref a, file.%a // CHECK:STDOUT: %.loc14: %.6 = addr_of %a.ref // CHECK:STDOUT: %b: %.6 = bind_name b, %.loc14 // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/array/fail_bound_negative.carbon b/toolchain/check/testdata/array/fail_bound_negative.carbon index 0713970c02def..f8399c99177c3 100644 --- a/toolchain/check/testdata/array/fail_bound_negative.carbon +++ b/toolchain/check/testdata/array/fail_bound_negative.carbon @@ -53,19 +53,19 @@ var a: [i32; Negate(1)]; // CHECK:STDOUT: %int.make_type_32.loc11_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32.loc11_14 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32.loc11_14, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: %n.loc11_11.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Negate.%n: i32 = bind_name n, %n.loc11_11.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc11_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_22.1: type = value_of_initializer %int.make_type_32.loc11_22 [template = i32] // CHECK:STDOUT: %.loc11_22.2: type = converted %int.make_type_32.loc11_22, %.loc11_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Negate.ref: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] // CHECK:STDOUT: %.loc16_21: i32 = int_literal 1 [template = constants.%.2] // CHECK:STDOUT: %int.snegate: init i32 = call %Negate.ref(%.loc16_21) [template = constants.%.3] -// CHECK:STDOUT: %.loc16_9.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_9.2: type = converted %int.make_type_32.loc16, %.loc16_9.1 [template = i32] +// CHECK:STDOUT: %.loc16_9.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_9.2: type = converted %int.make_type_32, %.loc16_9.1 [template = i32] // CHECK:STDOUT: %.loc16_23: type = array_type %int.snegate, i32 [template = ] // CHECK:STDOUT: %a.var: ref = var a // CHECK:STDOUT: %a: ref = bind_name a, %a.var diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index ad673e9107ca1..c52df57b11fe2 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -64,23 +64,23 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32.loc11_12 [template = i32] // CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32.loc11_12, %.loc11_12.1 [template = i32] // CHECK:STDOUT: %.loc11_18: type = array_type %.loc11_17, i32 [template = constants.%.3] -// CHECK:STDOUT: %arr.loc11_6.1: %.3 = param arr, runtime_param0 -// CHECK:STDOUT: @F.%arr: %.3 = bind_name arr, %arr.loc11_6.1 +// CHECK:STDOUT: %arr.param: %.3 = param arr, runtime_param0 +// CHECK:STDOUT: %arr: %.3 = bind_name arr, %arr.param // CHECK:STDOUT: %int.make_type_32.loc11_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_24.1: type = value_of_initializer %int.make_type_32.loc11_24 [template = i32] // CHECK:STDOUT: %.loc11_24.2: type = converted %int.make_type_32.loc11_24, %.loc11_24.1 [template = i32] -// CHECK:STDOUT: %i.loc11_21.1: i32 = param i, runtime_param1 -// CHECK:STDOUT: @F.%i: i32 = bind_name i, %i.loc11_21.1 +// CHECK:STDOUT: %i.param: i32 = param i, runtime_param1 +// CHECK:STDOUT: %i: i32 = bind_name i, %i.param // CHECK:STDOUT: %int.make_type_32.loc11_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_32.1: type = value_of_initializer %int.make_type_32.loc11_32 [template = i32] // CHECK:STDOUT: %.loc11_32.2: type = converted %int.make_type_32.loc11_32, %.loc11_32.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_11.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_11.2: type = converted %int.make_type_32.loc15, %.loc15_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_11.2: type = converted %int.make_type_32, %.loc15_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/generic_empty.carbon b/toolchain/check/testdata/array/generic_empty.carbon index 6e860c4a7a39e..681967349039f 100644 --- a/toolchain/check/testdata/array/generic_empty.carbon +++ b/toolchain/check/testdata/array/generic_empty.carbon @@ -46,8 +46,8 @@ fn G(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @G.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @G.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index 2c6a568726819..6bfa4e56ab868 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -176,7 +176,7 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: %.loc6_8: %.2 = field_decl y, element1 [template] // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] -// CHECK:STDOUT: %return.var: ref %A = var +// CHECK:STDOUT: %return: ref %A = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -196,18 +196,18 @@ var b: B = {.x = 1} as B; // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Make() -> @A.%return.var: %A { +// CHECK:STDOUT: fn @Make() -> %return: %A { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc9_18: i32 = int_literal 1 [template = constants.%.5] // CHECK:STDOUT: %.loc9_26: i32 = int_literal 2 [template = constants.%.6] // CHECK:STDOUT: %.loc9_27.1: %.3 = struct_literal (%.loc9_18, %.loc9_26) -// CHECK:STDOUT: %.loc9_27.2: ref i32 = class_element_access @A.%return.var, element0 +// CHECK:STDOUT: %.loc9_27.2: ref i32 = class_element_access %return, element0 // CHECK:STDOUT: %.loc9_27.3: init i32 = initialize_from %.loc9_18 to %.loc9_27.2 [template = constants.%.5] -// CHECK:STDOUT: %.loc9_27.4: ref i32 = class_element_access @A.%return.var, element1 +// CHECK:STDOUT: %.loc9_27.4: ref i32 = class_element_access %return, element1 // CHECK:STDOUT: %.loc9_27.5: init i32 = initialize_from %.loc9_26 to %.loc9_27.4 [template = constants.%.6] -// CHECK:STDOUT: %.loc9_27.6: init %A = class_init (%.loc9_27.3, %.loc9_27.5), @A.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc9_27.6: init %A = class_init (%.loc9_27.3, %.loc9_27.5), %return [template = constants.%struct] // CHECK:STDOUT: %.loc9_28: init %A = converted %.loc9_27.1, %.loc9_27.6 [template = constants.%struct] -// CHECK:STDOUT: return %.loc9_28 to @A.%return.var +// CHECK:STDOUT: return %.loc9_28 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index 1f8d0facbdd00..9a0ce2ef54f8c 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -45,10 +45,10 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32.loc11, %.loc11_14.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -57,9 +57,9 @@ fn Main() -> i32 { // CHECK:STDOUT: fn @Main() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc12_10: i32 = int_literal 1 [template = constants.%.2] -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_15.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_15.2: type = converted %int.make_type_32, %.loc12_15.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_15.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_15.2: type = converted %int.make_type_32.loc12, %.loc12_15.1 [template = i32] // CHECK:STDOUT: return %.loc12_10 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/identity.carbon b/toolchain/check/testdata/as/identity.carbon index a05b981a76953..bc4e402a923ab 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -71,19 +71,19 @@ fn Initializing() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: %Value.decl: %Value.type = fn_decl @Value [template = constants.%Value] { -// CHECK:STDOUT: %X.ref.loc17: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %n.loc17_10.1: %X = param n, runtime_param0 -// CHECK:STDOUT: @Value.%n: %X = bind_name n, %n.loc17_10.1 +// CHECK:STDOUT: %X.ref.loc17: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %n.param: %X = param n, runtime_param0 +// CHECK:STDOUT: %n: %X = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %Reference.decl: %Reference.type = fn_decl @Reference [template = constants.%Reference] { -// CHECK:STDOUT: %X.ref.loc21: type = name_ref X, %X.decl [template = constants.%X] +// CHECK:STDOUT: %X.ref.loc21: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %.loc21: type = ptr_type %X [template = constants.%.4] -// CHECK:STDOUT: %p.loc21_14.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @Reference.%p: %.4 = bind_name p, %p.loc21_14.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %X.ref.loc25: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: @Make.%return: ref %X = var +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } // CHECK:STDOUT: %Initializing.decl: %Initializing.type = fn_decl @Initializing [template = constants.%Initializing] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/no_prelude/tuple.carbon b/toolchain/check/testdata/as/no_prelude/tuple.carbon index 438a34b6f4e15..9089502eb139c 100644 --- a/toolchain/check/testdata/as/no_prelude/tuple.carbon +++ b/toolchain/check/testdata/as/no_prelude/tuple.carbon @@ -52,8 +52,8 @@ fn Var() { // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %X.ref: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: @Make.%return: ref %X = var +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } // CHECK:STDOUT: %Let.decl: %Let.type = fn_decl @Let [template = constants.%Let] {} // CHECK:STDOUT: %Var.decl: %Var.type = fn_decl @Var [template = constants.%Var] {} diff --git a/toolchain/check/testdata/as/overloaded.carbon b/toolchain/check/testdata/as/overloaded.carbon index 8b45fd24c8734..fde4eb33135fe 100644 --- a/toolchain/check/testdata/as/overloaded.carbon +++ b/toolchain/check/testdata/as/overloaded.carbon @@ -94,26 +94,26 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32.loc15, %.loc15_6.1 [template = i32] -// CHECK:STDOUT: %Core.ref.loc15: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %As.ref.loc15: %As.type = name_ref As, imports.%import_ref.2 [template = constants.%As] -// CHECK:STDOUT: %X.ref.loc15: type = name_ref X, %X.decl [template = constants.%X] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32, %.loc15_6.1 [template = i32] +// CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] +// CHECK:STDOUT: %As.ref: %As.type = name_ref As, imports.%import_ref.2 [template = constants.%As] +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %.loc15_20: type = interface_type @As, @As(constants.%X) [template = constants.%.7] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %X.ref.loc19: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %Core.ref.loc19: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %As.ref.loc19: %As.type = name_ref As, imports.%import_ref.2 [template = constants.%As] -// CHECK:STDOUT: %int.make_type_32.loc19: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc19_18.1: type = value_of_initializer %int.make_type_32.loc19 [template = i32] -// CHECK:STDOUT: %.loc19_18.2: type = converted %int.make_type_32.loc19, %.loc19_18.1 [template = i32] +// 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 = name_ref As, imports.%import_ref.2 [template = constants.%As] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc19_18.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc19_18.2: type = converted %int.make_type_32, %.loc19_18.1 [template = i32] // CHECK:STDOUT: %.loc19_18.3: type = interface_type @As, @As(i32) [template = constants.%.12] // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc23: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc23_8.1: type = value_of_initializer %int.make_type_32.loc23 [template = i32] -// CHECK:STDOUT: %.loc23_8.2: type = converted %int.make_type_32.loc23, %.loc23_8.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc23_8.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc23_8.2: type = converted %int.make_type_32, %.loc23_8.1 [template = i32] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic interface @As(constants.%Dest: type) { @@ -140,33 +140,33 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_20.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc16_20.2: type = converted %int.make_type_32, %.loc16_20.1 [template = i32] -// CHECK:STDOUT: %self.loc16_14.1: i32 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc16_14.2: i32 = bind_name self, %self.loc16_14.1 +// CHECK:STDOUT: %self.param: i32 = param self, runtime_param0 +// CHECK:STDOUT: %self: i32 = bind_name self, %self.param // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %return.var: ref %X = var +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = interface_witness (%Convert.decl) [template = constants.%.10] +// CHECK:STDOUT: %.loc15_24: = interface_witness (%Convert.decl) [template = constants.%.10] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Convert = %Convert.decl -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %X as %.12 { // CHECK:STDOUT: %Convert.decl: %Convert.type.4 = fn_decl @Convert.3 [template = constants.%Convert.4] { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %self.loc20_14.1: %X = param self, runtime_param0 -// CHECK:STDOUT: %self.loc20_14.2: %X = bind_name self, %self.loc20_14.1 +// CHECK:STDOUT: %self.param: %X = param self, runtime_param0 +// CHECK:STDOUT: %self: %X = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc20_28.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc20_28.2: type = converted %int.make_type_32, %.loc20_28.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc19: = interface_witness (%Convert.decl) [template = constants.%.15] +// CHECK:STDOUT: %.loc19_24: = interface_witness (%Convert.decl) [template = constants.%.15] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Convert = %Convert.decl -// CHECK:STDOUT: witness = %.loc19 +// CHECK:STDOUT: witness = %.loc19_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { @@ -190,20 +190,20 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: fn[%self: @Convert.1.%Self (%Self.2)]() -> @Convert.1.%Dest (%Dest); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Convert.2[@impl.1.%self.loc16_14.2: i32]() -> @impl.1.%return.var: %X { +// CHECK:STDOUT: fn @Convert.2[%self: i32]() -> %return: %X { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: i32 = name_ref self, @impl.1.%self.loc16_14.2 +// CHECK:STDOUT: %self.ref: i32 = name_ref self, %self // CHECK:STDOUT: %.loc16_51.1: %.3 = struct_literal (%self.ref) -// CHECK:STDOUT: %.loc16_51.2: ref i32 = class_element_access @impl.1.%return.var, element0 +// CHECK:STDOUT: %.loc16_51.2: ref i32 = class_element_access %return, element0 // CHECK:STDOUT: %.loc16_51.3: init i32 = initialize_from %self.ref to %.loc16_51.2 -// CHECK:STDOUT: %.loc16_51.4: init %X = class_init (%.loc16_51.3), @impl.1.%return.var +// CHECK:STDOUT: %.loc16_51.4: init %X = class_init (%.loc16_51.3), %return // CHECK:STDOUT: %.loc16_52: init %X = converted %.loc16_51.1, %.loc16_51.4 -// CHECK:STDOUT: return %.loc16_52 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc16_52 to %return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Convert.3[@impl.2.%self.loc20_14.2: %X]() -> i32 { +// CHECK:STDOUT: fn @Convert.3[%self: %X]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %X = name_ref self, @impl.2.%self.loc20_14.2 +// CHECK:STDOUT: %self.ref: %X = name_ref self, %self // CHECK:STDOUT: %n.ref: %.2 = name_ref n, @X.%.loc12_8 [template = @X.%.loc12_8] // CHECK:STDOUT: %.loc20_45.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc20_45.2: i32 = bind_value %.loc20_45.1 @@ -220,7 +220,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %.loc23_26.1: type = interface_type @As, @As(constants.%X) [template = constants.%.7] // CHECK:STDOUT: %.loc23_26.2: %.8 = specific_constant imports.%import_ref.4, @As(constants.%X) [template = constants.%.9] // CHECK:STDOUT: %Convert.ref.loc23_26: %.8 = name_ref Convert, %.loc23_26.2 [template = constants.%.9] -// CHECK:STDOUT: %.loc23_26.3: %Convert.type.3 = interface_witness_access @impl.1.%.loc15, element0 [template = constants.%Convert.2] +// CHECK:STDOUT: %.loc23_26.3: %Convert.type.3 = interface_witness_access @impl.1.%.loc15_24, element0 [template = constants.%Convert.2] // CHECK:STDOUT: %.loc23_26.4: = bound_method %.loc23_16, %.loc23_26.3 [template = constants.%.18] // CHECK:STDOUT: %.loc23_26.5: ref %X = temporary_storage // CHECK:STDOUT: %Convert.call.loc23_26: init %X = call %.loc23_26.4(%.loc23_16) to %.loc23_26.5 @@ -232,7 +232,7 @@ let n: i32 = ((4 as i32) as X) as i32; // CHECK:STDOUT: %.loc23_32.2: %.13 = specific_constant imports.%import_ref.4, @As(i32) [template = constants.%.14] // CHECK:STDOUT: %Convert.ref.loc23_32: %.13 = name_ref Convert, %.loc23_32.2 [template = constants.%.14] // CHECK:STDOUT: %.loc23_26.7: ref %X = temporary %.loc23_26.5, %.loc23_26.6 -// CHECK:STDOUT: %.loc23_32.3: %Convert.type.5 = interface_witness_access @impl.2.%.loc19, element0 [template = constants.%Convert.4] +// CHECK:STDOUT: %.loc23_32.3: %Convert.type.5 = interface_witness_access @impl.2.%.loc19_24, element0 [template = constants.%Convert.4] // CHECK:STDOUT: %.loc23_32.4: = bound_method %.loc23_26.7, %.loc23_32.3 // CHECK:STDOUT: %.loc23_26.8: %X = bind_value %.loc23_26.7 // CHECK:STDOUT: %Convert.call.loc23_32: init i32 = call %.loc23_32.4(%.loc23_26.8) diff --git a/toolchain/check/testdata/basics/fail_bad_run.carbon b/toolchain/check/testdata/basics/fail_bad_run.carbon index 024e3b04f5ec4..ec5c9a9754e4b 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -46,7 +46,7 @@ fn Run() -> String {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] { -// CHECK:STDOUT: @Run.%return: ref String = var +// CHECK:STDOUT: %return: ref String = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 5aae129a323f3..1a6ae6378b377 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -48,8 +48,8 @@ fn Run(n: i32) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc14_11.2: type = converted %int.make_type_32, %.loc14_11.1 [template = i32] -// CHECK:STDOUT: %n.loc14_8.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Run.%n: i32 = bind_name n, %n.loc14_8.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/no_prelude/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/no_prelude/raw_and_textual_ir.carbon index ed9ad162e24ef..96e3d619ad276 100644 --- a/toolchain/check/testdata/basics/no_prelude/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/no_prelude/raw_and_textual_ir.carbon @@ -168,15 +168,15 @@ fn Foo(n: ()) -> ((), ()) { // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { // CHECK:STDOUT: %.loc15_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_12.2: type = converted %.loc15_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %n.loc15_8.1: %.1 = param n, runtime_param0 -// CHECK:STDOUT: @Foo.%n: %.1 = bind_name n, %n.loc15_8.1 +// CHECK:STDOUT: %n.param: %.1 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.1 = bind_name n, %n.param // CHECK:STDOUT: %.loc15_20: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_24: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_25.1: %.2 = tuple_literal (%.loc15_20, %.loc15_24) // CHECK:STDOUT: %.loc15_25.2: type = converted %.loc15_20, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc15_25.3: type = converted %.loc15_24, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc15_25.4: type = converted %.loc15_25.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: @Foo.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/no_prelude/raw_identifier.carbon b/toolchain/check/testdata/basics/no_prelude/raw_identifier.carbon index c3a3b943ce37b..28d9e84ab182e 100644 --- a/toolchain/check/testdata/basics/no_prelude/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/no_prelude/raw_identifier.carbon @@ -45,29 +45,29 @@ fn C(r#if: ()) -> () { // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { // CHECK:STDOUT: %.loc15_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_10.2: type = converted %.loc15_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %n.loc15_6.1: %.1 = param n, runtime_param0 -// CHECK:STDOUT: @A.%n: %.1 = bind_name n, %n.loc15_6.1 +// CHECK:STDOUT: %n.param: %.1 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.1 = bind_name n, %n.param // CHECK:STDOUT: %.loc15_17.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_17.2: type = converted %.loc15_17.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @A.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { // CHECK:STDOUT: %.loc19_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc19_12.2: type = converted %.loc19_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %n.loc19_6.1: %.1 = param n, runtime_param0 -// CHECK:STDOUT: @B.%n: %.1 = bind_name n, %n.loc19_6.1 +// CHECK:STDOUT: %n.param: %.1 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.1 = bind_name n, %n.param // CHECK:STDOUT: %.loc19_19.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc19_19.2: type = converted %.loc19_19.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @B.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %.loc23_13.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc23_13.2: type = converted %.loc23_13.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %if.loc23_6.1: %.1 = param r#if, runtime_param0 -// CHECK:STDOUT: @C.%if: %.1 = bind_name r#if, %if.loc23_6.1 +// CHECK:STDOUT: %if.param: %.1 = param r#if, runtime_param0 +// CHECK:STDOUT: %if: %.1 = bind_name r#if, %if.param // CHECK:STDOUT: %.loc23_20.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc23_20.2: type = converted %.loc23_20.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @C.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/no_prelude/textual_ir.carbon b/toolchain/check/testdata/basics/no_prelude/textual_ir.carbon index 637384705b1e5..1a7bbb25679a7 100644 --- a/toolchain/check/testdata/basics/no_prelude/textual_ir.carbon +++ b/toolchain/check/testdata/basics/no_prelude/textual_ir.carbon @@ -35,15 +35,15 @@ fn Foo(n: ()) -> ((), ()) { // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { // CHECK:STDOUT: %.loc15_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_12.2: type = converted %.loc15_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %n.loc15_8.1: %.1 = param n, runtime_param0 -// CHECK:STDOUT: @Foo.%n: %.1 = bind_name n, %n.loc15_8.1 +// CHECK:STDOUT: %n.param: %.1 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.1 = bind_name n, %n.param // CHECK:STDOUT: %.loc15_20: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_24: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_25.1: %.2 = tuple_literal (%.loc15_20, %.loc15_24) // CHECK:STDOUT: %.loc15_25.2: type = converted %.loc15_20, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc15_25.3: type = converted %.loc15_24, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc15_25.4: type = converted %.loc15_25.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: @Foo.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index 9a2581017ef6d..4eefcfcedc635 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -46,7 +46,7 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_13.2: type = converted %int.make_type_32, %.loc11_13.1 [template = i32] -// CHECK:STDOUT: @Run.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -54,7 +54,7 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: i32 = int_literal 0 [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_26: i32 = int_literal 0 [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_26 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/bool/make_type.carbon b/toolchain/check/testdata/builtins/bool/make_type.carbon index 6856ccb84a719..debfa346bc5d7 100644 --- a/toolchain/check/testdata/builtins/bool/make_type.carbon +++ b/toolchain/check/testdata/builtins/bool/make_type.carbon @@ -50,7 +50,7 @@ var b: Bool() = false; // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Bool.decl: %Bool.type = fn_decl @Bool [template = constants.%Bool] { -// CHECK:STDOUT: @Bool.%return: ref type = var +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/add.carbon b/toolchain/check/testdata/builtins/float/add.carbon index 7853e6d9bea27..e994a0da9e20c 100644 --- a/toolchain/check/testdata/builtins/float/add.carbon +++ b/toolchain/check/testdata/builtins/float/add.carbon @@ -94,43 +94,43 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_11: init type = call constants.%Float(%.loc2_11.1) [template = f64] // CHECK:STDOUT: %.loc2_11.2: type = value_of_initializer %float.make_type.loc2_11 [template = f64] // CHECK:STDOUT: %.loc2_11.3: type = converted %float.make_type.loc2_11, %.loc2_11.2 [template = f64] -// CHECK:STDOUT: %a.loc2_8.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: f64 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_19: init type = call constants.%Float(%.loc2_19.1) [template = f64] // CHECK:STDOUT: %.loc2_19.2: type = value_of_initializer %float.make_type.loc2_19 [template = f64] // CHECK:STDOUT: %.loc2_19.3: type = converted %float.make_type.loc2_19, %.loc2_19.2 [template = f64] -// CHECK:STDOUT: %b.loc2_16.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: f64 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc2_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_27: init type = call constants.%Float(%.loc2_27.1) [template = f64] // CHECK:STDOUT: %.loc2_27.2: type = value_of_initializer %float.make_type.loc2_27 [template = f64] // CHECK:STDOUT: %.loc2_27.3: type = converted %float.make_type.loc2_27, %.loc2_27.2 [template = f64] -// CHECK:STDOUT: @Add.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc4_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_19: init type = call constants.%Float(%.loc4_19.1) [template = f64] // CHECK:STDOUT: %.loc4_19.2: type = value_of_initializer %float.make_type.loc4_19 [template = f64] // CHECK:STDOUT: %.loc4_19.3: type = converted %float.make_type.loc4_19, %.loc4_19.2 [template = f64] -// CHECK:STDOUT: %a.loc4_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc4_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc4_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_27: init type = call constants.%Float(%.loc4_27.1) [template = f64] // CHECK:STDOUT: %.loc4_27.2: type = value_of_initializer %float.make_type.loc4_27 [template = f64] // CHECK:STDOUT: %.loc4_27.3: type = converted %float.make_type.loc4_27, %.loc4_27.2 [template = f64] -// CHECK:STDOUT: %b.loc4_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc4_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc4_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_35: init type = call constants.%Float(%.loc4_35.1) [template = f64] // CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %float.make_type.loc4_35 [template = f64] // CHECK:STDOUT: %.loc4_35.3: type = converted %float.make_type.loc4_35, %.loc4_35.2 [template = f64] -// CHECK:STDOUT: @RuntimeCall.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_8.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_8.1) [template = f64] -// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type.loc8 [template = f64] -// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type.loc8, %.loc8_8.2 [template = f64] +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc8_8.1) [template = f64] +// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type, %.loc8_8.2 [template = f64] // CHECK:STDOUT: %x.var: ref f64 = var x // CHECK:STDOUT: %x: ref f64 = bind_name x, %x.var // CHECK:STDOUT: } @@ -219,131 +219,131 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc8_14: init type = call constants.%Float(%.loc8_14.1) [template = f64] // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %float.make_type.loc8_14 [template = f64] // CHECK:STDOUT: %.loc8_14.3: type = converted %float.make_type.loc8_14, %.loc8_14.2 [template = f64] -// CHECK:STDOUT: %a.loc8_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: f64 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc8_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc8_22: init type = call constants.%Float(%.loc8_22.1) [template = f64] // CHECK:STDOUT: %.loc8_22.2: type = value_of_initializer %float.make_type.loc8_22 [template = f64] // CHECK:STDOUT: %.loc8_22.3: type = converted %float.make_type.loc8_22, %.loc8_22.2 [template = f64] -// CHECK:STDOUT: @TooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %.loc13_15.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_15: init type = call constants.%Float(%.loc13_15.1) [template = f64] // CHECK:STDOUT: %.loc13_15.2: type = value_of_initializer %float.make_type.loc13_15 [template = f64] // CHECK:STDOUT: %.loc13_15.3: type = converted %float.make_type.loc13_15, %.loc13_15.2 [template = f64] -// CHECK:STDOUT: %a.loc13_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: f64 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc13_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_23: init type = call constants.%Float(%.loc13_23.1) [template = f64] // CHECK:STDOUT: %.loc13_23.2: type = value_of_initializer %float.make_type.loc13_23 [template = f64] // CHECK:STDOUT: %.loc13_23.3: type = converted %float.make_type.loc13_23, %.loc13_23.2 [template = f64] -// CHECK:STDOUT: %b.loc13_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: f64 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc13_31.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_31: init type = call constants.%Float(%.loc13_31.1) [template = f64] // CHECK:STDOUT: %.loc13_31.2: type = value_of_initializer %float.make_type.loc13_31 [template = f64] // CHECK:STDOUT: %.loc13_31.3: type = converted %float.make_type.loc13_31, %.loc13_31.2 [template = f64] -// CHECK:STDOUT: %c.loc13_28.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: f64 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc13_39.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_39: init type = call constants.%Float(%.loc13_39.1) [template = f64] // CHECK:STDOUT: %.loc13_39.2: type = value_of_initializer %float.make_type.loc13_39 [template = f64] // CHECK:STDOUT: %.loc13_39.3: type = converted %float.make_type.loc13_39, %.loc13_39.2 [template = f64] -// CHECK:STDOUT: @TooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %.loc17_21.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_21: init type = call constants.%Float(%.loc17_21.1) [template = f64] // CHECK:STDOUT: %.loc17_21.2: type = value_of_initializer %float.make_type.loc17_21 [template = f64] // CHECK:STDOUT: %.loc17_21.3: type = converted %float.make_type.loc17_21, %.loc17_21.2 [template = f64] -// CHECK:STDOUT: %a.loc17_18.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: f64 = bind_name a, %a.loc17_18.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc17_29.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_29: init type = call constants.%Float(%.loc17_29.1) [template = f64] // CHECK:STDOUT: %.loc17_29.2: type = value_of_initializer %float.make_type.loc17_29 [template = f64] // CHECK:STDOUT: %.loc17_29.3: type = converted %float.make_type.loc17_29, %.loc17_29.2 [template = f64] -// CHECK:STDOUT: %b.loc17_26.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: f64 = bind_name b, %b.loc17_26.1 -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type.loc17, %.loc17_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type, %.loc17_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %.loc18_17.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_17: init type = call constants.%Float(%.loc18_17.1) [template = f64] // CHECK:STDOUT: %.loc18_17.2: type = value_of_initializer %float.make_type.loc18_17 [template = f64] // CHECK:STDOUT: %.loc18_17.3: type = converted %float.make_type.loc18_17, %.loc18_17.2 [template = f64] -// CHECK:STDOUT: %a.loc18_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: f64 = bind_name a, %a.loc18_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc18_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_25: init type = call constants.%Float(%.loc18_25.1) [template = f64] // CHECK:STDOUT: %.loc18_25.2: type = value_of_initializer %float.make_type.loc18_25 [template = f64] // CHECK:STDOUT: %.loc18_25.3: type = converted %float.make_type.loc18_25, %.loc18_25.2 [template = f64] -// CHECK:STDOUT: %b.loc18_22.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: f64 = bind_name b, %b.loc18_22.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc18_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_33: init type = call constants.%Float(%.loc18_33.1) [template = f64] // CHECK:STDOUT: %.loc18_33.2: type = value_of_initializer %float.make_type.loc18_33 [template = f64] // CHECK:STDOUT: %.loc18_33.3: type = converted %float.make_type.loc18_33, %.loc18_33.2 [template = f64] -// CHECK:STDOUT: @JustRight.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooFew.decl: %RuntimeCallTooFew.type = fn_decl @RuntimeCallTooFew [template = constants.%RuntimeCallTooFew] { // CHECK:STDOUT: %.loc20_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_25: init type = call constants.%Float(%.loc20_25.1) [template = f64] // CHECK:STDOUT: %.loc20_25.2: type = value_of_initializer %float.make_type.loc20_25 [template = f64] // CHECK:STDOUT: %.loc20_25.3: type = converted %float.make_type.loc20_25, %.loc20_25.2 [template = f64] -// CHECK:STDOUT: %a.loc20_22.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: f64 = bind_name a, %a.loc20_22.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc20_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_33: init type = call constants.%Float(%.loc20_33.1) [template = f64] // CHECK:STDOUT: %.loc20_33.2: type = value_of_initializer %float.make_type.loc20_33 [template = f64] // CHECK:STDOUT: %.loc20_33.3: type = converted %float.make_type.loc20_33, %.loc20_33.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %.loc24_26.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_26: init type = call constants.%Float(%.loc24_26.1) [template = f64] // CHECK:STDOUT: %.loc24_26.2: type = value_of_initializer %float.make_type.loc24_26 [template = f64] // CHECK:STDOUT: %.loc24_26.3: type = converted %float.make_type.loc24_26, %.loc24_26.2 [template = f64] -// CHECK:STDOUT: %a.loc24_23.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: f64 = bind_name a, %a.loc24_23.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc24_34.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_34: init type = call constants.%Float(%.loc24_34.1) [template = f64] // CHECK:STDOUT: %.loc24_34.2: type = value_of_initializer %float.make_type.loc24_34 [template = f64] // CHECK:STDOUT: %.loc24_34.3: type = converted %float.make_type.loc24_34, %.loc24_34.2 [template = f64] -// CHECK:STDOUT: %b.loc24_31.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: f64 = bind_name b, %b.loc24_31.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc24_42.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_42: init type = call constants.%Float(%.loc24_42.1) [template = f64] // CHECK:STDOUT: %.loc24_42.2: type = value_of_initializer %float.make_type.loc24_42 [template = f64] // CHECK:STDOUT: %.loc24_42.3: type = converted %float.make_type.loc24_42, %.loc24_42.2 [template = f64] -// CHECK:STDOUT: %c.loc24_39.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: f64 = bind_name c, %c.loc24_39.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc24_50.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_50: init type = call constants.%Float(%.loc24_50.1) [template = f64] // CHECK:STDOUT: %.loc24_50.2: type = value_of_initializer %float.make_type.loc24_50 [template = f64] // CHECK:STDOUT: %.loc24_50.3: type = converted %float.make_type.loc24_50, %.loc24_50.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %.loc28_32.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_32: init type = call constants.%Float(%.loc28_32.1) [template = f64] // CHECK:STDOUT: %.loc28_32.2: type = value_of_initializer %float.make_type.loc28_32 [template = f64] // CHECK:STDOUT: %.loc28_32.3: type = converted %float.make_type.loc28_32, %.loc28_32.2 [template = f64] -// CHECK:STDOUT: %a.loc28_29.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: f64 = bind_name a, %a.loc28_29.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc28_40.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_40: init type = call constants.%Float(%.loc28_40.1) [template = f64] // CHECK:STDOUT: %.loc28_40.2: type = value_of_initializer %float.make_type.loc28_40 [template = f64] // CHECK:STDOUT: %.loc28_40.3: type = converted %float.make_type.loc28_40, %.loc28_40.2 [template = f64] -// CHECK:STDOUT: %b.loc28_37.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: f64 = bind_name b, %b.loc28_37.1 -// CHECK:STDOUT: %bool.make_type.loc28: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type.loc28 [template = bool] -// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type.loc28, %.loc28_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type, %.loc28_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/div.carbon b/toolchain/check/testdata/builtins/float/div.carbon index a7f1a897857ae..1f75289bc233a 100644 --- a/toolchain/check/testdata/builtins/float/div.carbon +++ b/toolchain/check/testdata/builtins/float/div.carbon @@ -92,7 +92,7 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Div = %Div.decl // CHECK:STDOUT: .RuntimeCall = %RuntimeCall.decl -// CHECK:STDOUT: .a = %a.loc8 +// CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = @__global_init.%b // CHECK:STDOUT: .c = @__global_init.%c // CHECK:STDOUT: } @@ -102,45 +102,45 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_11: init type = call constants.%Float(%.loc2_11.1) [template = f64] // CHECK:STDOUT: %.loc2_11.2: type = value_of_initializer %float.make_type.loc2_11 [template = f64] // CHECK:STDOUT: %.loc2_11.3: type = converted %float.make_type.loc2_11, %.loc2_11.2 [template = f64] -// CHECK:STDOUT: %a.loc2_8.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: f64 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_19: init type = call constants.%Float(%.loc2_19.1) [template = f64] // CHECK:STDOUT: %.loc2_19.2: type = value_of_initializer %float.make_type.loc2_19 [template = f64] // CHECK:STDOUT: %.loc2_19.3: type = converted %float.make_type.loc2_19, %.loc2_19.2 [template = f64] -// CHECK:STDOUT: %b.loc2_16.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: f64 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc2_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_27: init type = call constants.%Float(%.loc2_27.1) [template = f64] // CHECK:STDOUT: %.loc2_27.2: type = value_of_initializer %float.make_type.loc2_27 [template = f64] // CHECK:STDOUT: %.loc2_27.3: type = converted %float.make_type.loc2_27, %.loc2_27.2 [template = f64] -// CHECK:STDOUT: @Div.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc4_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_19: init type = call constants.%Float(%.loc4_19.1) [template = f64] // CHECK:STDOUT: %.loc4_19.2: type = value_of_initializer %float.make_type.loc4_19 [template = f64] // CHECK:STDOUT: %.loc4_19.3: type = converted %float.make_type.loc4_19, %.loc4_19.2 [template = f64] -// CHECK:STDOUT: %a.loc4_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc4_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc4_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_27: init type = call constants.%Float(%.loc4_27.1) [template = f64] // CHECK:STDOUT: %.loc4_27.2: type = value_of_initializer %float.make_type.loc4_27 [template = f64] // CHECK:STDOUT: %.loc4_27.3: type = converted %float.make_type.loc4_27, %.loc4_27.2 [template = f64] -// CHECK:STDOUT: %b.loc4_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc4_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc4_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_35: init type = call constants.%Float(%.loc4_35.1) [template = f64] // CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %float.make_type.loc4_35 [template = f64] // CHECK:STDOUT: %.loc4_35.3: type = converted %float.make_type.loc4_35, %.loc4_35.2 [template = f64] -// CHECK:STDOUT: @RuntimeCall.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_8.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_8.1) [template = f64] // CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type.loc8 [template = f64] // CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type.loc8, %.loc8_8.2 [template = f64] // CHECK:STDOUT: %a.var: ref f64 = var a -// CHECK:STDOUT: %a.loc8: ref f64 = bind_name a, %a.var +// CHECK:STDOUT: %a: ref f64 = bind_name a, %a.var // CHECK:STDOUT: %.loc9_8.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc9: init type = call constants.%Float(%.loc9_8.1) [template = f64] // CHECK:STDOUT: %.loc9_8.2: type = value_of_initializer %float.make_type.loc9 [template = f64] @@ -249,131 +249,131 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc8_14: init type = call constants.%Float(%.loc8_14.1) [template = f64] // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %float.make_type.loc8_14 [template = f64] // CHECK:STDOUT: %.loc8_14.3: type = converted %float.make_type.loc8_14, %.loc8_14.2 [template = f64] -// CHECK:STDOUT: %a.loc8_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: f64 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc8_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc8_22: init type = call constants.%Float(%.loc8_22.1) [template = f64] // CHECK:STDOUT: %.loc8_22.2: type = value_of_initializer %float.make_type.loc8_22 [template = f64] // CHECK:STDOUT: %.loc8_22.3: type = converted %float.make_type.loc8_22, %.loc8_22.2 [template = f64] -// CHECK:STDOUT: @TooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %.loc13_15.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_15: init type = call constants.%Float(%.loc13_15.1) [template = f64] // CHECK:STDOUT: %.loc13_15.2: type = value_of_initializer %float.make_type.loc13_15 [template = f64] // CHECK:STDOUT: %.loc13_15.3: type = converted %float.make_type.loc13_15, %.loc13_15.2 [template = f64] -// CHECK:STDOUT: %a.loc13_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: f64 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc13_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_23: init type = call constants.%Float(%.loc13_23.1) [template = f64] // CHECK:STDOUT: %.loc13_23.2: type = value_of_initializer %float.make_type.loc13_23 [template = f64] // CHECK:STDOUT: %.loc13_23.3: type = converted %float.make_type.loc13_23, %.loc13_23.2 [template = f64] -// CHECK:STDOUT: %b.loc13_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: f64 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc13_31.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_31: init type = call constants.%Float(%.loc13_31.1) [template = f64] // CHECK:STDOUT: %.loc13_31.2: type = value_of_initializer %float.make_type.loc13_31 [template = f64] // CHECK:STDOUT: %.loc13_31.3: type = converted %float.make_type.loc13_31, %.loc13_31.2 [template = f64] -// CHECK:STDOUT: %c.loc13_28.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: f64 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc13_39.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_39: init type = call constants.%Float(%.loc13_39.1) [template = f64] // CHECK:STDOUT: %.loc13_39.2: type = value_of_initializer %float.make_type.loc13_39 [template = f64] // CHECK:STDOUT: %.loc13_39.3: type = converted %float.make_type.loc13_39, %.loc13_39.2 [template = f64] -// CHECK:STDOUT: @TooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %.loc17_21.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_21: init type = call constants.%Float(%.loc17_21.1) [template = f64] // CHECK:STDOUT: %.loc17_21.2: type = value_of_initializer %float.make_type.loc17_21 [template = f64] // CHECK:STDOUT: %.loc17_21.3: type = converted %float.make_type.loc17_21, %.loc17_21.2 [template = f64] -// CHECK:STDOUT: %a.loc17_18.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: f64 = bind_name a, %a.loc17_18.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc17_29.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_29: init type = call constants.%Float(%.loc17_29.1) [template = f64] // CHECK:STDOUT: %.loc17_29.2: type = value_of_initializer %float.make_type.loc17_29 [template = f64] // CHECK:STDOUT: %.loc17_29.3: type = converted %float.make_type.loc17_29, %.loc17_29.2 [template = f64] -// CHECK:STDOUT: %b.loc17_26.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: f64 = bind_name b, %b.loc17_26.1 -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type.loc17, %.loc17_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type, %.loc17_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %.loc18_17.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_17: init type = call constants.%Float(%.loc18_17.1) [template = f64] // CHECK:STDOUT: %.loc18_17.2: type = value_of_initializer %float.make_type.loc18_17 [template = f64] // CHECK:STDOUT: %.loc18_17.3: type = converted %float.make_type.loc18_17, %.loc18_17.2 [template = f64] -// CHECK:STDOUT: %a.loc18_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: f64 = bind_name a, %a.loc18_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc18_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_25: init type = call constants.%Float(%.loc18_25.1) [template = f64] // CHECK:STDOUT: %.loc18_25.2: type = value_of_initializer %float.make_type.loc18_25 [template = f64] // CHECK:STDOUT: %.loc18_25.3: type = converted %float.make_type.loc18_25, %.loc18_25.2 [template = f64] -// CHECK:STDOUT: %b.loc18_22.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: f64 = bind_name b, %b.loc18_22.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc18_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_33: init type = call constants.%Float(%.loc18_33.1) [template = f64] // CHECK:STDOUT: %.loc18_33.2: type = value_of_initializer %float.make_type.loc18_33 [template = f64] // CHECK:STDOUT: %.loc18_33.3: type = converted %float.make_type.loc18_33, %.loc18_33.2 [template = f64] -// CHECK:STDOUT: @JustRight.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooFew.decl: %RuntimeCallTooFew.type = fn_decl @RuntimeCallTooFew [template = constants.%RuntimeCallTooFew] { // CHECK:STDOUT: %.loc20_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_25: init type = call constants.%Float(%.loc20_25.1) [template = f64] // CHECK:STDOUT: %.loc20_25.2: type = value_of_initializer %float.make_type.loc20_25 [template = f64] // CHECK:STDOUT: %.loc20_25.3: type = converted %float.make_type.loc20_25, %.loc20_25.2 [template = f64] -// CHECK:STDOUT: %a.loc20_22.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: f64 = bind_name a, %a.loc20_22.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc20_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_33: init type = call constants.%Float(%.loc20_33.1) [template = f64] // CHECK:STDOUT: %.loc20_33.2: type = value_of_initializer %float.make_type.loc20_33 [template = f64] // CHECK:STDOUT: %.loc20_33.3: type = converted %float.make_type.loc20_33, %.loc20_33.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %.loc24_26.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_26: init type = call constants.%Float(%.loc24_26.1) [template = f64] // CHECK:STDOUT: %.loc24_26.2: type = value_of_initializer %float.make_type.loc24_26 [template = f64] // CHECK:STDOUT: %.loc24_26.3: type = converted %float.make_type.loc24_26, %.loc24_26.2 [template = f64] -// CHECK:STDOUT: %a.loc24_23.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: f64 = bind_name a, %a.loc24_23.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc24_34.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_34: init type = call constants.%Float(%.loc24_34.1) [template = f64] // CHECK:STDOUT: %.loc24_34.2: type = value_of_initializer %float.make_type.loc24_34 [template = f64] // CHECK:STDOUT: %.loc24_34.3: type = converted %float.make_type.loc24_34, %.loc24_34.2 [template = f64] -// CHECK:STDOUT: %b.loc24_31.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: f64 = bind_name b, %b.loc24_31.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc24_42.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_42: init type = call constants.%Float(%.loc24_42.1) [template = f64] // CHECK:STDOUT: %.loc24_42.2: type = value_of_initializer %float.make_type.loc24_42 [template = f64] // CHECK:STDOUT: %.loc24_42.3: type = converted %float.make_type.loc24_42, %.loc24_42.2 [template = f64] -// CHECK:STDOUT: %c.loc24_39.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: f64 = bind_name c, %c.loc24_39.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc24_50.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_50: init type = call constants.%Float(%.loc24_50.1) [template = f64] // CHECK:STDOUT: %.loc24_50.2: type = value_of_initializer %float.make_type.loc24_50 [template = f64] // CHECK:STDOUT: %.loc24_50.3: type = converted %float.make_type.loc24_50, %.loc24_50.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %.loc28_32.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_32: init type = call constants.%Float(%.loc28_32.1) [template = f64] // CHECK:STDOUT: %.loc28_32.2: type = value_of_initializer %float.make_type.loc28_32 [template = f64] // CHECK:STDOUT: %.loc28_32.3: type = converted %float.make_type.loc28_32, %.loc28_32.2 [template = f64] -// CHECK:STDOUT: %a.loc28_29.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: f64 = bind_name a, %a.loc28_29.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc28_40.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_40: init type = call constants.%Float(%.loc28_40.1) [template = f64] // CHECK:STDOUT: %.loc28_40.2: type = value_of_initializer %float.make_type.loc28_40 [template = f64] // CHECK:STDOUT: %.loc28_40.3: type = converted %float.make_type.loc28_40, %.loc28_40.2 [template = f64] -// CHECK:STDOUT: %b.loc28_37.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: f64 = bind_name b, %b.loc28_37.1 -// CHECK:STDOUT: %bool.make_type.loc28: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type.loc28 [template = bool] -// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type.loc28, %.loc28_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type, %.loc28_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/eq.carbon b/toolchain/check/testdata/builtins/float/eq.carbon index 561d74ef1d2ef..5c67122e25b81 100644 --- a/toolchain/check/testdata/builtins/float/eq.carbon +++ b/toolchain/check/testdata/builtins/float/eq.carbon @@ -90,46 +90,46 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.eq"; // CHECK:STDOUT: %float.make_type.loc2_10: init type = call constants.%Float(%.loc2_10.1) [template = f64] // CHECK:STDOUT: %.loc2_10.2: type = value_of_initializer %float.make_type.loc2_10 [template = f64] // CHECK:STDOUT: %.loc2_10.3: type = converted %float.make_type.loc2_10, %.loc2_10.2 [template = f64] -// CHECK:STDOUT: %a.loc2_7.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Eq.%a: f64 = bind_name a, %a.loc2_7.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_18.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_18: init type = call constants.%Float(%.loc2_18.1) [template = f64] // CHECK:STDOUT: %.loc2_18.2: type = value_of_initializer %float.make_type.loc2_18 [template = f64] // CHECK:STDOUT: %.loc2_18.3: type = converted %float.make_type.loc2_18, %.loc2_18.2 [template = f64] -// CHECK:STDOUT: %b.loc2_15.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Eq.%b: f64 = bind_name b, %b.loc2_15.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_26.2: type = converted %bool.make_type.loc2, %.loc2_26.1 [template = bool] -// CHECK:STDOUT: @Eq.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_26.2: type = converted %bool.make_type, %.loc2_26.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc7_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc7_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc7_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc7_19.1 +// CHECK:STDOUT: %True.ref.loc7: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc7: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc12_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc12_19: init type = call constants.%Float(%.loc12_19.1) [template = f64] // CHECK:STDOUT: %.loc12_19.2: type = value_of_initializer %float.make_type.loc12_19 [template = f64] // CHECK:STDOUT: %.loc12_19.3: type = converted %float.make_type.loc12_19, %.loc12_19.2 [template = f64] -// CHECK:STDOUT: %a.loc12_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc12_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc12_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc12_27: init type = call constants.%Float(%.loc12_27.1) [template = f64] // CHECK:STDOUT: %.loc12_27.2: type = value_of_initializer %float.make_type.loc12_27 [template = f64] // CHECK:STDOUT: %.loc12_27.3: type = converted %float.make_type.loc12_27, %.loc12_27.2 [template = f64] -// CHECK:STDOUT: %b.loc12_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc12_24.1 -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type.loc12, %.loc12_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type, %.loc12_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -240,19 +240,19 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.eq"; // CHECK:STDOUT: %float.make_type.loc7_19: init type = call constants.%Float(%.loc7_19.1) [template = f64] // CHECK:STDOUT: %.loc7_19.2: type = value_of_initializer %float.make_type.loc7_19 [template = f64] // CHECK:STDOUT: %.loc7_19.3: type = converted %float.make_type.loc7_19, %.loc7_19.2 [template = f64] -// CHECK:STDOUT: %a.loc7_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @WrongResult.%a: f64 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc7_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc7_27: init type = call constants.%Float(%.loc7_27.1) [template = f64] // CHECK:STDOUT: %.loc7_27.2: type = value_of_initializer %float.make_type.loc7_27 [template = f64] // CHECK:STDOUT: %.loc7_27.3: type = converted %float.make_type.loc7_27, %.loc7_27.2 [template = f64] -// CHECK:STDOUT: %b.loc7_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @WrongResult.%b: f64 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc7_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc7_35: init type = call constants.%Float(%.loc7_35.1) [template = f64] // CHECK:STDOUT: %.loc7_35.2: type = value_of_initializer %float.make_type.loc7_35 [template = f64] // CHECK:STDOUT: %.loc7_35.3: type = converted %float.make_type.loc7_35, %.loc7_35.2 [template = f64] -// CHECK:STDOUT: @WrongResult.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/greater.carbon b/toolchain/check/testdata/builtins/float/greater.carbon index 7f18ba112701c..2a69a55c5563d 100644 --- a/toolchain/check/testdata/builtins/float/greater.carbon +++ b/toolchain/check/testdata/builtins/float/greater.carbon @@ -90,59 +90,59 @@ fn RuntimeCall(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_15: init type = call constants.%Float(%.loc2_15.1) [template = f64] // CHECK:STDOUT: %.loc2_15.2: type = value_of_initializer %float.make_type.loc2_15 [template = f64] // CHECK:STDOUT: %.loc2_15.3: type = converted %float.make_type.loc2_15, %.loc2_15.2 [template = f64] -// CHECK:STDOUT: %a.loc2_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Greater.%a: f64 = bind_name a, %a.loc2_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_23: init type = call constants.%Float(%.loc2_23.1) [template = f64] // CHECK:STDOUT: %.loc2_23.2: type = value_of_initializer %float.make_type.loc2_23 [template = f64] // CHECK:STDOUT: %.loc2_23.3: type = converted %float.make_type.loc2_23, %.loc2_23.2 [template = f64] -// CHECK:STDOUT: %b.loc2_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Greater.%b: f64 = bind_name b, %b.loc2_20.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_31.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_31.2: type = converted %bool.make_type.loc2, %.loc2_31.1 [template = bool] -// CHECK:STDOUT: @Greater.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_31.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_31.2: type = converted %bool.make_type, %.loc2_31.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %.loc3_14.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_14: init type = call constants.%Float(%.loc3_14.1) [template = f64] // CHECK:STDOUT: %.loc3_14.2: type = value_of_initializer %float.make_type.loc3_14 [template = f64] // CHECK:STDOUT: %.loc3_14.3: type = converted %float.make_type.loc3_14, %.loc3_14.2 [template = f64] -// CHECK:STDOUT: %a.loc3_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: f64 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc3_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_22: init type = call constants.%Float(%.loc3_22.1) [template = f64] // CHECK:STDOUT: %.loc3_22.2: type = value_of_initializer %float.make_type.loc3_22 [template = f64] // CHECK:STDOUT: %.loc3_22.3: type = converted %float.make_type.loc3_22, %.loc3_22.2 [template = f64] -// CHECK:STDOUT: @Negate.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc16_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_19: init type = call constants.%Float(%.loc16_19.1) [template = f64] // CHECK:STDOUT: %.loc16_19.2: type = value_of_initializer %float.make_type.loc16_19 [template = f64] // CHECK:STDOUT: %.loc16_19.3: type = converted %float.make_type.loc16_19, %.loc16_19.2 [template = f64] -// CHECK:STDOUT: %a.loc16_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc16_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_27: init type = call constants.%Float(%.loc16_27.1) [template = f64] // CHECK:STDOUT: %.loc16_27.2: type = value_of_initializer %float.make_type.loc16_27 [template = f64] // CHECK:STDOUT: %.loc16_27.3: type = converted %float.make_type.loc16_27, %.loc16_27.2 [template = f64] -// CHECK:STDOUT: %b.loc16_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/greater_eq.carbon b/toolchain/check/testdata/builtins/float/greater_eq.carbon index 9f4e8537bb092..1e9142c817b40 100644 --- a/toolchain/check/testdata/builtins/float/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/float/greater_eq.carbon @@ -90,59 +90,59 @@ fn RuntimeCall(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_17: init type = call constants.%Float(%.loc2_17.1) [template = f64] // CHECK:STDOUT: %.loc2_17.2: type = value_of_initializer %float.make_type.loc2_17 [template = f64] // CHECK:STDOUT: %.loc2_17.3: type = converted %float.make_type.loc2_17, %.loc2_17.2 [template = f64] -// CHECK:STDOUT: %a.loc2_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @GreaterEq.%a: f64 = bind_name a, %a.loc2_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_25: init type = call constants.%Float(%.loc2_25.1) [template = f64] // CHECK:STDOUT: %.loc2_25.2: type = value_of_initializer %float.make_type.loc2_25 [template = f64] // CHECK:STDOUT: %.loc2_25.3: type = converted %float.make_type.loc2_25, %.loc2_25.2 [template = f64] -// CHECK:STDOUT: %b.loc2_22.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @GreaterEq.%b: f64 = bind_name b, %b.loc2_22.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_33.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_33.2: type = converted %bool.make_type.loc2, %.loc2_33.1 [template = bool] -// CHECK:STDOUT: @GreaterEq.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_33.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_33.2: type = converted %bool.make_type, %.loc2_33.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %.loc3_14.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_14: init type = call constants.%Float(%.loc3_14.1) [template = f64] // CHECK:STDOUT: %.loc3_14.2: type = value_of_initializer %float.make_type.loc3_14 [template = f64] // CHECK:STDOUT: %.loc3_14.3: type = converted %float.make_type.loc3_14, %.loc3_14.2 [template = f64] -// CHECK:STDOUT: %a.loc3_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: f64 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc3_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_22: init type = call constants.%Float(%.loc3_22.1) [template = f64] // CHECK:STDOUT: %.loc3_22.2: type = value_of_initializer %float.make_type.loc3_22 [template = f64] // CHECK:STDOUT: %.loc3_22.3: type = converted %float.make_type.loc3_22, %.loc3_22.2 [template = f64] -// CHECK:STDOUT: @Negate.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc16_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_19: init type = call constants.%Float(%.loc16_19.1) [template = f64] // CHECK:STDOUT: %.loc16_19.2: type = value_of_initializer %float.make_type.loc16_19 [template = f64] // CHECK:STDOUT: %.loc16_19.3: type = converted %float.make_type.loc16_19, %.loc16_19.2 [template = f64] -// CHECK:STDOUT: %a.loc16_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc16_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_27: init type = call constants.%Float(%.loc16_27.1) [template = f64] // CHECK:STDOUT: %.loc16_27.2: type = value_of_initializer %float.make_type.loc16_27 [template = f64] // CHECK:STDOUT: %.loc16_27.3: type = converted %float.make_type.loc16_27, %.loc16_27.2 [template = f64] -// CHECK:STDOUT: %b.loc16_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/less.carbon b/toolchain/check/testdata/builtins/float/less.carbon index 8ec60ba29b3d9..261493d9e6b2c 100644 --- a/toolchain/check/testdata/builtins/float/less.carbon +++ b/toolchain/check/testdata/builtins/float/less.carbon @@ -90,59 +90,59 @@ fn RuntimeCall(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_12: init type = call constants.%Float(%.loc2_12.1) [template = f64] // CHECK:STDOUT: %.loc2_12.2: type = value_of_initializer %float.make_type.loc2_12 [template = f64] // CHECK:STDOUT: %.loc2_12.3: type = converted %float.make_type.loc2_12, %.loc2_12.2 [template = f64] -// CHECK:STDOUT: %a.loc2_9.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Less.%a: f64 = bind_name a, %a.loc2_9.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_20.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_20: init type = call constants.%Float(%.loc2_20.1) [template = f64] // CHECK:STDOUT: %.loc2_20.2: type = value_of_initializer %float.make_type.loc2_20 [template = f64] // CHECK:STDOUT: %.loc2_20.3: type = converted %float.make_type.loc2_20, %.loc2_20.2 [template = f64] -// CHECK:STDOUT: %b.loc2_17.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Less.%b: f64 = bind_name b, %b.loc2_17.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_28.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_28.2: type = converted %bool.make_type.loc2, %.loc2_28.1 [template = bool] -// CHECK:STDOUT: @Less.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_28.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_28.2: type = converted %bool.make_type, %.loc2_28.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %.loc3_14.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_14: init type = call constants.%Float(%.loc3_14.1) [template = f64] // CHECK:STDOUT: %.loc3_14.2: type = value_of_initializer %float.make_type.loc3_14 [template = f64] // CHECK:STDOUT: %.loc3_14.3: type = converted %float.make_type.loc3_14, %.loc3_14.2 [template = f64] -// CHECK:STDOUT: %a.loc3_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: f64 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc3_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_22: init type = call constants.%Float(%.loc3_22.1) [template = f64] // CHECK:STDOUT: %.loc3_22.2: type = value_of_initializer %float.make_type.loc3_22 [template = f64] // CHECK:STDOUT: %.loc3_22.3: type = converted %float.make_type.loc3_22, %.loc3_22.2 [template = f64] -// CHECK:STDOUT: @Negate.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc16_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_19: init type = call constants.%Float(%.loc16_19.1) [template = f64] // CHECK:STDOUT: %.loc16_19.2: type = value_of_initializer %float.make_type.loc16_19 [template = f64] // CHECK:STDOUT: %.loc16_19.3: type = converted %float.make_type.loc16_19, %.loc16_19.2 [template = f64] -// CHECK:STDOUT: %a.loc16_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc16_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_27: init type = call constants.%Float(%.loc16_27.1) [template = f64] // CHECK:STDOUT: %.loc16_27.2: type = value_of_initializer %float.make_type.loc16_27 [template = f64] // CHECK:STDOUT: %.loc16_27.3: type = converted %float.make_type.loc16_27, %.loc16_27.2 [template = f64] -// CHECK:STDOUT: %b.loc16_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/less_eq.carbon b/toolchain/check/testdata/builtins/float/less_eq.carbon index e5359dc5bc5da..aadb5cdce4bd2 100644 --- a/toolchain/check/testdata/builtins/float/less_eq.carbon +++ b/toolchain/check/testdata/builtins/float/less_eq.carbon @@ -90,59 +90,59 @@ fn RuntimeCall(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_14: init type = call constants.%Float(%.loc2_14.1) [template = f64] // CHECK:STDOUT: %.loc2_14.2: type = value_of_initializer %float.make_type.loc2_14 [template = f64] // CHECK:STDOUT: %.loc2_14.3: type = converted %float.make_type.loc2_14, %.loc2_14.2 [template = f64] -// CHECK:STDOUT: %a.loc2_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @LessEq.%a: f64 = bind_name a, %a.loc2_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_22: init type = call constants.%Float(%.loc2_22.1) [template = f64] // CHECK:STDOUT: %.loc2_22.2: type = value_of_initializer %float.make_type.loc2_22 [template = f64] // CHECK:STDOUT: %.loc2_22.3: type = converted %float.make_type.loc2_22, %.loc2_22.2 [template = f64] -// CHECK:STDOUT: %b.loc2_19.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @LessEq.%b: f64 = bind_name b, %b.loc2_19.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_30.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_30.2: type = converted %bool.make_type.loc2, %.loc2_30.1 [template = bool] -// CHECK:STDOUT: @LessEq.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_30.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_30.2: type = converted %bool.make_type, %.loc2_30.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %.loc3_14.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_14: init type = call constants.%Float(%.loc3_14.1) [template = f64] // CHECK:STDOUT: %.loc3_14.2: type = value_of_initializer %float.make_type.loc3_14 [template = f64] // CHECK:STDOUT: %.loc3_14.3: type = converted %float.make_type.loc3_14, %.loc3_14.2 [template = f64] -// CHECK:STDOUT: %a.loc3_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: f64 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc3_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc3_22: init type = call constants.%Float(%.loc3_22.1) [template = f64] // CHECK:STDOUT: %.loc3_22.2: type = value_of_initializer %float.make_type.loc3_22 [template = f64] // CHECK:STDOUT: %.loc3_22.3: type = converted %float.make_type.loc3_22, %.loc3_22.2 [template = f64] -// CHECK:STDOUT: @Negate.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc16_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_19: init type = call constants.%Float(%.loc16_19.1) [template = f64] // CHECK:STDOUT: %.loc16_19.2: type = value_of_initializer %float.make_type.loc16_19 [template = f64] // CHECK:STDOUT: %.loc16_19.3: type = converted %float.make_type.loc16_19, %.loc16_19.2 [template = f64] -// CHECK:STDOUT: %a.loc16_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc16_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc16_27: init type = call constants.%Float(%.loc16_27.1) [template = f64] // CHECK:STDOUT: %.loc16_27.2: type = value_of_initializer %float.make_type.loc16_27 [template = f64] // CHECK:STDOUT: %.loc16_27.3: type = converted %float.make_type.loc16_27, %.loc16_27.2 [template = f64] -// CHECK:STDOUT: %b.loc16_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/make_type.carbon b/toolchain/check/testdata/builtins/float/make_type.carbon index e03029056c989..273d5289d5540 100644 --- a/toolchain/check/testdata/builtins/float/make_type.carbon +++ b/toolchain/check/testdata/builtins/float/make_type.carbon @@ -79,9 +79,9 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_16.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc4_16.2: type = converted %int.make_type_32, %.loc4_16.1 [template = i32] -// CHECK:STDOUT: %size.loc4_10.1: i32 = param size, runtime_param0 -// CHECK:STDOUT: @Float.%size: i32 = bind_name size, %size.loc4_10.1 -// CHECK:STDOUT: @Float.%return: ref type = var +// CHECK:STDOUT: %size.param: i32 = param size, runtime_param0 +// CHECK:STDOUT: %size: i32 = bind_name size, %size.param +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -139,9 +139,9 @@ var dyn: Float(dyn_size); // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_23.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc8_23.2: type = converted %int.make_type_32, %.loc8_23.1 [template = i32] -// CHECK:STDOUT: %dyn_size.loc8_13.1: i32 = param dyn_size, runtime_param0 -// CHECK:STDOUT: @GetFloat.%dyn_size: i32 = bind_name dyn_size, %dyn_size.loc8_13.1 -// CHECK:STDOUT: @GetFloat.%return: ref type = var +// CHECK:STDOUT: %dyn_size.param: i32 = param dyn_size, runtime_param0 +// CHECK:STDOUT: %dyn_size: i32 = bind_name dyn_size, %dyn_size.param +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/mul.carbon b/toolchain/check/testdata/builtins/float/mul.carbon index d36cf7f2cd985..d6086cc8c8cf7 100644 --- a/toolchain/check/testdata/builtins/float/mul.carbon +++ b/toolchain/check/testdata/builtins/float/mul.carbon @@ -94,43 +94,43 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_11: init type = call constants.%Float(%.loc2_11.1) [template = f64] // CHECK:STDOUT: %.loc2_11.2: type = value_of_initializer %float.make_type.loc2_11 [template = f64] // CHECK:STDOUT: %.loc2_11.3: type = converted %float.make_type.loc2_11, %.loc2_11.2 [template = f64] -// CHECK:STDOUT: %a.loc2_8.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Mul.%a: f64 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_19: init type = call constants.%Float(%.loc2_19.1) [template = f64] // CHECK:STDOUT: %.loc2_19.2: type = value_of_initializer %float.make_type.loc2_19 [template = f64] // CHECK:STDOUT: %.loc2_19.3: type = converted %float.make_type.loc2_19, %.loc2_19.2 [template = f64] -// CHECK:STDOUT: %b.loc2_16.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Mul.%b: f64 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc2_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_27: init type = call constants.%Float(%.loc2_27.1) [template = f64] // CHECK:STDOUT: %.loc2_27.2: type = value_of_initializer %float.make_type.loc2_27 [template = f64] // CHECK:STDOUT: %.loc2_27.3: type = converted %float.make_type.loc2_27, %.loc2_27.2 [template = f64] -// CHECK:STDOUT: @Mul.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc4_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_19: init type = call constants.%Float(%.loc4_19.1) [template = f64] // CHECK:STDOUT: %.loc4_19.2: type = value_of_initializer %float.make_type.loc4_19 [template = f64] // CHECK:STDOUT: %.loc4_19.3: type = converted %float.make_type.loc4_19, %.loc4_19.2 [template = f64] -// CHECK:STDOUT: %a.loc4_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc4_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc4_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_27: init type = call constants.%Float(%.loc4_27.1) [template = f64] // CHECK:STDOUT: %.loc4_27.2: type = value_of_initializer %float.make_type.loc4_27 [template = f64] // CHECK:STDOUT: %.loc4_27.3: type = converted %float.make_type.loc4_27, %.loc4_27.2 [template = f64] -// CHECK:STDOUT: %b.loc4_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc4_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc4_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_35: init type = call constants.%Float(%.loc4_35.1) [template = f64] // CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %float.make_type.loc4_35 [template = f64] // CHECK:STDOUT: %.loc4_35.3: type = converted %float.make_type.loc4_35, %.loc4_35.2 [template = f64] -// CHECK:STDOUT: @RuntimeCall.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_8.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_8.1) [template = f64] -// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type.loc8 [template = f64] -// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type.loc8, %.loc8_8.2 [template = f64] +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc8_8.1) [template = f64] +// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type, %.loc8_8.2 [template = f64] // CHECK:STDOUT: %x.var: ref f64 = var x // CHECK:STDOUT: %x: ref f64 = bind_name x, %x.var // CHECK:STDOUT: } @@ -219,131 +219,131 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc8_14: init type = call constants.%Float(%.loc8_14.1) [template = f64] // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %float.make_type.loc8_14 [template = f64] // CHECK:STDOUT: %.loc8_14.3: type = converted %float.make_type.loc8_14, %.loc8_14.2 [template = f64] -// CHECK:STDOUT: %a.loc8_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: f64 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc8_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc8_22: init type = call constants.%Float(%.loc8_22.1) [template = f64] // CHECK:STDOUT: %.loc8_22.2: type = value_of_initializer %float.make_type.loc8_22 [template = f64] // CHECK:STDOUT: %.loc8_22.3: type = converted %float.make_type.loc8_22, %.loc8_22.2 [template = f64] -// CHECK:STDOUT: @TooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %.loc13_15.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_15: init type = call constants.%Float(%.loc13_15.1) [template = f64] // CHECK:STDOUT: %.loc13_15.2: type = value_of_initializer %float.make_type.loc13_15 [template = f64] // CHECK:STDOUT: %.loc13_15.3: type = converted %float.make_type.loc13_15, %.loc13_15.2 [template = f64] -// CHECK:STDOUT: %a.loc13_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: f64 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc13_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_23: init type = call constants.%Float(%.loc13_23.1) [template = f64] // CHECK:STDOUT: %.loc13_23.2: type = value_of_initializer %float.make_type.loc13_23 [template = f64] // CHECK:STDOUT: %.loc13_23.3: type = converted %float.make_type.loc13_23, %.loc13_23.2 [template = f64] -// CHECK:STDOUT: %b.loc13_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: f64 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc13_31.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_31: init type = call constants.%Float(%.loc13_31.1) [template = f64] // CHECK:STDOUT: %.loc13_31.2: type = value_of_initializer %float.make_type.loc13_31 [template = f64] // CHECK:STDOUT: %.loc13_31.3: type = converted %float.make_type.loc13_31, %.loc13_31.2 [template = f64] -// CHECK:STDOUT: %c.loc13_28.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: f64 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc13_39.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_39: init type = call constants.%Float(%.loc13_39.1) [template = f64] // CHECK:STDOUT: %.loc13_39.2: type = value_of_initializer %float.make_type.loc13_39 [template = f64] // CHECK:STDOUT: %.loc13_39.3: type = converted %float.make_type.loc13_39, %.loc13_39.2 [template = f64] -// CHECK:STDOUT: @TooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %.loc17_21.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_21: init type = call constants.%Float(%.loc17_21.1) [template = f64] // CHECK:STDOUT: %.loc17_21.2: type = value_of_initializer %float.make_type.loc17_21 [template = f64] // CHECK:STDOUT: %.loc17_21.3: type = converted %float.make_type.loc17_21, %.loc17_21.2 [template = f64] -// CHECK:STDOUT: %a.loc17_18.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: f64 = bind_name a, %a.loc17_18.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc17_29.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_29: init type = call constants.%Float(%.loc17_29.1) [template = f64] // CHECK:STDOUT: %.loc17_29.2: type = value_of_initializer %float.make_type.loc17_29 [template = f64] // CHECK:STDOUT: %.loc17_29.3: type = converted %float.make_type.loc17_29, %.loc17_29.2 [template = f64] -// CHECK:STDOUT: %b.loc17_26.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: f64 = bind_name b, %b.loc17_26.1 -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type.loc17, %.loc17_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type, %.loc17_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %.loc18_17.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_17: init type = call constants.%Float(%.loc18_17.1) [template = f64] // CHECK:STDOUT: %.loc18_17.2: type = value_of_initializer %float.make_type.loc18_17 [template = f64] // CHECK:STDOUT: %.loc18_17.3: type = converted %float.make_type.loc18_17, %.loc18_17.2 [template = f64] -// CHECK:STDOUT: %a.loc18_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: f64 = bind_name a, %a.loc18_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc18_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_25: init type = call constants.%Float(%.loc18_25.1) [template = f64] // CHECK:STDOUT: %.loc18_25.2: type = value_of_initializer %float.make_type.loc18_25 [template = f64] // CHECK:STDOUT: %.loc18_25.3: type = converted %float.make_type.loc18_25, %.loc18_25.2 [template = f64] -// CHECK:STDOUT: %b.loc18_22.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: f64 = bind_name b, %b.loc18_22.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc18_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_33: init type = call constants.%Float(%.loc18_33.1) [template = f64] // CHECK:STDOUT: %.loc18_33.2: type = value_of_initializer %float.make_type.loc18_33 [template = f64] // CHECK:STDOUT: %.loc18_33.3: type = converted %float.make_type.loc18_33, %.loc18_33.2 [template = f64] -// CHECK:STDOUT: @JustRight.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooFew.decl: %RuntimeCallTooFew.type = fn_decl @RuntimeCallTooFew [template = constants.%RuntimeCallTooFew] { // CHECK:STDOUT: %.loc20_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_25: init type = call constants.%Float(%.loc20_25.1) [template = f64] // CHECK:STDOUT: %.loc20_25.2: type = value_of_initializer %float.make_type.loc20_25 [template = f64] // CHECK:STDOUT: %.loc20_25.3: type = converted %float.make_type.loc20_25, %.loc20_25.2 [template = f64] -// CHECK:STDOUT: %a.loc20_22.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: f64 = bind_name a, %a.loc20_22.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc20_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_33: init type = call constants.%Float(%.loc20_33.1) [template = f64] // CHECK:STDOUT: %.loc20_33.2: type = value_of_initializer %float.make_type.loc20_33 [template = f64] // CHECK:STDOUT: %.loc20_33.3: type = converted %float.make_type.loc20_33, %.loc20_33.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %.loc24_26.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_26: init type = call constants.%Float(%.loc24_26.1) [template = f64] // CHECK:STDOUT: %.loc24_26.2: type = value_of_initializer %float.make_type.loc24_26 [template = f64] // CHECK:STDOUT: %.loc24_26.3: type = converted %float.make_type.loc24_26, %.loc24_26.2 [template = f64] -// CHECK:STDOUT: %a.loc24_23.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: f64 = bind_name a, %a.loc24_23.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc24_34.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_34: init type = call constants.%Float(%.loc24_34.1) [template = f64] // CHECK:STDOUT: %.loc24_34.2: type = value_of_initializer %float.make_type.loc24_34 [template = f64] // CHECK:STDOUT: %.loc24_34.3: type = converted %float.make_type.loc24_34, %.loc24_34.2 [template = f64] -// CHECK:STDOUT: %b.loc24_31.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: f64 = bind_name b, %b.loc24_31.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc24_42.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_42: init type = call constants.%Float(%.loc24_42.1) [template = f64] // CHECK:STDOUT: %.loc24_42.2: type = value_of_initializer %float.make_type.loc24_42 [template = f64] // CHECK:STDOUT: %.loc24_42.3: type = converted %float.make_type.loc24_42, %.loc24_42.2 [template = f64] -// CHECK:STDOUT: %c.loc24_39.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: f64 = bind_name c, %c.loc24_39.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc24_50.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_50: init type = call constants.%Float(%.loc24_50.1) [template = f64] // CHECK:STDOUT: %.loc24_50.2: type = value_of_initializer %float.make_type.loc24_50 [template = f64] // CHECK:STDOUT: %.loc24_50.3: type = converted %float.make_type.loc24_50, %.loc24_50.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %.loc28_32.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_32: init type = call constants.%Float(%.loc28_32.1) [template = f64] // CHECK:STDOUT: %.loc28_32.2: type = value_of_initializer %float.make_type.loc28_32 [template = f64] // CHECK:STDOUT: %.loc28_32.3: type = converted %float.make_type.loc28_32, %.loc28_32.2 [template = f64] -// CHECK:STDOUT: %a.loc28_29.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: f64 = bind_name a, %a.loc28_29.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc28_40.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_40: init type = call constants.%Float(%.loc28_40.1) [template = f64] // CHECK:STDOUT: %.loc28_40.2: type = value_of_initializer %float.make_type.loc28_40 [template = f64] // CHECK:STDOUT: %.loc28_40.3: type = converted %float.make_type.loc28_40, %.loc28_40.2 [template = f64] -// CHECK:STDOUT: %b.loc28_37.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: f64 = bind_name b, %b.loc28_37.1 -// CHECK:STDOUT: %bool.make_type.loc28: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type.loc28 [template = bool] -// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type.loc28, %.loc28_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type, %.loc28_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/negate.carbon b/toolchain/check/testdata/builtins/float/negate.carbon index 39f316fb2c39c..dfcf2aa0e4529 100644 --- a/toolchain/check/testdata/builtins/float/negate.carbon +++ b/toolchain/check/testdata/builtins/float/negate.carbon @@ -114,37 +114,37 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_14: init type = call constants.%Float(%.loc2_14.1) [template = f64] // CHECK:STDOUT: %.loc2_14.2: type = value_of_initializer %float.make_type.loc2_14 [template = f64] // CHECK:STDOUT: %.loc2_14.3: type = converted %float.make_type.loc2_14, %.loc2_14.2 [template = f64] -// CHECK:STDOUT: %a.loc2_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: f64 = bind_name a, %a.loc2_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_22: init type = call constants.%Float(%.loc2_22.1) [template = f64] // CHECK:STDOUT: %.loc2_22.2: type = value_of_initializer %float.make_type.loc2_22 [template = f64] // CHECK:STDOUT: %.loc2_22.3: type = converted %float.make_type.loc2_22, %.loc2_22.2 [template = f64] -// CHECK:STDOUT: @Negate.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc4_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_19: init type = call constants.%Float(%.loc4_19.1) [template = f64] // CHECK:STDOUT: %.loc4_19.2: type = value_of_initializer %float.make_type.loc4_19 [template = f64] // CHECK:STDOUT: %.loc4_19.3: type = converted %float.make_type.loc4_19, %.loc4_19.2 [template = f64] -// CHECK:STDOUT: %a.loc4_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc4_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc4_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_27: init type = call constants.%Float(%.loc4_27.1) [template = f64] // CHECK:STDOUT: %.loc4_27.2: type = value_of_initializer %float.make_type.loc4_27 [template = f64] // CHECK:STDOUT: %.loc4_27.3: type = converted %float.make_type.loc4_27, %.loc4_27.2 [template = f64] -// CHECK:STDOUT: %b.loc4_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc4_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc4_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_35: init type = call constants.%Float(%.loc4_35.1) [template = f64] // CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %float.make_type.loc4_35 [template = f64] // CHECK:STDOUT: %.loc4_35.3: type = converted %float.make_type.loc4_35, %.loc4_35.2 [template = f64] -// CHECK:STDOUT: @RuntimeCall.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_8.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_8.1) [template = f64] -// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type.loc8 [template = f64] -// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type.loc8, %.loc8_8.2 [template = f64] +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc8_8.1) [template = f64] +// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type, %.loc8_8.2 [template = f64] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Float(%size: i32) -> type = "float.make_type"; @@ -228,110 +228,110 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %TooFew.decl: %TooFew.type = fn_decl @TooFew [template = constants.%TooFew] { // CHECK:STDOUT: %.loc8_16.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_16.1) [template = f64] -// CHECK:STDOUT: %.loc8_16.2: type = value_of_initializer %float.make_type.loc8 [template = f64] -// CHECK:STDOUT: %.loc8_16.3: type = converted %float.make_type.loc8, %.loc8_16.2 [template = f64] -// CHECK:STDOUT: @TooFew.%return: ref f64 = var +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc8_16.1) [template = f64] +// CHECK:STDOUT: %.loc8_16.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc8_16.3: type = converted %float.make_type, %.loc8_16.2 [template = f64] +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %.loc13_15.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_15: init type = call constants.%Float(%.loc13_15.1) [template = f64] // CHECK:STDOUT: %.loc13_15.2: type = value_of_initializer %float.make_type.loc13_15 [template = f64] // CHECK:STDOUT: %.loc13_15.3: type = converted %float.make_type.loc13_15, %.loc13_15.2 [template = f64] -// CHECK:STDOUT: %a.loc13_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: f64 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc13_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_23: init type = call constants.%Float(%.loc13_23.1) [template = f64] // CHECK:STDOUT: %.loc13_23.2: type = value_of_initializer %float.make_type.loc13_23 [template = f64] // CHECK:STDOUT: %.loc13_23.3: type = converted %float.make_type.loc13_23, %.loc13_23.2 [template = f64] -// CHECK:STDOUT: %b.loc13_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: f64 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc13_31.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_31: init type = call constants.%Float(%.loc13_31.1) [template = f64] // CHECK:STDOUT: %.loc13_31.2: type = value_of_initializer %float.make_type.loc13_31 [template = f64] // CHECK:STDOUT: %.loc13_31.3: type = converted %float.make_type.loc13_31, %.loc13_31.2 [template = f64] -// CHECK:STDOUT: @TooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %.loc18_21.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc18: init type = call constants.%Float(%.loc18_21.1) [template = f64] -// CHECK:STDOUT: %.loc18_21.2: type = value_of_initializer %float.make_type.loc18 [template = f64] -// CHECK:STDOUT: %.loc18_21.3: type = converted %float.make_type.loc18, %.loc18_21.2 [template = f64] -// CHECK:STDOUT: %a.loc18_18.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: f64 = bind_name a, %a.loc18_18.1 -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type.loc18, %.loc18_29.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc18_21.1) [template = f64] +// CHECK:STDOUT: %.loc18_21.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc18_21.3: type = converted %float.make_type, %.loc18_21.2 [template = f64] +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type, %.loc18_29.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %.loc19_17.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc19_17: init type = call constants.%Float(%.loc19_17.1) [template = f64] // CHECK:STDOUT: %.loc19_17.2: type = value_of_initializer %float.make_type.loc19_17 [template = f64] // CHECK:STDOUT: %.loc19_17.3: type = converted %float.make_type.loc19_17, %.loc19_17.2 [template = f64] -// CHECK:STDOUT: %a.loc19_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: f64 = bind_name a, %a.loc19_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc19_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc19_25: init type = call constants.%Float(%.loc19_25.1) [template = f64] // CHECK:STDOUT: %.loc19_25.2: type = value_of_initializer %float.make_type.loc19_25 [template = f64] // CHECK:STDOUT: %.loc19_25.3: type = converted %float.make_type.loc19_25, %.loc19_25.2 [template = f64] -// CHECK:STDOUT: @JustRight.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooFew.decl: %RuntimeCallTooFew.type = fn_decl @RuntimeCallTooFew [template = constants.%RuntimeCallTooFew] { // CHECK:STDOUT: %.loc21_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc21_25: init type = call constants.%Float(%.loc21_25.1) [template = f64] // CHECK:STDOUT: %.loc21_25.2: type = value_of_initializer %float.make_type.loc21_25 [template = f64] // CHECK:STDOUT: %.loc21_25.3: type = converted %float.make_type.loc21_25, %.loc21_25.2 [template = f64] -// CHECK:STDOUT: %a.loc21_22.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: f64 = bind_name a, %a.loc21_22.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc21_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc21_33: init type = call constants.%Float(%.loc21_33.1) [template = f64] // CHECK:STDOUT: %.loc21_33.2: type = value_of_initializer %float.make_type.loc21_33 [template = f64] // CHECK:STDOUT: %.loc21_33.3: type = converted %float.make_type.loc21_33, %.loc21_33.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %.loc32_26.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc32_26: init type = call constants.%Float(%.loc32_26.1) [template = f64] // CHECK:STDOUT: %.loc32_26.2: type = value_of_initializer %float.make_type.loc32_26 [template = f64] // CHECK:STDOUT: %.loc32_26.3: type = converted %float.make_type.loc32_26, %.loc32_26.2 [template = f64] -// CHECK:STDOUT: %a.loc32_23.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: f64 = bind_name a, %a.loc32_23.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc32_34.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc32_34: init type = call constants.%Float(%.loc32_34.1) [template = f64] // CHECK:STDOUT: %.loc32_34.2: type = value_of_initializer %float.make_type.loc32_34 [template = f64] // CHECK:STDOUT: %.loc32_34.3: type = converted %float.make_type.loc32_34, %.loc32_34.2 [template = f64] -// CHECK:STDOUT: %b.loc32_31.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: f64 = bind_name b, %b.loc32_31.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc32_42.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc32_42: init type = call constants.%Float(%.loc32_42.1) [template = f64] // CHECK:STDOUT: %.loc32_42.2: type = value_of_initializer %float.make_type.loc32_42 [template = f64] // CHECK:STDOUT: %.loc32_42.3: type = converted %float.make_type.loc32_42, %.loc32_42.2 [template = f64] -// CHECK:STDOUT: %c.loc32_39.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: f64 = bind_name c, %c.loc32_39.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc32_50.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc32_50: init type = call constants.%Float(%.loc32_50.1) [template = f64] // CHECK:STDOUT: %.loc32_50.2: type = value_of_initializer %float.make_type.loc32_50 [template = f64] // CHECK:STDOUT: %.loc32_50.3: type = converted %float.make_type.loc32_50, %.loc32_50.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %.loc43_32.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc43_32: init type = call constants.%Float(%.loc43_32.1) [template = f64] // CHECK:STDOUT: %.loc43_32.2: type = value_of_initializer %float.make_type.loc43_32 [template = f64] // CHECK:STDOUT: %.loc43_32.3: type = converted %float.make_type.loc43_32, %.loc43_32.2 [template = f64] -// CHECK:STDOUT: %a.loc43_29.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: f64 = bind_name a, %a.loc43_29.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc43_40.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc43_40: init type = call constants.%Float(%.loc43_40.1) [template = f64] // CHECK:STDOUT: %.loc43_40.2: type = value_of_initializer %float.make_type.loc43_40 [template = f64] // CHECK:STDOUT: %.loc43_40.3: type = converted %float.make_type.loc43_40, %.loc43_40.2 [template = f64] -// CHECK:STDOUT: %b.loc43_37.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: f64 = bind_name b, %b.loc43_37.1 -// CHECK:STDOUT: %bool.make_type.loc43: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc43_48.1: type = value_of_initializer %bool.make_type.loc43 [template = bool] -// CHECK:STDOUT: %.loc43_48.2: type = converted %bool.make_type.loc43, %.loc43_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc43_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc43_48.2: type = converted %bool.make_type, %.loc43_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/neq.carbon b/toolchain/check/testdata/builtins/float/neq.carbon index dc787b039f1fa..4326dbb270a44 100644 --- a/toolchain/check/testdata/builtins/float/neq.carbon +++ b/toolchain/check/testdata/builtins/float/neq.carbon @@ -90,46 +90,46 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.neq"; // CHECK:STDOUT: %float.make_type.loc2_11: init type = call constants.%Float(%.loc2_11.1) [template = f64] // CHECK:STDOUT: %.loc2_11.2: type = value_of_initializer %float.make_type.loc2_11 [template = f64] // CHECK:STDOUT: %.loc2_11.3: type = converted %float.make_type.loc2_11, %.loc2_11.2 [template = f64] -// CHECK:STDOUT: %a.loc2_8.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Neq.%a: f64 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_19: init type = call constants.%Float(%.loc2_19.1) [template = f64] // CHECK:STDOUT: %.loc2_19.2: type = value_of_initializer %float.make_type.loc2_19 [template = f64] // CHECK:STDOUT: %.loc2_19.3: type = converted %float.make_type.loc2_19, %.loc2_19.2 [template = f64] -// CHECK:STDOUT: %b.loc2_16.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Neq.%b: f64 = bind_name b, %b.loc2_16.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_27.2: type = converted %bool.make_type.loc2, %.loc2_27.1 [template = bool] -// CHECK:STDOUT: @Neq.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_27.2: type = converted %bool.make_type, %.loc2_27.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc7_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc7_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc7_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc7_19.1 +// CHECK:STDOUT: %True.ref.loc7: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc7: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc12_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc12_19: init type = call constants.%Float(%.loc12_19.1) [template = f64] // CHECK:STDOUT: %.loc12_19.2: type = value_of_initializer %float.make_type.loc12_19 [template = f64] // CHECK:STDOUT: %.loc12_19.3: type = converted %float.make_type.loc12_19, %.loc12_19.2 [template = f64] -// CHECK:STDOUT: %a.loc12_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc12_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc12_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc12_27: init type = call constants.%Float(%.loc12_27.1) [template = f64] // CHECK:STDOUT: %.loc12_27.2: type = value_of_initializer %float.make_type.loc12_27 [template = f64] // CHECK:STDOUT: %.loc12_27.3: type = converted %float.make_type.loc12_27, %.loc12_27.2 [template = f64] -// CHECK:STDOUT: %b.loc12_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc12_24.1 -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type.loc12, %.loc12_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type, %.loc12_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -240,19 +240,19 @@ fn WrongResult(a: f64, b: f64) -> f64 = "float.neq"; // CHECK:STDOUT: %float.make_type.loc7_19: init type = call constants.%Float(%.loc7_19.1) [template = f64] // CHECK:STDOUT: %.loc7_19.2: type = value_of_initializer %float.make_type.loc7_19 [template = f64] // CHECK:STDOUT: %.loc7_19.3: type = converted %float.make_type.loc7_19, %.loc7_19.2 [template = f64] -// CHECK:STDOUT: %a.loc7_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @WrongResult.%a: f64 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc7_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc7_27: init type = call constants.%Float(%.loc7_27.1) [template = f64] // CHECK:STDOUT: %.loc7_27.2: type = value_of_initializer %float.make_type.loc7_27 [template = f64] // CHECK:STDOUT: %.loc7_27.3: type = converted %float.make_type.loc7_27, %.loc7_27.2 [template = f64] -// CHECK:STDOUT: %b.loc7_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @WrongResult.%b: f64 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc7_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc7_35: init type = call constants.%Float(%.loc7_35.1) [template = f64] // CHECK:STDOUT: %.loc7_35.2: type = value_of_initializer %float.make_type.loc7_35 [template = f64] // CHECK:STDOUT: %.loc7_35.3: type = converted %float.make_type.loc7_35, %.loc7_35.2 [template = f64] -// CHECK:STDOUT: @WrongResult.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/float/sub.carbon b/toolchain/check/testdata/builtins/float/sub.carbon index 18bfced36cc3b..0a0d56e109c77 100644 --- a/toolchain/check/testdata/builtins/float/sub.carbon +++ b/toolchain/check/testdata/builtins/float/sub.carbon @@ -94,43 +94,43 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc2_11: init type = call constants.%Float(%.loc2_11.1) [template = f64] // CHECK:STDOUT: %.loc2_11.2: type = value_of_initializer %float.make_type.loc2_11 [template = f64] // CHECK:STDOUT: %.loc2_11.3: type = converted %float.make_type.loc2_11, %.loc2_11.2 [template = f64] -// CHECK:STDOUT: %a.loc2_8.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: f64 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc2_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_19: init type = call constants.%Float(%.loc2_19.1) [template = f64] // CHECK:STDOUT: %.loc2_19.2: type = value_of_initializer %float.make_type.loc2_19 [template = f64] // CHECK:STDOUT: %.loc2_19.3: type = converted %float.make_type.loc2_19, %.loc2_19.2 [template = f64] -// CHECK:STDOUT: %b.loc2_16.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: f64 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc2_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc2_27: init type = call constants.%Float(%.loc2_27.1) [template = f64] // CHECK:STDOUT: %.loc2_27.2: type = value_of_initializer %float.make_type.loc2_27 [template = f64] // CHECK:STDOUT: %.loc2_27.3: type = converted %float.make_type.loc2_27, %.loc2_27.2 [template = f64] -// CHECK:STDOUT: @Sub.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %.loc4_19.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_19: init type = call constants.%Float(%.loc4_19.1) [template = f64] // CHECK:STDOUT: %.loc4_19.2: type = value_of_initializer %float.make_type.loc4_19 [template = f64] // CHECK:STDOUT: %.loc4_19.3: type = converted %float.make_type.loc4_19, %.loc4_19.2 [template = f64] -// CHECK:STDOUT: %a.loc4_16.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: f64 = bind_name a, %a.loc4_16.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc4_27.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_27: init type = call constants.%Float(%.loc4_27.1) [template = f64] // CHECK:STDOUT: %.loc4_27.2: type = value_of_initializer %float.make_type.loc4_27 [template = f64] // CHECK:STDOUT: %.loc4_27.3: type = converted %float.make_type.loc4_27, %.loc4_27.2 [template = f64] -// CHECK:STDOUT: %b.loc4_24.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: f64 = bind_name b, %b.loc4_24.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc4_35.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc4_35: init type = call constants.%Float(%.loc4_35.1) [template = f64] // CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %float.make_type.loc4_35 [template = f64] // CHECK:STDOUT: %.loc4_35.3: type = converted %float.make_type.loc4_35, %.loc4_35.2 [template = f64] -// CHECK:STDOUT: @RuntimeCall.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc8_8.1: i32 = int_literal 64 [template = constants.%.1] -// CHECK:STDOUT: %float.make_type.loc8: init type = call constants.%Float(%.loc8_8.1) [template = f64] -// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type.loc8 [template = f64] -// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type.loc8, %.loc8_8.2 [template = f64] +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc8_8.1) [template = f64] +// CHECK:STDOUT: %.loc8_8.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc8_8.3: type = converted %float.make_type, %.loc8_8.2 [template = f64] // CHECK:STDOUT: %x.var: ref f64 = var x // CHECK:STDOUT: %x: ref f64 = bind_name x, %x.var // CHECK:STDOUT: } @@ -219,131 +219,131 @@ fn RuntimeCallBadReturnType(a: f64, b: f64) -> bool { // CHECK:STDOUT: %float.make_type.loc8_14: init type = call constants.%Float(%.loc8_14.1) [template = f64] // CHECK:STDOUT: %.loc8_14.2: type = value_of_initializer %float.make_type.loc8_14 [template = f64] // CHECK:STDOUT: %.loc8_14.3: type = converted %float.make_type.loc8_14, %.loc8_14.2 [template = f64] -// CHECK:STDOUT: %a.loc8_11.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: f64 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc8_22.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc8_22: init type = call constants.%Float(%.loc8_22.1) [template = f64] // CHECK:STDOUT: %.loc8_22.2: type = value_of_initializer %float.make_type.loc8_22 [template = f64] // CHECK:STDOUT: %.loc8_22.3: type = converted %float.make_type.loc8_22, %.loc8_22.2 [template = f64] -// CHECK:STDOUT: @TooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %.loc13_15.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_15: init type = call constants.%Float(%.loc13_15.1) [template = f64] // CHECK:STDOUT: %.loc13_15.2: type = value_of_initializer %float.make_type.loc13_15 [template = f64] // CHECK:STDOUT: %.loc13_15.3: type = converted %float.make_type.loc13_15, %.loc13_15.2 [template = f64] -// CHECK:STDOUT: %a.loc13_12.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: f64 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc13_23.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_23: init type = call constants.%Float(%.loc13_23.1) [template = f64] // CHECK:STDOUT: %.loc13_23.2: type = value_of_initializer %float.make_type.loc13_23 [template = f64] // CHECK:STDOUT: %.loc13_23.3: type = converted %float.make_type.loc13_23, %.loc13_23.2 [template = f64] -// CHECK:STDOUT: %b.loc13_20.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: f64 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc13_31.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_31: init type = call constants.%Float(%.loc13_31.1) [template = f64] // CHECK:STDOUT: %.loc13_31.2: type = value_of_initializer %float.make_type.loc13_31 [template = f64] // CHECK:STDOUT: %.loc13_31.3: type = converted %float.make_type.loc13_31, %.loc13_31.2 [template = f64] -// CHECK:STDOUT: %c.loc13_28.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: f64 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc13_39.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc13_39: init type = call constants.%Float(%.loc13_39.1) [template = f64] // CHECK:STDOUT: %.loc13_39.2: type = value_of_initializer %float.make_type.loc13_39 [template = f64] // CHECK:STDOUT: %.loc13_39.3: type = converted %float.make_type.loc13_39, %.loc13_39.2 [template = f64] -// CHECK:STDOUT: @TooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %.loc17_21.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_21: init type = call constants.%Float(%.loc17_21.1) [template = f64] // CHECK:STDOUT: %.loc17_21.2: type = value_of_initializer %float.make_type.loc17_21 [template = f64] // CHECK:STDOUT: %.loc17_21.3: type = converted %float.make_type.loc17_21, %.loc17_21.2 [template = f64] -// CHECK:STDOUT: %a.loc17_18.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: f64 = bind_name a, %a.loc17_18.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc17_29.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc17_29: init type = call constants.%Float(%.loc17_29.1) [template = f64] // CHECK:STDOUT: %.loc17_29.2: type = value_of_initializer %float.make_type.loc17_29 [template = f64] // CHECK:STDOUT: %.loc17_29.3: type = converted %float.make_type.loc17_29, %.loc17_29.2 [template = f64] -// CHECK:STDOUT: %b.loc17_26.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: f64 = bind_name b, %b.loc17_26.1 -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type.loc17, %.loc17_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_37.2: type = converted %bool.make_type, %.loc17_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %.loc18_17.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_17: init type = call constants.%Float(%.loc18_17.1) [template = f64] // CHECK:STDOUT: %.loc18_17.2: type = value_of_initializer %float.make_type.loc18_17 [template = f64] // CHECK:STDOUT: %.loc18_17.3: type = converted %float.make_type.loc18_17, %.loc18_17.2 [template = f64] -// CHECK:STDOUT: %a.loc18_14.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: f64 = bind_name a, %a.loc18_14.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc18_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_25: init type = call constants.%Float(%.loc18_25.1) [template = f64] // CHECK:STDOUT: %.loc18_25.2: type = value_of_initializer %float.make_type.loc18_25 [template = f64] // CHECK:STDOUT: %.loc18_25.3: type = converted %float.make_type.loc18_25, %.loc18_25.2 [template = f64] -// CHECK:STDOUT: %b.loc18_22.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: f64 = bind_name b, %b.loc18_22.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc18_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc18_33: init type = call constants.%Float(%.loc18_33.1) [template = f64] // CHECK:STDOUT: %.loc18_33.2: type = value_of_initializer %float.make_type.loc18_33 [template = f64] // CHECK:STDOUT: %.loc18_33.3: type = converted %float.make_type.loc18_33, %.loc18_33.2 [template = f64] -// CHECK:STDOUT: @JustRight.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooFew.decl: %RuntimeCallTooFew.type = fn_decl @RuntimeCallTooFew [template = constants.%RuntimeCallTooFew] { // CHECK:STDOUT: %.loc20_25.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_25: init type = call constants.%Float(%.loc20_25.1) [template = f64] // CHECK:STDOUT: %.loc20_25.2: type = value_of_initializer %float.make_type.loc20_25 [template = f64] // CHECK:STDOUT: %.loc20_25.3: type = converted %float.make_type.loc20_25, %.loc20_25.2 [template = f64] -// CHECK:STDOUT: %a.loc20_22.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: f64 = bind_name a, %a.loc20_22.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc20_33.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc20_33: init type = call constants.%Float(%.loc20_33.1) [template = f64] // CHECK:STDOUT: %.loc20_33.2: type = value_of_initializer %float.make_type.loc20_33 [template = f64] // CHECK:STDOUT: %.loc20_33.3: type = converted %float.make_type.loc20_33, %.loc20_33.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %.loc24_26.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_26: init type = call constants.%Float(%.loc24_26.1) [template = f64] // CHECK:STDOUT: %.loc24_26.2: type = value_of_initializer %float.make_type.loc24_26 [template = f64] // CHECK:STDOUT: %.loc24_26.3: type = converted %float.make_type.loc24_26, %.loc24_26.2 [template = f64] -// CHECK:STDOUT: %a.loc24_23.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: f64 = bind_name a, %a.loc24_23.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc24_34.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_34: init type = call constants.%Float(%.loc24_34.1) [template = f64] // CHECK:STDOUT: %.loc24_34.2: type = value_of_initializer %float.make_type.loc24_34 [template = f64] // CHECK:STDOUT: %.loc24_34.3: type = converted %float.make_type.loc24_34, %.loc24_34.2 [template = f64] -// CHECK:STDOUT: %b.loc24_31.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: f64 = bind_name b, %b.loc24_31.1 +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param // CHECK:STDOUT: %.loc24_42.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_42: init type = call constants.%Float(%.loc24_42.1) [template = f64] // CHECK:STDOUT: %.loc24_42.2: type = value_of_initializer %float.make_type.loc24_42 [template = f64] // CHECK:STDOUT: %.loc24_42.3: type = converted %float.make_type.loc24_42, %.loc24_42.2 [template = f64] -// CHECK:STDOUT: %c.loc24_39.1: f64 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: f64 = bind_name c, %c.loc24_39.1 +// CHECK:STDOUT: %c.param: f64 = param c, runtime_param2 +// CHECK:STDOUT: %c: f64 = bind_name c, %c.param // CHECK:STDOUT: %.loc24_50.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc24_50: init type = call constants.%Float(%.loc24_50.1) [template = f64] // CHECK:STDOUT: %.loc24_50.2: type = value_of_initializer %float.make_type.loc24_50 [template = f64] // CHECK:STDOUT: %.loc24_50.3: type = converted %float.make_type.loc24_50, %.loc24_50.2 [template = f64] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %.loc28_32.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_32: init type = call constants.%Float(%.loc28_32.1) [template = f64] // CHECK:STDOUT: %.loc28_32.2: type = value_of_initializer %float.make_type.loc28_32 [template = f64] // CHECK:STDOUT: %.loc28_32.3: type = converted %float.make_type.loc28_32, %.loc28_32.2 [template = f64] -// CHECK:STDOUT: %a.loc28_29.1: f64 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: f64 = bind_name a, %a.loc28_29.1 +// CHECK:STDOUT: %a.param: f64 = param a, runtime_param0 +// CHECK:STDOUT: %a: f64 = bind_name a, %a.param // CHECK:STDOUT: %.loc28_40.1: i32 = int_literal 64 [template = constants.%.1] // CHECK:STDOUT: %float.make_type.loc28_40: init type = call constants.%Float(%.loc28_40.1) [template = f64] // CHECK:STDOUT: %.loc28_40.2: type = value_of_initializer %float.make_type.loc28_40 [template = f64] // CHECK:STDOUT: %.loc28_40.3: type = converted %float.make_type.loc28_40, %.loc28_40.2 [template = f64] -// CHECK:STDOUT: %b.loc28_37.1: f64 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: f64 = bind_name b, %b.loc28_37.1 -// CHECK:STDOUT: %bool.make_type.loc28: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type.loc28 [template = bool] -// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type.loc28, %.loc28_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: f64 = param b, runtime_param1 +// CHECK:STDOUT: %b: f64 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc28_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc28_48.2: type = converted %bool.make_type, %.loc28_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/and.carbon b/toolchain/check/testdata/builtins/int/and.carbon index 1560cf330164b..70fba141c35f4 100644 --- a/toolchain/check/testdata/builtins/int/and.carbon +++ b/toolchain/check/testdata/builtins/int/and.carbon @@ -64,17 +64,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @And.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @And.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @And.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %And.ref: %And.type = name_ref And, %And.decl [template = constants.%And] @@ -96,17 +96,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/complement.carbon b/toolchain/check/testdata/builtins/int/complement.carbon index f8ba805057ec4..d454a38df06d5 100644 --- a/toolchain/check/testdata/builtins/int/complement.carbon +++ b/toolchain/check/testdata/builtins/int/complement.carbon @@ -69,28 +69,28 @@ fn RuntimeCall(a: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc2_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_18.1: type = value_of_initializer %int.make_type_32.loc2_18 [template = i32] // CHECK:STDOUT: %.loc2_18.2: type = converted %int.make_type_32.loc2_18, %.loc2_18.1 [template = i32] -// CHECK:STDOUT: %a.loc2_15.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Complement.%a: i32 = bind_name a, %a.loc2_15.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %int.make_type_32.loc2_26 [template = i32] // CHECK:STDOUT: %.loc2_26.2: type = converted %int.make_type_32.loc2_26, %.loc2_26.1 [template = i32] -// CHECK:STDOUT: @Complement.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %And.decl: %And.type = fn_decl @And [template = constants.%And] { // CHECK:STDOUT: %int.make_type_32.loc3_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_11.1: type = value_of_initializer %int.make_type_32.loc3_11 [template = i32] // CHECK:STDOUT: %.loc3_11.2: type = converted %int.make_type_32.loc3_11, %.loc3_11.1 [template = i32] -// CHECK:STDOUT: %a.loc3_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @And.%a: i32 = bind_name a, %a.loc3_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc3_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_19.1: type = value_of_initializer %int.make_type_32.loc3_19 [template = i32] // CHECK:STDOUT: %.loc3_19.2: type = converted %int.make_type_32.loc3_19, %.loc3_19.1 [template = i32] -// CHECK:STDOUT: %b.loc3_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @And.%b: i32 = bind_name b, %b.loc3_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc3_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_27.1: type = value_of_initializer %int.make_type_32.loc3_27 [template = i32] // CHECK:STDOUT: %.loc3_27.2: type = converted %int.make_type_32.loc3_27, %.loc3_27.1 [template = i32] -// CHECK:STDOUT: @And.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc5: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %And.ref: %And.type = name_ref And, %And.decl [template = constants.%And] @@ -116,12 +116,12 @@ fn RuntimeCall(a: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc8_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_19.1: type = value_of_initializer %int.make_type_32.loc8_19 [template = i32] // CHECK:STDOUT: %.loc8_19.2: type = converted %int.make_type_32.loc8_19, %.loc8_19.1 [template = i32] -// CHECK:STDOUT: %a.loc8_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc8_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc8_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_27.1: type = value_of_initializer %int.make_type_32.loc8_27 [template = i32] // CHECK:STDOUT: %.loc8_27.2: type = converted %int.make_type_32.loc8_27, %.loc8_27.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/eq.carbon b/toolchain/check/testdata/builtins/int/eq.carbon index 617100b3b910a..0870d9f0529b6 100644 --- a/toolchain/check/testdata/builtins/int/eq.carbon +++ b/toolchain/check/testdata/builtins/int/eq.carbon @@ -88,43 +88,43 @@ fn WrongResult(a: i32, b: i32) -> i32 = "int.eq"; // CHECK:STDOUT: %int.make_type_32.loc2_10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_10.1: type = value_of_initializer %int.make_type_32.loc2_10 [template = i32] // CHECK:STDOUT: %.loc2_10.2: type = converted %int.make_type_32.loc2_10, %.loc2_10.1 [template = i32] -// CHECK:STDOUT: %a.loc2_7.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Eq.%a: i32 = bind_name a, %a.loc2_7.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_18.1: type = value_of_initializer %int.make_type_32.loc2_18 [template = i32] // CHECK:STDOUT: %.loc2_18.2: type = converted %int.make_type_32.loc2_18, %.loc2_18.1 [template = i32] -// CHECK:STDOUT: %b.loc2_15.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Eq.%b: i32 = bind_name b, %b.loc2_15.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_26.2: type = converted %bool.make_type.loc2, %.loc2_26.1 [template = bool] -// CHECK:STDOUT: @Eq.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_26.2: type = converted %bool.make_type, %.loc2_26.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc7_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc7_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc7_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc7_19.1 +// CHECK:STDOUT: %True.ref.loc7: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc7: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc12_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_19.1: type = value_of_initializer %int.make_type_32.loc12_19 [template = i32] // CHECK:STDOUT: %.loc12_19.2: type = converted %int.make_type_32.loc12_19, %.loc12_19.1 [template = i32] -// CHECK:STDOUT: %a.loc12_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc12_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc12_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_27.1: type = value_of_initializer %int.make_type_32.loc12_27 [template = i32] // CHECK:STDOUT: %.loc12_27.2: type = converted %int.make_type_32.loc12_27, %.loc12_27.1 [template = i32] -// CHECK:STDOUT: %b.loc12_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc12_24.1 -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type.loc12, %.loc12_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type, %.loc12_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -233,17 +233,17 @@ fn WrongResult(a: i32, b: i32) -> i32 = "int.eq"; // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @WrongResult.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @WrongResult.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @WrongResult.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/greater.carbon b/toolchain/check/testdata/builtins/int/greater.carbon index f5cf1c6df2995..2c228b8d34508 100644 --- a/toolchain/check/testdata/builtins/int/greater.carbon +++ b/toolchain/check/testdata/builtins/int/greater.carbon @@ -88,54 +88,54 @@ fn RuntimeCall(a: i32, b: i32) -> bool { // CHECK:STDOUT: %int.make_type_32.loc2_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_15.1: type = value_of_initializer %int.make_type_32.loc2_15 [template = i32] // CHECK:STDOUT: %.loc2_15.2: type = converted %int.make_type_32.loc2_15, %.loc2_15.1 [template = i32] -// CHECK:STDOUT: %a.loc2_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Greater.%a: i32 = bind_name a, %a.loc2_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_23.1: type = value_of_initializer %int.make_type_32.loc2_23 [template = i32] // CHECK:STDOUT: %.loc2_23.2: type = converted %int.make_type_32.loc2_23, %.loc2_23.1 [template = i32] -// CHECK:STDOUT: %b.loc2_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Greater.%b: i32 = bind_name b, %b.loc2_20.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_31.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_31.2: type = converted %bool.make_type.loc2, %.loc2_31.1 [template = bool] -// CHECK:STDOUT: @Greater.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_31.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_31.2: type = converted %bool.make_type, %.loc2_31.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc3_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_14.1: type = value_of_initializer %int.make_type_32.loc3_14 [template = i32] // CHECK:STDOUT: %.loc3_14.2: type = converted %int.make_type_32.loc3_14, %.loc3_14.1 [template = i32] -// CHECK:STDOUT: %a.loc3_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc3_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_22.1: type = value_of_initializer %int.make_type_32.loc3_22 [template = i32] // CHECK:STDOUT: %.loc3_22.2: type = converted %int.make_type_32.loc3_22, %.loc3_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc16_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_19.1: type = value_of_initializer %int.make_type_32.loc16_19 [template = i32] // CHECK:STDOUT: %.loc16_19.2: type = converted %int.make_type_32.loc16_19, %.loc16_19.1 [template = i32] -// CHECK:STDOUT: %a.loc16_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc16_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_27.1: type = value_of_initializer %int.make_type_32.loc16_27 [template = i32] // CHECK:STDOUT: %.loc16_27.2: type = converted %int.make_type_32.loc16_27, %.loc16_27.1 [template = i32] -// CHECK:STDOUT: %b.loc16_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/greater_eq.carbon b/toolchain/check/testdata/builtins/int/greater_eq.carbon index b266c0a3a074f..68b9d5649182c 100644 --- a/toolchain/check/testdata/builtins/int/greater_eq.carbon +++ b/toolchain/check/testdata/builtins/int/greater_eq.carbon @@ -88,54 +88,54 @@ fn RuntimeCall(a: i32, b: i32) -> bool { // CHECK:STDOUT: %int.make_type_32.loc2_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_17.1: type = value_of_initializer %int.make_type_32.loc2_17 [template = i32] // CHECK:STDOUT: %.loc2_17.2: type = converted %int.make_type_32.loc2_17, %.loc2_17.1 [template = i32] -// CHECK:STDOUT: %a.loc2_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @GreaterEq.%a: i32 = bind_name a, %a.loc2_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_25.1: type = value_of_initializer %int.make_type_32.loc2_25 [template = i32] // CHECK:STDOUT: %.loc2_25.2: type = converted %int.make_type_32.loc2_25, %.loc2_25.1 [template = i32] -// CHECK:STDOUT: %b.loc2_22.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @GreaterEq.%b: i32 = bind_name b, %b.loc2_22.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_33.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_33.2: type = converted %bool.make_type.loc2, %.loc2_33.1 [template = bool] -// CHECK:STDOUT: @GreaterEq.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_33.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_33.2: type = converted %bool.make_type, %.loc2_33.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc3_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_14.1: type = value_of_initializer %int.make_type_32.loc3_14 [template = i32] // CHECK:STDOUT: %.loc3_14.2: type = converted %int.make_type_32.loc3_14, %.loc3_14.1 [template = i32] -// CHECK:STDOUT: %a.loc3_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc3_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_22.1: type = value_of_initializer %int.make_type_32.loc3_22 [template = i32] // CHECK:STDOUT: %.loc3_22.2: type = converted %int.make_type_32.loc3_22, %.loc3_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc16_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_19.1: type = value_of_initializer %int.make_type_32.loc16_19 [template = i32] // CHECK:STDOUT: %.loc16_19.2: type = converted %int.make_type_32.loc16_19, %.loc16_19.1 [template = i32] -// CHECK:STDOUT: %a.loc16_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc16_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_27.1: type = value_of_initializer %int.make_type_32.loc16_27 [template = i32] // CHECK:STDOUT: %.loc16_27.2: type = converted %int.make_type_32.loc16_27, %.loc16_27.1 [template = i32] -// CHECK:STDOUT: %b.loc16_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/left_shift.carbon b/toolchain/check/testdata/builtins/int/left_shift.carbon index d64afa18b016f..f9a065e8864c7 100644 --- a/toolchain/check/testdata/builtins/int/left_shift.carbon +++ b/toolchain/check/testdata/builtins/int/left_shift.carbon @@ -108,17 +108,17 @@ let negative: i32 = LeftShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc2_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_17.1: type = value_of_initializer %int.make_type_32.loc2_17 [template = i32] // CHECK:STDOUT: %.loc2_17.2: type = converted %int.make_type_32.loc2_17, %.loc2_17.1 [template = i32] -// CHECK:STDOUT: %a.loc2_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @LeftShift.%a: i32 = bind_name a, %a.loc2_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_25.1: type = value_of_initializer %int.make_type_32.loc2_25 [template = i32] // CHECK:STDOUT: %.loc2_25.2: type = converted %int.make_type_32.loc2_25, %.loc2_25.1 [template = i32] -// CHECK:STDOUT: %b.loc2_22.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @LeftShift.%b: i32 = bind_name b, %b.loc2_22.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_33.1: type = value_of_initializer %int.make_type_32.loc2_33 [template = i32] // CHECK:STDOUT: %.loc2_33.2: type = converted %int.make_type_32.loc2_33, %.loc2_33.1 [template = i32] -// CHECK:STDOUT: @LeftShift.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %LeftShift.ref: %LeftShift.type = name_ref LeftShift, %LeftShift.decl [template = constants.%LeftShift] @@ -140,17 +140,17 @@ let negative: i32 = LeftShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -231,28 +231,28 @@ let negative: i32 = LeftShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc4_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_17.1: type = value_of_initializer %int.make_type_32.loc4_17 [template = i32] // CHECK:STDOUT: %.loc4_17.2: type = converted %int.make_type_32.loc4_17, %.loc4_17.1 [template = i32] -// CHECK:STDOUT: %a.loc4_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @LeftShift.%a: i32 = bind_name a, %a.loc4_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_25.1: type = value_of_initializer %int.make_type_32.loc4_25 [template = i32] // CHECK:STDOUT: %.loc4_25.2: type = converted %int.make_type_32.loc4_25, %.loc4_25.1 [template = i32] -// CHECK:STDOUT: %b.loc4_22.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @LeftShift.%b: i32 = bind_name b, %b.loc4_22.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_33.1: type = value_of_initializer %int.make_type_32.loc4_33 [template = i32] // CHECK:STDOUT: %.loc4_33.2: type = converted %int.make_type_32.loc4_33, %.loc4_33.1 [template = i32] -// CHECK:STDOUT: @LeftShift.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc5_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_14.1: type = value_of_initializer %int.make_type_32.loc5_14 [template = i32] // CHECK:STDOUT: %.loc5_14.2: type = converted %int.make_type_32.loc5_14, %.loc5_14.1 [template = i32] -// CHECK:STDOUT: %a.loc5_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc5_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_22.1: type = value_of_initializer %int.make_type_32.loc5_22 [template = i32] // CHECK:STDOUT: %.loc5_22.2: type = converted %int.make_type_32.loc5_22, %.loc5_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_13.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/less.carbon b/toolchain/check/testdata/builtins/int/less.carbon index 729c6402c7ff9..7caa9ac2962da 100644 --- a/toolchain/check/testdata/builtins/int/less.carbon +++ b/toolchain/check/testdata/builtins/int/less.carbon @@ -88,54 +88,54 @@ fn RuntimeCall(a: i32, b: i32) -> bool { // CHECK:STDOUT: %int.make_type_32.loc2_12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_12.1: type = value_of_initializer %int.make_type_32.loc2_12 [template = i32] // CHECK:STDOUT: %.loc2_12.2: type = converted %int.make_type_32.loc2_12, %.loc2_12.1 [template = i32] -// CHECK:STDOUT: %a.loc2_9.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Less.%a: i32 = bind_name a, %a.loc2_9.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_20: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_20.1: type = value_of_initializer %int.make_type_32.loc2_20 [template = i32] // CHECK:STDOUT: %.loc2_20.2: type = converted %int.make_type_32.loc2_20, %.loc2_20.1 [template = i32] -// CHECK:STDOUT: %b.loc2_17.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Less.%b: i32 = bind_name b, %b.loc2_17.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_28.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_28.2: type = converted %bool.make_type.loc2, %.loc2_28.1 [template = bool] -// CHECK:STDOUT: @Less.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_28.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_28.2: type = converted %bool.make_type, %.loc2_28.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc3_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_14.1: type = value_of_initializer %int.make_type_32.loc3_14 [template = i32] // CHECK:STDOUT: %.loc3_14.2: type = converted %int.make_type_32.loc3_14, %.loc3_14.1 [template = i32] -// CHECK:STDOUT: %a.loc3_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc3_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_22.1: type = value_of_initializer %int.make_type_32.loc3_22 [template = i32] // CHECK:STDOUT: %.loc3_22.2: type = converted %int.make_type_32.loc3_22, %.loc3_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc16_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_19.1: type = value_of_initializer %int.make_type_32.loc16_19 [template = i32] // CHECK:STDOUT: %.loc16_19.2: type = converted %int.make_type_32.loc16_19, %.loc16_19.1 [template = i32] -// CHECK:STDOUT: %a.loc16_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc16_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_27.1: type = value_of_initializer %int.make_type_32.loc16_27 [template = i32] // CHECK:STDOUT: %.loc16_27.2: type = converted %int.make_type_32.loc16_27, %.loc16_27.1 [template = i32] -// CHECK:STDOUT: %b.loc16_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/less_eq.carbon b/toolchain/check/testdata/builtins/int/less_eq.carbon index 0f543b38db8d7..0f3c1ca2e32d5 100644 --- a/toolchain/check/testdata/builtins/int/less_eq.carbon +++ b/toolchain/check/testdata/builtins/int/less_eq.carbon @@ -88,54 +88,54 @@ fn RuntimeCall(a: i32, b: i32) -> bool { // CHECK:STDOUT: %int.make_type_32.loc2_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_14.1: type = value_of_initializer %int.make_type_32.loc2_14 [template = i32] // CHECK:STDOUT: %.loc2_14.2: type = converted %int.make_type_32.loc2_14, %.loc2_14.1 [template = i32] -// CHECK:STDOUT: %a.loc2_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @LessEq.%a: i32 = bind_name a, %a.loc2_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_22.1: type = value_of_initializer %int.make_type_32.loc2_22 [template = i32] // CHECK:STDOUT: %.loc2_22.2: type = converted %int.make_type_32.loc2_22, %.loc2_22.1 [template = i32] -// CHECK:STDOUT: %b.loc2_19.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @LessEq.%b: i32 = bind_name b, %b.loc2_19.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_30.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_30.2: type = converted %bool.make_type.loc2, %.loc2_30.1 [template = bool] -// CHECK:STDOUT: @LessEq.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_30.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_30.2: type = converted %bool.make_type, %.loc2_30.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc3_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_14.1: type = value_of_initializer %int.make_type_32.loc3_14 [template = i32] // CHECK:STDOUT: %.loc3_14.2: type = converted %int.make_type_32.loc3_14, %.loc3_14.1 [template = i32] -// CHECK:STDOUT: %a.loc3_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc3_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc3_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc3_22.1: type = value_of_initializer %int.make_type_32.loc3_22 [template = i32] // CHECK:STDOUT: %.loc3_22.2: type = converted %int.make_type_32.loc3_22, %.loc3_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc8_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc8_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc8_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc8_19.1 +// CHECK:STDOUT: %True.ref.loc8: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc8: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc16_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_19.1: type = value_of_initializer %int.make_type_32.loc16_19 [template = i32] // CHECK:STDOUT: %.loc16_19.2: type = converted %int.make_type_32.loc16_19, %.loc16_19.1 [template = i32] -// CHECK:STDOUT: %a.loc16_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc16_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc16_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_27.1: type = value_of_initializer %int.make_type_32.loc16_27 [template = i32] // CHECK:STDOUT: %.loc16_27.2: type = converted %int.make_type_32.loc16_27, %.loc16_27.1 [template = i32] -// CHECK:STDOUT: %b.loc16_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc16_24.1 -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type.loc16, %.loc16_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_35.2: type = converted %bool.make_type, %.loc16_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/make_type_32.carbon b/toolchain/check/testdata/builtins/int/make_type_32.carbon index 4e922765b1a88..3dd6997c169a4 100644 --- a/toolchain/check/testdata/builtins/int/make_type_32.carbon +++ b/toolchain/check/testdata/builtins/int/make_type_32.carbon @@ -50,7 +50,7 @@ var i: Int() = 0; // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Int.decl: %Int.type = fn_decl @Int [template = constants.%Int] { -// CHECK:STDOUT: @Int.%return: ref type = var +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/make_type_signed.carbon b/toolchain/check/testdata/builtins/int/make_type_signed.carbon index 10f63efd2729f..3313d3a769b79 100644 --- a/toolchain/check/testdata/builtins/int/make_type_signed.carbon +++ b/toolchain/check/testdata/builtins/int/make_type_signed.carbon @@ -104,9 +104,9 @@ var m: Int(1000000000); // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %n.loc4_8.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Int.%n: i32 = bind_name n, %n.loc4_8.1 -// CHECK:STDOUT: @Int.%return: ref type = var +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -168,14 +168,14 @@ var m: Int(1000000000); // CHECK:STDOUT: %int.make_type_signed.loc6_12: init type = call %Int.ref.loc6_9(%.loc6_13) [template = constants.%.3] // CHECK:STDOUT: %.loc6_15.1: type = value_of_initializer %int.make_type_signed.loc6_12 [template = constants.%.3] // CHECK:STDOUT: %.loc6_15.2: type = converted %int.make_type_signed.loc6_12, %.loc6_15.1 [template = constants.%.3] -// CHECK:STDOUT: %n.loc6_6.1: %.3 = param n, runtime_param0 -// CHECK:STDOUT: @F.%n: %.3 = bind_name n, %n.loc6_6.1 +// CHECK:STDOUT: %n.param: %.3 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.3 = bind_name n, %n.param // CHECK:STDOUT: %Int.ref.loc6_21: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] // CHECK:STDOUT: %.loc6_25: i32 = int_literal 64 [template = constants.%.2] // CHECK:STDOUT: %int.make_type_signed.loc6_24: init type = call %Int.ref.loc6_21(%.loc6_25) [template = constants.%.3] // CHECK:STDOUT: %.loc6_27.1: type = value_of_initializer %int.make_type_signed.loc6_24 [template = constants.%.3] // CHECK:STDOUT: %.loc6_27.2: type = converted %int.make_type_signed.loc6_24, %.loc6_27.1 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Int.ref.loc10_9: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] @@ -183,34 +183,34 @@ var m: Int(1000000000); // CHECK:STDOUT: %int.make_type_signed.loc10_12: init type = call %Int.ref.loc10_9(%.loc10_13) [template = constants.%.5] // CHECK:STDOUT: %.loc10_15.1: type = value_of_initializer %int.make_type_signed.loc10_12 [template = constants.%.5] // CHECK:STDOUT: %.loc10_15.2: type = converted %int.make_type_signed.loc10_12, %.loc10_15.1 [template = constants.%.5] -// CHECK:STDOUT: %n.loc10_6.1: %.5 = param n, runtime_param0 -// CHECK:STDOUT: @G.%n: %.5 = bind_name n, %n.loc10_6.1 +// CHECK:STDOUT: %n.param: %.5 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.5 = bind_name n, %n.param // CHECK:STDOUT: %Int.ref.loc10_21: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] // CHECK:STDOUT: %.loc10_25: i32 = int_literal 13 [template = constants.%.4] // CHECK:STDOUT: %int.make_type_signed.loc10_24: init type = call %Int.ref.loc10_21(%.loc10_25) [template = constants.%.5] // CHECK:STDOUT: %.loc10_27.1: type = value_of_initializer %int.make_type_signed.loc10_24 [template = constants.%.5] // CHECK:STDOUT: %.loc10_27.2: type = converted %int.make_type_signed.loc10_24, %.loc10_27.1 [template = constants.%.5] -// CHECK:STDOUT: @G.%return: ref %.5 = var +// CHECK:STDOUT: %return: ref %.5 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Symbolic.decl: %Symbolic.type = fn_decl @Symbolic [template = constants.%Symbolic] { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_17.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc14_17.2: type = converted %int.make_type_32, %.loc14_17.1 [template = i32] -// CHECK:STDOUT: %N.loc14_13.1: i32 = param N, runtime_param -// CHECK:STDOUT: @Symbolic.%N.loc14: i32 = bind_symbolic_name N 0, %N.loc14_13.1 [symbolic = @Symbolic.%N.1 (constants.%N)] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc14: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: %Int.ref.loc14_25: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] -// CHECK:STDOUT: %N.ref.loc14_29: i32 = name_ref N, @Symbolic.%N.loc14 [symbolic = @Symbolic.%N.1 (constants.%N)] -// CHECK:STDOUT: %int.make_type_signed.loc14_28: init type = call %Int.ref.loc14_25(%N.ref.loc14_29) [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_30.1: type = value_of_initializer %int.make_type_signed.loc14_28 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_30.2: type = converted %int.make_type_signed.loc14_28, %.loc14_30.1 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %x.loc14_22.1: @Symbolic.%.1 (%.6) = param x, runtime_param0 -// CHECK:STDOUT: @Symbolic.%x: @Symbolic.%.1 (%.6) = bind_name x, %x.loc14_22.1 +// CHECK:STDOUT: %N.ref.loc14_29: i32 = name_ref N, %N.loc14 [symbolic = %N.1 (constants.%N)] +// CHECK:STDOUT: %int.make_type_signed.loc14_28: init type = call %Int.ref.loc14_25(%N.ref.loc14_29) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_30.1: type = value_of_initializer %int.make_type_signed.loc14_28 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_30.2: type = converted %int.make_type_signed.loc14_28, %.loc14_30.1 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %x.param: @Symbolic.%.1 (%.6) = param x, runtime_param0 +// CHECK:STDOUT: %x: @Symbolic.%.1 (%.6) = bind_name x, %x.param // CHECK:STDOUT: %Int.ref.loc14_36: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] -// CHECK:STDOUT: %N.ref.loc14_40: i32 = name_ref N, @Symbolic.%N.loc14 [symbolic = @Symbolic.%N.1 (constants.%N)] -// CHECK:STDOUT: %int.make_type_signed.loc14_39: init type = call %Int.ref.loc14_36(%N.ref.loc14_40) [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_41.1: type = value_of_initializer %int.make_type_signed.loc14_39 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_41.2: type = converted %int.make_type_signed.loc14_39, %.loc14_41.1 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: @Symbolic.%return: ref @Symbolic.%.1 (%.6) = var +// CHECK:STDOUT: %N.ref.loc14_40: i32 = name_ref N, %N.loc14 [symbolic = %N.1 (constants.%N)] +// CHECK:STDOUT: %int.make_type_signed.loc14_39: init type = call %Int.ref.loc14_36(%N.ref.loc14_40) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_41.1: type = value_of_initializer %int.make_type_signed.loc14_39 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_41.2: type = converted %int.make_type_signed.loc14_39, %.loc14_41.1 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %return: ref @Symbolic.%.1 (%.6) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -325,7 +325,7 @@ var m: Int(1000000000); // CHECK:STDOUT: .Int = imports.%import_ref.1 // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Negate = %Negate.decl -// CHECK:STDOUT: .n = %n.loc12 +// CHECK:STDOUT: .n = %n // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import @@ -333,12 +333,12 @@ var m: Int(1000000000); // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %n.loc6_11.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Negate.%n: i32 = bind_name n, %n.loc6_11.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Int.ref: %Int.type = name_ref Int, imports.%import_ref.1 [template = constants.%Int] // CHECK:STDOUT: %Negate.ref: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] @@ -350,7 +350,7 @@ var m: Int(1000000000); // CHECK:STDOUT: %.loc12_21.1: type = value_of_initializer %int.make_type_signed [template = ] // CHECK:STDOUT: %.loc12_21.2: type = converted %int.make_type_signed, %.loc12_21.1 [template = ] // CHECK:STDOUT: %n.var: ref = var n -// CHECK:STDOUT: %n.loc12: ref = bind_name n, %n.var +// CHECK:STDOUT: %n: ref = bind_name n, %n.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; diff --git a/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon b/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon index c25127819dfb6..486528c66387c 100644 --- a/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon +++ b/toolchain/check/testdata/builtins/int/make_type_unsigned.carbon @@ -104,9 +104,9 @@ var m: UInt(1000000000); // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_12.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc4_12.2: type = converted %int.make_type_32, %.loc4_12.1 [template = i32] -// CHECK:STDOUT: %n.loc4_9.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @UInt.%n: i32 = bind_name n, %n.loc4_9.1 -// CHECK:STDOUT: @UInt.%return: ref type = var +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -168,14 +168,14 @@ var m: UInt(1000000000); // CHECK:STDOUT: %int.make_type_unsigned.loc6_13: init type = call %UInt.ref.loc6_9(%.loc6_14) [template = constants.%.3] // CHECK:STDOUT: %.loc6_16.1: type = value_of_initializer %int.make_type_unsigned.loc6_13 [template = constants.%.3] // CHECK:STDOUT: %.loc6_16.2: type = converted %int.make_type_unsigned.loc6_13, %.loc6_16.1 [template = constants.%.3] -// CHECK:STDOUT: %n.loc6_6.1: %.3 = param n, runtime_param0 -// CHECK:STDOUT: @F.%n: %.3 = bind_name n, %n.loc6_6.1 +// CHECK:STDOUT: %n.param: %.3 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.3 = bind_name n, %n.param // CHECK:STDOUT: %UInt.ref.loc6_22: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] // CHECK:STDOUT: %.loc6_27: i32 = int_literal 64 [template = constants.%.2] // CHECK:STDOUT: %int.make_type_unsigned.loc6_26: init type = call %UInt.ref.loc6_22(%.loc6_27) [template = constants.%.3] // CHECK:STDOUT: %.loc6_29.1: type = value_of_initializer %int.make_type_unsigned.loc6_26 [template = constants.%.3] // CHECK:STDOUT: %.loc6_29.2: type = converted %int.make_type_unsigned.loc6_26, %.loc6_29.1 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %UInt.ref.loc10_9: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] @@ -183,34 +183,34 @@ var m: UInt(1000000000); // CHECK:STDOUT: %int.make_type_unsigned.loc10_13: init type = call %UInt.ref.loc10_9(%.loc10_14) [template = constants.%.5] // CHECK:STDOUT: %.loc10_16.1: type = value_of_initializer %int.make_type_unsigned.loc10_13 [template = constants.%.5] // CHECK:STDOUT: %.loc10_16.2: type = converted %int.make_type_unsigned.loc10_13, %.loc10_16.1 [template = constants.%.5] -// CHECK:STDOUT: %n.loc10_6.1: %.5 = param n, runtime_param0 -// CHECK:STDOUT: @G.%n: %.5 = bind_name n, %n.loc10_6.1 +// CHECK:STDOUT: %n.param: %.5 = param n, runtime_param0 +// CHECK:STDOUT: %n: %.5 = bind_name n, %n.param // CHECK:STDOUT: %UInt.ref.loc10_22: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] // CHECK:STDOUT: %.loc10_27: i32 = int_literal 13 [template = constants.%.4] // CHECK:STDOUT: %int.make_type_unsigned.loc10_26: init type = call %UInt.ref.loc10_22(%.loc10_27) [template = constants.%.5] // CHECK:STDOUT: %.loc10_29.1: type = value_of_initializer %int.make_type_unsigned.loc10_26 [template = constants.%.5] // CHECK:STDOUT: %.loc10_29.2: type = converted %int.make_type_unsigned.loc10_26, %.loc10_29.1 [template = constants.%.5] -// CHECK:STDOUT: @G.%return: ref %.5 = var +// CHECK:STDOUT: %return: ref %.5 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Symbolic.decl: %Symbolic.type = fn_decl @Symbolic [template = constants.%Symbolic] { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_17.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc14_17.2: type = converted %int.make_type_32, %.loc14_17.1 [template = i32] -// CHECK:STDOUT: %N.loc14_13.1: i32 = param N, runtime_param -// CHECK:STDOUT: @Symbolic.%N.loc14: i32 = bind_symbolic_name N 0, %N.loc14_13.1 [symbolic = @Symbolic.%N.1 (constants.%N)] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc14: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: %UInt.ref.loc14_25: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] -// CHECK:STDOUT: %N.ref.loc14_30: i32 = name_ref N, @Symbolic.%N.loc14 [symbolic = @Symbolic.%N.1 (constants.%N)] -// CHECK:STDOUT: %int.make_type_unsigned.loc14_29: init type = call %UInt.ref.loc14_25(%N.ref.loc14_30) [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_31.1: type = value_of_initializer %int.make_type_unsigned.loc14_29 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_31.2: type = converted %int.make_type_unsigned.loc14_29, %.loc14_31.1 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %x.loc14_22.1: @Symbolic.%.1 (%.6) = param x, runtime_param0 -// CHECK:STDOUT: @Symbolic.%x: @Symbolic.%.1 (%.6) = bind_name x, %x.loc14_22.1 +// CHECK:STDOUT: %N.ref.loc14_30: i32 = name_ref N, %N.loc14 [symbolic = %N.1 (constants.%N)] +// CHECK:STDOUT: %int.make_type_unsigned.loc14_29: init type = call %UInt.ref.loc14_25(%N.ref.loc14_30) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_31.1: type = value_of_initializer %int.make_type_unsigned.loc14_29 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_31.2: type = converted %int.make_type_unsigned.loc14_29, %.loc14_31.1 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %x.param: @Symbolic.%.1 (%.6) = param x, runtime_param0 +// CHECK:STDOUT: %x: @Symbolic.%.1 (%.6) = bind_name x, %x.param // CHECK:STDOUT: %UInt.ref.loc14_37: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] -// CHECK:STDOUT: %N.ref.loc14_42: i32 = name_ref N, @Symbolic.%N.loc14 [symbolic = @Symbolic.%N.1 (constants.%N)] -// CHECK:STDOUT: %int.make_type_unsigned.loc14_41: init type = call %UInt.ref.loc14_37(%N.ref.loc14_42) [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_43.1: type = value_of_initializer %int.make_type_unsigned.loc14_41 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: %.loc14_43.2: type = converted %int.make_type_unsigned.loc14_41, %.loc14_43.1 [symbolic = @Symbolic.%.1 (constants.%.6)] -// CHECK:STDOUT: @Symbolic.%return: ref @Symbolic.%.1 (%.6) = var +// CHECK:STDOUT: %N.ref.loc14_42: i32 = name_ref N, %N.loc14 [symbolic = %N.1 (constants.%N)] +// CHECK:STDOUT: %int.make_type_unsigned.loc14_41: init type = call %UInt.ref.loc14_37(%N.ref.loc14_42) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_43.1: type = value_of_initializer %int.make_type_unsigned.loc14_41 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.loc14_43.2: type = converted %int.make_type_unsigned.loc14_41, %.loc14_43.1 [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %return: ref @Symbolic.%.1 (%.6) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -325,7 +325,7 @@ var m: UInt(1000000000); // CHECK:STDOUT: .UInt = imports.%import_ref.1 // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .Negate = %Negate.decl -// CHECK:STDOUT: .n = %n.loc12 +// CHECK:STDOUT: .n = %n // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %default.import = import @@ -333,12 +333,12 @@ var m: UInt(1000000000); // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %n.loc6_11.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Negate.%n: i32 = bind_name n, %n.loc6_11.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %UInt.ref: %UInt.type = name_ref UInt, imports.%import_ref.1 [template = constants.%UInt] // CHECK:STDOUT: %Negate.ref: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] @@ -350,7 +350,7 @@ var m: UInt(1000000000); // CHECK:STDOUT: %.loc12_22.1: type = value_of_initializer %int.make_type_unsigned [template = ] // CHECK:STDOUT: %.loc12_22.2: type = converted %int.make_type_unsigned, %.loc12_22.1 [template = ] // CHECK:STDOUT: %n.var: ref = var n -// CHECK:STDOUT: %n.loc12: ref = bind_name n, %n.var +// CHECK:STDOUT: %n: ref = bind_name n, %n.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; diff --git a/toolchain/check/testdata/builtins/int/neq.carbon b/toolchain/check/testdata/builtins/int/neq.carbon index 7f476dd221d14..c9bb40c675ee1 100644 --- a/toolchain/check/testdata/builtins/int/neq.carbon +++ b/toolchain/check/testdata/builtins/int/neq.carbon @@ -79,43 +79,43 @@ fn RuntimeCall(a: i32, b: i32) -> bool { // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Neq.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Neq.%b: i32 = bind_name b, %b.loc2_16.1 -// CHECK:STDOUT: %bool.make_type.loc2: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %bool.make_type.loc2 [template = bool] -// CHECK:STDOUT: %.loc2_27.2: type = converted %bool.make_type.loc2, %.loc2_27.1 [template = bool] -// CHECK:STDOUT: @Neq.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc2_27.2: type = converted %bool.make_type, %.loc2_27.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %True.decl: type = class_decl @True [template = constants.%True] {} // CHECK:STDOUT: %False.decl: type = class_decl @False [template = constants.%False] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %True.ref: type = name_ref True, %True.decl [template = constants.%True] -// CHECK:STDOUT: %true_.loc7_6.1: %True = param true_, runtime_param0 -// CHECK:STDOUT: @F.%true_: %True = bind_name true_, %true_.loc7_6.1 -// CHECK:STDOUT: %False.ref: type = name_ref False, %False.decl [template = constants.%False] -// CHECK:STDOUT: %false_.loc7_19.1: %False = param false_, runtime_param1 -// CHECK:STDOUT: @F.%false_: %False = bind_name false_, %false_.loc7_19.1 +// CHECK:STDOUT: %True.ref.loc7: type = name_ref True, file.%True.decl [template = constants.%True] +// CHECK:STDOUT: %true_.param: %True = param true_, runtime_param0 +// CHECK:STDOUT: %true_: %True = bind_name true_, %true_.param +// CHECK:STDOUT: %False.ref.loc7: type = name_ref False, file.%False.decl [template = constants.%False] +// CHECK:STDOUT: %false_.param: %False = param false_, runtime_param1 +// CHECK:STDOUT: %false_: %False = bind_name false_, %false_.param // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCall.decl: %RuntimeCall.type = fn_decl @RuntimeCall [template = constants.%RuntimeCall] { // CHECK:STDOUT: %int.make_type_32.loc12_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_19.1: type = value_of_initializer %int.make_type_32.loc12_19 [template = i32] // CHECK:STDOUT: %.loc12_19.2: type = converted %int.make_type_32.loc12_19, %.loc12_19.1 [template = i32] -// CHECK:STDOUT: %a.loc12_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc12_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc12_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_27.1: type = value_of_initializer %int.make_type_32.loc12_27 [template = i32] // CHECK:STDOUT: %.loc12_27.2: type = converted %int.make_type_32.loc12_27, %.loc12_27.1 [template = i32] -// CHECK:STDOUT: %b.loc12_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc12_24.1 -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type.loc12, %.loc12_35.1 [template = bool] -// CHECK:STDOUT: @RuntimeCall.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_35.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_35.2: type = converted %bool.make_type, %.loc12_35.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/or.carbon b/toolchain/check/testdata/builtins/int/or.carbon index 6992f30786e6c..9ecd6f3ef9ab1 100644 --- a/toolchain/check/testdata/builtins/int/or.carbon +++ b/toolchain/check/testdata/builtins/int/or.carbon @@ -64,17 +64,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc2_10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_10.1: type = value_of_initializer %int.make_type_32.loc2_10 [template = i32] // CHECK:STDOUT: %.loc2_10.2: type = converted %int.make_type_32.loc2_10, %.loc2_10.1 [template = i32] -// CHECK:STDOUT: %a.loc2_7.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Or.%a: i32 = bind_name a, %a.loc2_7.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_18.1: type = value_of_initializer %int.make_type_32.loc2_18 [template = i32] // CHECK:STDOUT: %.loc2_18.2: type = converted %int.make_type_32.loc2_18, %.loc2_18.1 [template = i32] -// CHECK:STDOUT: %b.loc2_15.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Or.%b: i32 = bind_name b, %b.loc2_15.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %int.make_type_32.loc2_26 [template = i32] // CHECK:STDOUT: %.loc2_26.2: type = converted %int.make_type_32.loc2_26, %.loc2_26.1 [template = i32] -// CHECK:STDOUT: @Or.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Or.ref: %Or.type = name_ref Or, %Or.decl [template = constants.%Or] @@ -96,17 +96,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/int/right_shift.carbon b/toolchain/check/testdata/builtins/int/right_shift.carbon index 5af956319ccf0..db1a608aa4734 100644 --- a/toolchain/check/testdata/builtins/int/right_shift.carbon +++ b/toolchain/check/testdata/builtins/int/right_shift.carbon @@ -109,17 +109,17 @@ let negative: i32 = RightShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc2_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_18.1: type = value_of_initializer %int.make_type_32.loc2_18 [template = i32] // CHECK:STDOUT: %.loc2_18.2: type = converted %int.make_type_32.loc2_18, %.loc2_18.1 [template = i32] -// CHECK:STDOUT: %a.loc2_15.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RightShift.%a: i32 = bind_name a, %a.loc2_15.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_26.1: type = value_of_initializer %int.make_type_32.loc2_26 [template = i32] // CHECK:STDOUT: %.loc2_26.2: type = converted %int.make_type_32.loc2_26, %.loc2_26.1 [template = i32] -// CHECK:STDOUT: %b.loc2_23.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RightShift.%b: i32 = bind_name b, %b.loc2_23.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_34.1: type = value_of_initializer %int.make_type_32.loc2_34 [template = i32] // CHECK:STDOUT: %.loc2_34.2: type = converted %int.make_type_32.loc2_34, %.loc2_34.1 [template = i32] -// CHECK:STDOUT: @RightShift.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %RightShift.ref: %RightShift.type = name_ref RightShift, %RightShift.decl [template = constants.%RightShift] @@ -141,17 +141,17 @@ let negative: i32 = RightShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -231,28 +231,28 @@ let negative: i32 = RightShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc6_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_18.1: type = value_of_initializer %int.make_type_32.loc6_18 [template = i32] // CHECK:STDOUT: %.loc6_18.2: type = converted %int.make_type_32.loc6_18, %.loc6_18.1 [template = i32] -// CHECK:STDOUT: %a.loc6_15.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RightShift.%a: i32 = bind_name a, %a.loc6_15.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc6_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_26.1: type = value_of_initializer %int.make_type_32.loc6_26 [template = i32] // CHECK:STDOUT: %.loc6_26.2: type = converted %int.make_type_32.loc6_26, %.loc6_26.1 [template = i32] -// CHECK:STDOUT: %b.loc6_23.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RightShift.%b: i32 = bind_name b, %b.loc6_23.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc6_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_34.1: type = value_of_initializer %int.make_type_32.loc6_34 [template = i32] // CHECK:STDOUT: %.loc6_34.2: type = converted %int.make_type_32.loc6_34, %.loc6_34.1 [template = i32] -// CHECK:STDOUT: @RightShift.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc7_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_14.1: type = value_of_initializer %int.make_type_32.loc7_14 [template = i32] // CHECK:STDOUT: %.loc7_14.2: type = converted %int.make_type_32.loc7_14, %.loc7_14.1 [template = i32] -// CHECK:STDOUT: %a.loc7_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc7_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_22.1: type = value_of_initializer %int.make_type_32.loc7_22 [template = i32] // CHECK:STDOUT: %.loc7_22.2: type = converted %int.make_type_32.loc7_22, %.loc7_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Negate.ref.loc10_17: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] @@ -369,28 +369,28 @@ let negative: i32 = RightShift(1, Negate(1)); // CHECK:STDOUT: %int.make_type_32.loc4_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_18.1: type = value_of_initializer %int.make_type_32.loc4_18 [template = i32] // CHECK:STDOUT: %.loc4_18.2: type = converted %int.make_type_32.loc4_18, %.loc4_18.1 [template = i32] -// CHECK:STDOUT: %a.loc4_15.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RightShift.%a: i32 = bind_name a, %a.loc4_15.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_26.1: type = value_of_initializer %int.make_type_32.loc4_26 [template = i32] // CHECK:STDOUT: %.loc4_26.2: type = converted %int.make_type_32.loc4_26, %.loc4_26.1 [template = i32] -// CHECK:STDOUT: %b.loc4_23.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RightShift.%b: i32 = bind_name b, %b.loc4_23.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_34.1: type = value_of_initializer %int.make_type_32.loc4_34 [template = i32] // CHECK:STDOUT: %.loc4_34.2: type = converted %int.make_type_32.loc4_34, %.loc4_34.1 [template = i32] -// CHECK:STDOUT: @RightShift.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc5_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_14.1: type = value_of_initializer %int.make_type_32.loc5_14 [template = i32] // CHECK:STDOUT: %.loc5_14.2: type = converted %int.make_type_32.loc5_14, %.loc5_14.1 [template = i32] -// CHECK:STDOUT: %a.loc5_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc5_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_22.1: type = value_of_initializer %int.make_type_32.loc5_22 [template = i32] // CHECK:STDOUT: %.loc5_22.2: type = converted %int.make_type_32.loc5_22, %.loc5_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_13.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/sadd.carbon b/toolchain/check/testdata/builtins/int/sadd.carbon index 6847786f5b9d7..41b3fc753f196 100644 --- a/toolchain/check/testdata/builtins/int/sadd.carbon +++ b/toolchain/check/testdata/builtins/int/sadd.carbon @@ -134,17 +134,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, %Add.decl [template = constants.%Add] @@ -166,17 +166,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -267,65 +267,65 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc8_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_14.1: type = value_of_initializer %int.make_type_32.loc8_14 [template = i32] // CHECK:STDOUT: %.loc8_14.2: type = converted %int.make_type_32.loc8_14, %.loc8_14.1 [template = i32] -// CHECK:STDOUT: %a.loc8_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: i32 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc8_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_22.1: type = value_of_initializer %int.make_type_32.loc8_22 [template = i32] // CHECK:STDOUT: %.loc8_22.2: type = converted %int.make_type_32.loc8_22, %.loc8_22.1 [template = i32] -// CHECK:STDOUT: @TooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %int.make_type_32.loc13_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_15.1: type = value_of_initializer %int.make_type_32.loc13_15 [template = i32] // CHECK:STDOUT: %.loc13_15.2: type = converted %int.make_type_32.loc13_15, %.loc13_15.1 [template = i32] -// CHECK:STDOUT: %a.loc13_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: i32 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_23.1: type = value_of_initializer %int.make_type_32.loc13_23 [template = i32] // CHECK:STDOUT: %.loc13_23.2: type = converted %int.make_type_32.loc13_23, %.loc13_23.1 [template = i32] -// CHECK:STDOUT: %b.loc13_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: i32 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc13_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13_31 [template = i32] // CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13_31, %.loc13_31.1 [template = i32] -// CHECK:STDOUT: %c.loc13_28.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: i32 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc13_39: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_39.1: type = value_of_initializer %int.make_type_32.loc13_39 [template = i32] // CHECK:STDOUT: %.loc13_39.2: type = converted %int.make_type_32.loc13_39, %.loc13_39.1 [template = i32] -// CHECK:STDOUT: @TooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc18_21: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32.loc18_21 [template = i32] // CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32.loc18_21, %.loc18_21.1 [template = i32] -// CHECK:STDOUT: %a.loc18_18.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: i32 = bind_name a, %a.loc18_18.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc18_29: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %int.make_type_32.loc18_29 [template = i32] // CHECK:STDOUT: %.loc18_29.2: type = converted %int.make_type_32.loc18_29, %.loc18_29.1 [template = i32] -// CHECK:STDOUT: %b.loc18_26.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: i32 = bind_name b, %b.loc18_26.1 -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_37.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_37.2: type = converted %bool.make_type.loc18, %.loc18_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_37.2: type = converted %bool.make_type, %.loc18_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %int.make_type_32.loc19_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_17.1: type = value_of_initializer %int.make_type_32.loc19_17 [template = i32] // CHECK:STDOUT: %.loc19_17.2: type = converted %int.make_type_32.loc19_17, %.loc19_17.1 [template = i32] -// CHECK:STDOUT: %a.loc19_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: i32 = bind_name a, %a.loc19_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc19_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_25.1: type = value_of_initializer %int.make_type_32.loc19_25 [template = i32] // CHECK:STDOUT: %.loc19_25.2: type = converted %int.make_type_32.loc19_25, %.loc19_25.1 [template = i32] -// CHECK:STDOUT: %b.loc19_22.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: i32 = bind_name b, %b.loc19_22.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc19_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_33.1: type = value_of_initializer %int.make_type_32.loc19_33 [template = i32] // CHECK:STDOUT: %.loc19_33.2: type = converted %int.make_type_32.loc19_33, %.loc19_33.1 [template = i32] -// CHECK:STDOUT: @JustRight.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %TooFew.ref: %TooFew.type = name_ref TooFew, %TooFew.decl [template = constants.%TooFew] @@ -362,49 +362,49 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc46_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_25.1: type = value_of_initializer %int.make_type_32.loc46_25 [template = i32] // CHECK:STDOUT: %.loc46_25.2: type = converted %int.make_type_32.loc46_25, %.loc46_25.1 [template = i32] -// CHECK:STDOUT: %a.loc46_22.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: i32 = bind_name a, %a.loc46_22.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc46_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_33.1: type = value_of_initializer %int.make_type_32.loc46_33 [template = i32] // CHECK:STDOUT: %.loc46_33.2: type = converted %int.make_type_32.loc46_33, %.loc46_33.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %int.make_type_32.loc50_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc50_26.1: type = value_of_initializer %int.make_type_32.loc50_26 [template = i32] // CHECK:STDOUT: %.loc50_26.2: type = converted %int.make_type_32.loc50_26, %.loc50_26.1 [template = i32] -// CHECK:STDOUT: %a.loc50_23.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: i32 = bind_name a, %a.loc50_23.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc50_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc50_34.1: type = value_of_initializer %int.make_type_32.loc50_34 [template = i32] // CHECK:STDOUT: %.loc50_34.2: type = converted %int.make_type_32.loc50_34, %.loc50_34.1 [template = i32] -// CHECK:STDOUT: %b.loc50_31.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: i32 = bind_name b, %b.loc50_31.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc50_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc50_42.1: type = value_of_initializer %int.make_type_32.loc50_42 [template = i32] // CHECK:STDOUT: %.loc50_42.2: type = converted %int.make_type_32.loc50_42, %.loc50_42.1 [template = i32] -// CHECK:STDOUT: %c.loc50_39.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: i32 = bind_name c, %c.loc50_39.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc50_50: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc50_50.1: type = value_of_initializer %int.make_type_32.loc50_50 [template = i32] // CHECK:STDOUT: %.loc50_50.2: type = converted %int.make_type_32.loc50_50, %.loc50_50.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc54_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc54_32.1: type = value_of_initializer %int.make_type_32.loc54_32 [template = i32] // CHECK:STDOUT: %.loc54_32.2: type = converted %int.make_type_32.loc54_32, %.loc54_32.1 [template = i32] -// CHECK:STDOUT: %a.loc54_29.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: i32 = bind_name a, %a.loc54_29.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc54_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc54_40.1: type = value_of_initializer %int.make_type_32.loc54_40 [template = i32] // CHECK:STDOUT: %.loc54_40.2: type = converted %int.make_type_32.loc54_40, %.loc54_40.1 [template = i32] -// CHECK:STDOUT: %b.loc54_37.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: i32 = bind_name b, %b.loc54_37.1 -// CHECK:STDOUT: %bool.make_type.loc54: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc54_48.1: type = value_of_initializer %bool.make_type.loc54 [template = bool] -// CHECK:STDOUT: %.loc54_48.2: type = converted %bool.make_type.loc54, %.loc54_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc54_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc54_48.2: type = converted %bool.make_type, %.loc54_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -494,17 +494,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/sdiv.carbon b/toolchain/check/testdata/builtins/int/sdiv.carbon index f4f8f018ff7ef..44355c1e05db4 100644 --- a/toolchain/check/testdata/builtins/int/sdiv.carbon +++ b/toolchain/check/testdata/builtins/int/sdiv.carbon @@ -102,17 +102,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Div.ref: %Div.type = name_ref Div, %Div.decl [template = constants.%Div] @@ -134,17 +134,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -220,44 +220,44 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %a.loc6_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc6_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_8.1: type = value_of_initializer %int.make_type_32.loc9 [template = i32] @@ -373,17 +373,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_8.1: type = value_of_initializer %int.make_type_32.loc10 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/smod.carbon b/toolchain/check/testdata/builtins/int/smod.carbon index a34a0618c8bf4..2cd930e90fa27 100644 --- a/toolchain/check/testdata/builtins/int/smod.carbon +++ b/toolchain/check/testdata/builtins/int/smod.carbon @@ -105,17 +105,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Mod.ref: %Mod.type = name_ref Mod, %Mod.decl [template = constants.%Mod] @@ -137,17 +137,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -224,44 +224,44 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %a.loc6_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc6_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_8.1: type = value_of_initializer %int.make_type_32.loc9 [template = i32] @@ -377,17 +377,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_8.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/smul.carbon b/toolchain/check/testdata/builtins/int/smul.carbon index 6ce2d5f6d867f..3287f6bee4967 100644 --- a/toolchain/check/testdata/builtins/int/smul.carbon +++ b/toolchain/check/testdata/builtins/int/smul.carbon @@ -76,17 +76,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mul.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mul.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Mul.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Mul.ref: %Mul.type = name_ref Mul, %Mul.decl [template = constants.%Mul] @@ -108,17 +108,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -187,17 +187,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mul.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mul.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mul.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/snegate.carbon b/toolchain/check/testdata/builtins/int/snegate.carbon index 89bbc9e4fdfe9..19862b1ffb92c 100644 --- a/toolchain/check/testdata/builtins/int/snegate.carbon +++ b/toolchain/check/testdata/builtins/int/snegate.carbon @@ -163,12 +163,12 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc2_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_14.1: type = value_of_initializer %int.make_type_32.loc2_14 [template = i32] // CHECK:STDOUT: %.loc2_14.2: type = converted %int.make_type_32.loc2_14, %.loc2_14.1 [template = i32] -// CHECK:STDOUT: %a.loc2_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc2_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_22.1: type = value_of_initializer %int.make_type_32.loc2_22 [template = i32] // CHECK:STDOUT: %.loc2_22.2: type = converted %int.make_type_32.loc2_22, %.loc2_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Negate.ref.loc4_16: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] @@ -196,17 +196,17 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc9_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_19.1: type = value_of_initializer %int.make_type_32.loc9_19 [template = i32] // CHECK:STDOUT: %.loc9_19.2: type = converted %int.make_type_32.loc9_19, %.loc9_19.1 [template = i32] -// CHECK:STDOUT: %a.loc9_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc9_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc9_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_27.1: type = value_of_initializer %int.make_type_32.loc9_27 [template = i32] // CHECK:STDOUT: %.loc9_27.2: type = converted %int.make_type_32.loc9_27, %.loc9_27.1 [template = i32] -// CHECK:STDOUT: %b.loc9_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc9_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc9_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_35.1: type = value_of_initializer %int.make_type_32.loc9_35 [template = i32] // CHECK:STDOUT: %.loc9_35.2: type = converted %int.make_type_32.loc9_35, %.loc9_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -298,48 +298,48 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %TooFew.decl: %TooFew.type = fn_decl @TooFew [template = constants.%TooFew] { -// CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc8_16.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] -// CHECK:STDOUT: %.loc8_16.2: type = converted %int.make_type_32.loc8, %.loc8_16.1 [template = i32] -// CHECK:STDOUT: @TooFew.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc8_16.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc8_16.2: type = converted %int.make_type_32, %.loc8_16.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %int.make_type_32.loc13_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_15.1: type = value_of_initializer %int.make_type_32.loc13_15 [template = i32] // CHECK:STDOUT: %.loc13_15.2: type = converted %int.make_type_32.loc13_15, %.loc13_15.1 [template = i32] -// CHECK:STDOUT: %a.loc13_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: i32 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_23.1: type = value_of_initializer %int.make_type_32.loc13_23 [template = i32] // CHECK:STDOUT: %.loc13_23.2: type = converted %int.make_type_32.loc13_23, %.loc13_23.1 [template = i32] -// CHECK:STDOUT: %b.loc13_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: i32 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc13_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13_31 [template = i32] // CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13_31, %.loc13_31.1 [template = i32] -// CHECK:STDOUT: @TooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { -// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] -// CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32.loc18, %.loc18_21.1 [template = i32] -// CHECK:STDOUT: %a.loc18_18.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: i32 = bind_name a, %a.loc18_18.1 -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type.loc18, %.loc18_29.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32, %.loc18_21.1 [template = i32] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type, %.loc18_29.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %int.make_type_32.loc19_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_17.1: type = value_of_initializer %int.make_type_32.loc19_17 [template = i32] // CHECK:STDOUT: %.loc19_17.2: type = converted %int.make_type_32.loc19_17, %.loc19_17.1 [template = i32] -// CHECK:STDOUT: %a.loc19_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: i32 = bind_name a, %a.loc19_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc19_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_25.1: type = value_of_initializer %int.make_type_32.loc19_25 [template = i32] // CHECK:STDOUT: %.loc19_25.2: type = converted %int.make_type_32.loc19_25, %.loc19_25.1 [template = i32] -// CHECK:STDOUT: @JustRight.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %TooFew.ref: %TooFew.type = name_ref TooFew, %TooFew.decl [template = constants.%TooFew] @@ -372,49 +372,49 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc46_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_25.1: type = value_of_initializer %int.make_type_32.loc46_25 [template = i32] // CHECK:STDOUT: %.loc46_25.2: type = converted %int.make_type_32.loc46_25, %.loc46_25.1 [template = i32] -// CHECK:STDOUT: %a.loc46_22.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: i32 = bind_name a, %a.loc46_22.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc46_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_33.1: type = value_of_initializer %int.make_type_32.loc46_33 [template = i32] // CHECK:STDOUT: %.loc46_33.2: type = converted %int.make_type_32.loc46_33, %.loc46_33.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %int.make_type_32.loc57_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_26.1: type = value_of_initializer %int.make_type_32.loc57_26 [template = i32] // CHECK:STDOUT: %.loc57_26.2: type = converted %int.make_type_32.loc57_26, %.loc57_26.1 [template = i32] -// CHECK:STDOUT: %a.loc57_23.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: i32 = bind_name a, %a.loc57_23.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc57_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_34.1: type = value_of_initializer %int.make_type_32.loc57_34 [template = i32] // CHECK:STDOUT: %.loc57_34.2: type = converted %int.make_type_32.loc57_34, %.loc57_34.1 [template = i32] -// CHECK:STDOUT: %b.loc57_31.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: i32 = bind_name b, %b.loc57_31.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc57_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_42.1: type = value_of_initializer %int.make_type_32.loc57_42 [template = i32] // CHECK:STDOUT: %.loc57_42.2: type = converted %int.make_type_32.loc57_42, %.loc57_42.1 [template = i32] -// CHECK:STDOUT: %c.loc57_39.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: i32 = bind_name c, %c.loc57_39.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc57_50: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_50.1: type = value_of_initializer %int.make_type_32.loc57_50 [template = i32] // CHECK:STDOUT: %.loc57_50.2: type = converted %int.make_type_32.loc57_50, %.loc57_50.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc68_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc68_32.1: type = value_of_initializer %int.make_type_32.loc68_32 [template = i32] // CHECK:STDOUT: %.loc68_32.2: type = converted %int.make_type_32.loc68_32, %.loc68_32.1 [template = i32] -// CHECK:STDOUT: %a.loc68_29.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: i32 = bind_name a, %a.loc68_29.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc68_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc68_40.1: type = value_of_initializer %int.make_type_32.loc68_40 [template = i32] // CHECK:STDOUT: %.loc68_40.2: type = converted %int.make_type_32.loc68_40, %.loc68_40.1 [template = i32] -// CHECK:STDOUT: %b.loc68_37.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: i32 = bind_name b, %b.loc68_37.1 -// CHECK:STDOUT: %bool.make_type.loc68: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc68_48.1: type = value_of_initializer %bool.make_type.loc68 [template = bool] -// CHECK:STDOUT: %.loc68_48.2: type = converted %bool.make_type.loc68, %.loc68_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc68_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc68_48.2: type = converted %bool.make_type, %.loc68_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -498,28 +498,28 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc4_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_14.1: type = value_of_initializer %int.make_type_32.loc4_14 [template = i32] // CHECK:STDOUT: %.loc4_14.2: type = converted %int.make_type_32.loc4_14, %.loc4_14.1 [template = i32] -// CHECK:STDOUT: %a.loc4_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc4_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_22.1: type = value_of_initializer %int.make_type_32.loc4_22 [template = i32] // CHECK:STDOUT: %.loc4_22.2: type = converted %int.make_type_32.loc4_22, %.loc4_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_8.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/ssub.carbon b/toolchain/check/testdata/builtins/int/ssub.carbon index 4baf7878e216c..801a4b4db58c6 100644 --- a/toolchain/check/testdata/builtins/int/ssub.carbon +++ b/toolchain/check/testdata/builtins/int/ssub.carbon @@ -77,17 +77,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Sub.ref: %Sub.type = name_ref Sub, %Sub.decl [template = constants.%Sub] @@ -109,17 +109,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -190,17 +190,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/uadd.carbon b/toolchain/check/testdata/builtins/int/uadd.carbon index 0a689c42352ba..5b11772e41518 100644 --- a/toolchain/check/testdata/builtins/int/uadd.carbon +++ b/toolchain/check/testdata/builtins/int/uadd.carbon @@ -131,17 +131,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, %Add.decl [template = constants.%Add] @@ -163,17 +163,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -264,65 +264,65 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc8_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_14.1: type = value_of_initializer %int.make_type_32.loc8_14 [template = i32] // CHECK:STDOUT: %.loc8_14.2: type = converted %int.make_type_32.loc8_14, %.loc8_14.1 [template = i32] -// CHECK:STDOUT: %a.loc8_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooFew.%a: i32 = bind_name a, %a.loc8_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc8_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_22.1: type = value_of_initializer %int.make_type_32.loc8_22 [template = i32] // CHECK:STDOUT: %.loc8_22.2: type = converted %int.make_type_32.loc8_22, %.loc8_22.1 [template = i32] -// CHECK:STDOUT: @TooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %int.make_type_32.loc13_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_15.1: type = value_of_initializer %int.make_type_32.loc13_15 [template = i32] // CHECK:STDOUT: %.loc13_15.2: type = converted %int.make_type_32.loc13_15, %.loc13_15.1 [template = i32] -// CHECK:STDOUT: %a.loc13_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: i32 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_23.1: type = value_of_initializer %int.make_type_32.loc13_23 [template = i32] // CHECK:STDOUT: %.loc13_23.2: type = converted %int.make_type_32.loc13_23, %.loc13_23.1 [template = i32] -// CHECK:STDOUT: %b.loc13_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: i32 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc13_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13_31 [template = i32] // CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13_31, %.loc13_31.1 [template = i32] -// CHECK:STDOUT: %c.loc13_28.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @TooMany.%c: i32 = bind_name c, %c.loc13_28.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc13_39: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_39.1: type = value_of_initializer %int.make_type_32.loc13_39 [template = i32] // CHECK:STDOUT: %.loc13_39.2: type = converted %int.make_type_32.loc13_39, %.loc13_39.1 [template = i32] -// CHECK:STDOUT: @TooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc18_21: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32.loc18_21 [template = i32] // CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32.loc18_21, %.loc18_21.1 [template = i32] -// CHECK:STDOUT: %a.loc18_18.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: i32 = bind_name a, %a.loc18_18.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc18_29: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %int.make_type_32.loc18_29 [template = i32] // CHECK:STDOUT: %.loc18_29.2: type = converted %int.make_type_32.loc18_29, %.loc18_29.1 [template = i32] -// CHECK:STDOUT: %b.loc18_26.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @BadReturnType.%b: i32 = bind_name b, %b.loc18_26.1 -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_37.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_37.2: type = converted %bool.make_type.loc18, %.loc18_37.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_37.2: type = converted %bool.make_type, %.loc18_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %int.make_type_32.loc19_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_17.1: type = value_of_initializer %int.make_type_32.loc19_17 [template = i32] // CHECK:STDOUT: %.loc19_17.2: type = converted %int.make_type_32.loc19_17, %.loc19_17.1 [template = i32] -// CHECK:STDOUT: %a.loc19_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: i32 = bind_name a, %a.loc19_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc19_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_25.1: type = value_of_initializer %int.make_type_32.loc19_25 [template = i32] // CHECK:STDOUT: %.loc19_25.2: type = converted %int.make_type_32.loc19_25, %.loc19_25.1 [template = i32] -// CHECK:STDOUT: %b.loc19_22.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @JustRight.%b: i32 = bind_name b, %b.loc19_22.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc19_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_33.1: type = value_of_initializer %int.make_type_32.loc19_33 [template = i32] // CHECK:STDOUT: %.loc19_33.2: type = converted %int.make_type_32.loc19_33, %.loc19_33.1 [template = i32] -// CHECK:STDOUT: @JustRight.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %TooFew.ref: %TooFew.type = name_ref TooFew, %TooFew.decl [template = constants.%TooFew] @@ -359,49 +359,49 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc45_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc45_25.1: type = value_of_initializer %int.make_type_32.loc45_25 [template = i32] // CHECK:STDOUT: %.loc45_25.2: type = converted %int.make_type_32.loc45_25, %.loc45_25.1 [template = i32] -// CHECK:STDOUT: %a.loc45_22.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: i32 = bind_name a, %a.loc45_22.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc45_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc45_33.1: type = value_of_initializer %int.make_type_32.loc45_33 [template = i32] // CHECK:STDOUT: %.loc45_33.2: type = converted %int.make_type_32.loc45_33, %.loc45_33.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %int.make_type_32.loc49_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc49_26.1: type = value_of_initializer %int.make_type_32.loc49_26 [template = i32] // CHECK:STDOUT: %.loc49_26.2: type = converted %int.make_type_32.loc49_26, %.loc49_26.1 [template = i32] -// CHECK:STDOUT: %a.loc49_23.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: i32 = bind_name a, %a.loc49_23.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc49_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc49_34.1: type = value_of_initializer %int.make_type_32.loc49_34 [template = i32] // CHECK:STDOUT: %.loc49_34.2: type = converted %int.make_type_32.loc49_34, %.loc49_34.1 [template = i32] -// CHECK:STDOUT: %b.loc49_31.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: i32 = bind_name b, %b.loc49_31.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc49_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc49_42.1: type = value_of_initializer %int.make_type_32.loc49_42 [template = i32] // CHECK:STDOUT: %.loc49_42.2: type = converted %int.make_type_32.loc49_42, %.loc49_42.1 [template = i32] -// CHECK:STDOUT: %c.loc49_39.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: i32 = bind_name c, %c.loc49_39.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc49_50: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc49_50.1: type = value_of_initializer %int.make_type_32.loc49_50 [template = i32] // CHECK:STDOUT: %.loc49_50.2: type = converted %int.make_type_32.loc49_50, %.loc49_50.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc53_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc53_32.1: type = value_of_initializer %int.make_type_32.loc53_32 [template = i32] // CHECK:STDOUT: %.loc53_32.2: type = converted %int.make_type_32.loc53_32, %.loc53_32.1 [template = i32] -// CHECK:STDOUT: %a.loc53_29.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: i32 = bind_name a, %a.loc53_29.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc53_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc53_40.1: type = value_of_initializer %int.make_type_32.loc53_40 [template = i32] // CHECK:STDOUT: %.loc53_40.2: type = converted %int.make_type_32.loc53_40, %.loc53_40.1 [template = i32] -// CHECK:STDOUT: %b.loc53_37.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: i32 = bind_name b, %b.loc53_37.1 -// CHECK:STDOUT: %bool.make_type.loc53: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc53_48.1: type = value_of_initializer %bool.make_type.loc53 [template = bool] -// CHECK:STDOUT: %.loc53_48.2: type = converted %bool.make_type.loc53, %.loc53_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc53_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc53_48.2: type = converted %bool.make_type, %.loc53_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -491,17 +491,17 @@ let b: i32 = Add(0x7FFFFFFF, 1); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc7: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_8.1: type = value_of_initializer %int.make_type_32.loc7 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/udiv.carbon b/toolchain/check/testdata/builtins/int/udiv.carbon index 5e8468e86ff23..773d7d6b3e439 100644 --- a/toolchain/check/testdata/builtins/int/udiv.carbon +++ b/toolchain/check/testdata/builtins/int/udiv.carbon @@ -98,17 +98,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Div.ref: %Div.type = name_ref Div, %Div.decl [template = constants.%Div] @@ -130,17 +130,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -217,44 +217,44 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %a.loc6_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc6_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_8.1: type = value_of_initializer %int.make_type_32.loc9 [template = i32] @@ -370,17 +370,17 @@ let b: i32 = Div(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Div.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Div.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Div.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_8.1: type = value_of_initializer %int.make_type_32.loc10 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/umod.carbon b/toolchain/check/testdata/builtins/int/umod.carbon index 49e61afb58fc2..5ef6081f21f16 100644 --- a/toolchain/check/testdata/builtins/int/umod.carbon +++ b/toolchain/check/testdata/builtins/int/umod.carbon @@ -100,17 +100,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Mod.ref: %Mod.type = name_ref Mod, %Mod.decl [template = constants.%Mod] @@ -132,17 +132,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -219,44 +219,44 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Negate.decl: %Negate.type = fn_decl @Negate [template = constants.%Negate] { // CHECK:STDOUT: %int.make_type_32.loc6_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_14.1: type = value_of_initializer %int.make_type_32.loc6_14 [template = i32] // CHECK:STDOUT: %.loc6_14.2: type = converted %int.make_type_32.loc6_14, %.loc6_14.1 [template = i32] -// CHECK:STDOUT: %a.loc6_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc6_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc6_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_22.1: type = value_of_initializer %int.make_type_32.loc6_22 [template = i32] // CHECK:STDOUT: %.loc6_22.2: type = converted %int.make_type_32.loc6_22, %.loc6_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_8.1: type = value_of_initializer %int.make_type_32.loc9 [template = i32] @@ -372,17 +372,17 @@ let b: i32 = Mod(0, 0); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mod.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mod.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_8.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/umul.carbon b/toolchain/check/testdata/builtins/int/umul.carbon index d3302d9fc5228..da2ea5dbbb7e1 100644 --- a/toolchain/check/testdata/builtins/int/umul.carbon +++ b/toolchain/check/testdata/builtins/int/umul.carbon @@ -73,17 +73,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mul.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mul.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Mul.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Mul.ref: %Mul.type = name_ref Mul, %Mul.decl [template = constants.%Mul] @@ -105,17 +105,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -184,17 +184,17 @@ let b: i32 = Mul(0x8000, 0x10000); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Mul.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Mul.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Mul.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/unegate.carbon b/toolchain/check/testdata/builtins/int/unegate.carbon index fe1f46014892b..d80e87a6d43fe 100644 --- a/toolchain/check/testdata/builtins/int/unegate.carbon +++ b/toolchain/check/testdata/builtins/int/unegate.carbon @@ -159,12 +159,12 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc2_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_14.1: type = value_of_initializer %int.make_type_32.loc2_14 [template = i32] // CHECK:STDOUT: %.loc2_14.2: type = converted %int.make_type_32.loc2_14, %.loc2_14.1 [template = i32] -// CHECK:STDOUT: %a.loc2_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc2_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_22.1: type = value_of_initializer %int.make_type_32.loc2_22 [template = i32] // CHECK:STDOUT: %.loc2_22.2: type = converted %int.make_type_32.loc2_22, %.loc2_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Negate.ref.loc4_16: %Negate.type = name_ref Negate, %Negate.decl [template = constants.%Negate] @@ -192,17 +192,17 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc9_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_19.1: type = value_of_initializer %int.make_type_32.loc9_19 [template = i32] // CHECK:STDOUT: %.loc9_19.2: type = converted %int.make_type_32.loc9_19, %.loc9_19.1 [template = i32] -// CHECK:STDOUT: %a.loc9_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc9_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc9_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_27.1: type = value_of_initializer %int.make_type_32.loc9_27 [template = i32] // CHECK:STDOUT: %.loc9_27.2: type = converted %int.make_type_32.loc9_27, %.loc9_27.1 [template = i32] -// CHECK:STDOUT: %b.loc9_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc9_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc9_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_35.1: type = value_of_initializer %int.make_type_32.loc9_35 [template = i32] // CHECK:STDOUT: %.loc9_35.2: type = converted %int.make_type_32.loc9_35, %.loc9_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -294,48 +294,48 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %TooFew.decl: %TooFew.type = fn_decl @TooFew [template = constants.%TooFew] { -// CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc8_16.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] -// CHECK:STDOUT: %.loc8_16.2: type = converted %int.make_type_32.loc8, %.loc8_16.1 [template = i32] -// CHECK:STDOUT: @TooFew.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc8_16.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc8_16.2: type = converted %int.make_type_32, %.loc8_16.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %TooMany.decl: %TooMany.type = fn_decl @TooMany [template = constants.%TooMany] { // CHECK:STDOUT: %int.make_type_32.loc13_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_15.1: type = value_of_initializer %int.make_type_32.loc13_15 [template = i32] // CHECK:STDOUT: %.loc13_15.2: type = converted %int.make_type_32.loc13_15, %.loc13_15.1 [template = i32] -// CHECK:STDOUT: %a.loc13_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TooMany.%a: i32 = bind_name a, %a.loc13_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_23.1: type = value_of_initializer %int.make_type_32.loc13_23 [template = i32] // CHECK:STDOUT: %.loc13_23.2: type = converted %int.make_type_32.loc13_23, %.loc13_23.1 [template = i32] -// CHECK:STDOUT: %b.loc13_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @TooMany.%b: i32 = bind_name b, %b.loc13_20.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc13_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13_31 [template = i32] // CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13_31, %.loc13_31.1 [template = i32] -// CHECK:STDOUT: @TooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %BadReturnType.decl: %BadReturnType.type = fn_decl @BadReturnType [template = constants.%BadReturnType] { -// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] -// CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32.loc18, %.loc18_21.1 [template = i32] -// CHECK:STDOUT: %a.loc18_18.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @BadReturnType.%a: i32 = bind_name a, %a.loc18_18.1 -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type.loc18, %.loc18_29.1 [template = bool] -// CHECK:STDOUT: @BadReturnType.%return: ref bool = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_21.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc18_21.2: type = converted %int.make_type_32, %.loc18_21.1 [template = i32] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_29.2: type = converted %bool.make_type, %.loc18_29.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %JustRight.decl: %JustRight.type = fn_decl @JustRight [template = constants.%JustRight] { // CHECK:STDOUT: %int.make_type_32.loc19_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_17.1: type = value_of_initializer %int.make_type_32.loc19_17 [template = i32] // CHECK:STDOUT: %.loc19_17.2: type = converted %int.make_type_32.loc19_17, %.loc19_17.1 [template = i32] -// CHECK:STDOUT: %a.loc19_14.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @JustRight.%a: i32 = bind_name a, %a.loc19_14.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc19_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_25.1: type = value_of_initializer %int.make_type_32.loc19_25 [template = i32] // CHECK:STDOUT: %.loc19_25.2: type = converted %int.make_type_32.loc19_25, %.loc19_25.1 [template = i32] -// CHECK:STDOUT: @JustRight.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %TooFew.ref: %TooFew.type = name_ref TooFew, %TooFew.decl [template = constants.%TooFew] @@ -368,49 +368,49 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc46_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_25.1: type = value_of_initializer %int.make_type_32.loc46_25 [template = i32] // CHECK:STDOUT: %.loc46_25.2: type = converted %int.make_type_32.loc46_25, %.loc46_25.1 [template = i32] -// CHECK:STDOUT: %a.loc46_22.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooFew.%a: i32 = bind_name a, %a.loc46_22.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc46_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc46_33.1: type = value_of_initializer %int.make_type_32.loc46_33 [template = i32] // CHECK:STDOUT: %.loc46_33.2: type = converted %int.make_type_32.loc46_33, %.loc46_33.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooFew.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallTooMany.decl: %RuntimeCallTooMany.type = fn_decl @RuntimeCallTooMany [template = constants.%RuntimeCallTooMany] { // CHECK:STDOUT: %int.make_type_32.loc57_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_26.1: type = value_of_initializer %int.make_type_32.loc57_26 [template = i32] // CHECK:STDOUT: %.loc57_26.2: type = converted %int.make_type_32.loc57_26, %.loc57_26.1 [template = i32] -// CHECK:STDOUT: %a.loc57_23.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallTooMany.%a: i32 = bind_name a, %a.loc57_23.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc57_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_34.1: type = value_of_initializer %int.make_type_32.loc57_34 [template = i32] // CHECK:STDOUT: %.loc57_34.2: type = converted %int.make_type_32.loc57_34, %.loc57_34.1 [template = i32] -// CHECK:STDOUT: %b.loc57_31.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallTooMany.%b: i32 = bind_name b, %b.loc57_31.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc57_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_42.1: type = value_of_initializer %int.make_type_32.loc57_42 [template = i32] // CHECK:STDOUT: %.loc57_42.2: type = converted %int.make_type_32.loc57_42, %.loc57_42.1 [template = i32] -// CHECK:STDOUT: %c.loc57_39.1: i32 = param c, runtime_param2 -// CHECK:STDOUT: @RuntimeCallTooMany.%c: i32 = bind_name c, %c.loc57_39.1 +// CHECK:STDOUT: %c.param: i32 = param c, runtime_param2 +// CHECK:STDOUT: %c: i32 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc57_50: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc57_50.1: type = value_of_initializer %int.make_type_32.loc57_50 [template = i32] // CHECK:STDOUT: %.loc57_50.2: type = converted %int.make_type_32.loc57_50, %.loc57_50.1 [template = i32] -// CHECK:STDOUT: @RuntimeCallTooMany.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %RuntimeCallBadReturnType.decl: %RuntimeCallBadReturnType.type = fn_decl @RuntimeCallBadReturnType [template = constants.%RuntimeCallBadReturnType] { // CHECK:STDOUT: %int.make_type_32.loc68_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc68_32.1: type = value_of_initializer %int.make_type_32.loc68_32 [template = i32] // CHECK:STDOUT: %.loc68_32.2: type = converted %int.make_type_32.loc68_32, %.loc68_32.1 [template = i32] -// CHECK:STDOUT: %a.loc68_29.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%a: i32 = bind_name a, %a.loc68_29.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc68_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc68_40.1: type = value_of_initializer %int.make_type_32.loc68_40 [template = i32] // CHECK:STDOUT: %.loc68_40.2: type = converted %int.make_type_32.loc68_40, %.loc68_40.1 [template = i32] -// CHECK:STDOUT: %b.loc68_37.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCallBadReturnType.%b: i32 = bind_name b, %b.loc68_37.1 -// CHECK:STDOUT: %bool.make_type.loc68: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc68_48.1: type = value_of_initializer %bool.make_type.loc68 [template = bool] -// CHECK:STDOUT: %.loc68_48.2: type = converted %bool.make_type.loc68, %.loc68_48.1 [template = bool] -// CHECK:STDOUT: @RuntimeCallBadReturnType.%return: ref bool = var +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc68_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc68_48.2: type = converted %bool.make_type, %.loc68_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -494,28 +494,28 @@ let b: i32 = Negate(Sub(Negate(0x7FFFFFFF), 1)); // CHECK:STDOUT: %int.make_type_32.loc4_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_14.1: type = value_of_initializer %int.make_type_32.loc4_14 [template = i32] // CHECK:STDOUT: %.loc4_14.2: type = converted %int.make_type_32.loc4_14, %.loc4_14.1 [template = i32] -// CHECK:STDOUT: %a.loc4_11.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Negate.%a: i32 = bind_name a, %a.loc4_11.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_22.1: type = value_of_initializer %int.make_type_32.loc4_22 [template = i32] // CHECK:STDOUT: %.loc4_22.2: type = converted %int.make_type_32.loc4_22, %.loc4_22.1 [template = i32] -// CHECK:STDOUT: @Negate.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Sub.decl: %Sub.type = fn_decl @Sub [template = constants.%Sub] { // CHECK:STDOUT: %int.make_type_32.loc5_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_11.1: type = value_of_initializer %int.make_type_32.loc5_11 [template = i32] // CHECK:STDOUT: %.loc5_11.2: type = converted %int.make_type_32.loc5_11, %.loc5_11.1 [template = i32] -// CHECK:STDOUT: %a.loc5_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5_19 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5_19, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: %b.loc5_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc5_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_27.1: type = value_of_initializer %int.make_type_32.loc5_27 [template = i32] // CHECK:STDOUT: %.loc5_27.2: type = converted %int.make_type_32.loc5_27, %.loc5_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_8.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/usub.carbon b/toolchain/check/testdata/builtins/int/usub.carbon index 24cd9deb8f8c9..29465797e8885 100644 --- a/toolchain/check/testdata/builtins/int/usub.carbon +++ b/toolchain/check/testdata/builtins/int/usub.carbon @@ -74,17 +74,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Sub.ref: %Sub.type = name_ref Sub, %Sub.decl [template = constants.%Sub] @@ -106,17 +106,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -187,17 +187,17 @@ let c: i32 = Sub(Sub(0, 0x7FFFFFFF), 2); // CHECK:STDOUT: %int.make_type_32.loc4_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4_11 [template = i32] // CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4_11, %.loc4_11.1 [template = i32] -// CHECK:STDOUT: %a.loc4_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Sub.%a: i32 = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc4_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_19.1: type = value_of_initializer %int.make_type_32.loc4_19 [template = i32] // CHECK:STDOUT: %.loc4_19.2: type = converted %int.make_type_32.loc4_19, %.loc4_19.1 [template = i32] -// CHECK:STDOUT: %b.loc4_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Sub.%b: i32 = bind_name b, %b.loc4_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc4_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4_27 [template = i32] // CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4_27, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: @Sub.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/builtins/int/xor.carbon b/toolchain/check/testdata/builtins/int/xor.carbon index f666d79eb37a6..b9de4d814c061 100644 --- a/toolchain/check/testdata/builtins/int/xor.carbon +++ b/toolchain/check/testdata/builtins/int/xor.carbon @@ -64,17 +64,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc2_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_11.1: type = value_of_initializer %int.make_type_32.loc2_11 [template = i32] // CHECK:STDOUT: %.loc2_11.2: type = converted %int.make_type_32.loc2_11, %.loc2_11.1 [template = i32] -// CHECK:STDOUT: %a.loc2_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Xor.%a: i32 = bind_name a, %a.loc2_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc2_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_19.1: type = value_of_initializer %int.make_type_32.loc2_19 [template = i32] // CHECK:STDOUT: %.loc2_19.2: type = converted %int.make_type_32.loc2_19, %.loc2_19.1 [template = i32] -// CHECK:STDOUT: %b.loc2_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Xor.%b: i32 = bind_name b, %b.loc2_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc2_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_27.1: type = value_of_initializer %int.make_type_32.loc2_27 [template = i32] // CHECK:STDOUT: %.loc2_27.2: type = converted %int.make_type_32.loc2_27, %.loc2_27.1 [template = i32] -// CHECK:STDOUT: @Xor.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Xor.ref: %Xor.type = name_ref Xor, %Xor.decl [template = constants.%Xor] @@ -96,17 +96,17 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc7_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_19.1: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_19.2: type = converted %int.make_type_32.loc7_19, %.loc7_19.1 [template = i32] -// CHECK:STDOUT: %a.loc7_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @RuntimeCall.%a: i32 = bind_name a, %a.loc7_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc7_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_27.1: type = value_of_initializer %int.make_type_32.loc7_27 [template = i32] // CHECK:STDOUT: %.loc7_27.2: type = converted %int.make_type_32.loc7_27, %.loc7_27.1 [template = i32] -// CHECK:STDOUT: %b.loc7_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @RuntimeCall.%b: i32 = bind_name b, %b.loc7_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_35.1: type = value_of_initializer %int.make_type_32.loc7_35 [template = i32] // CHECK:STDOUT: %.loc7_35.2: type = converted %int.make_type_32.loc7_35, %.loc7_35.1 [template = i32] -// CHECK:STDOUT: @RuntimeCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/builtins/print.carbon b/toolchain/check/testdata/builtins/print.carbon index ba535edbec344..b7cd47a366545 100644 --- a/toolchain/check/testdata/builtins/print.carbon +++ b/toolchain/check/testdata/builtins/print.carbon @@ -60,8 +60,8 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_13.2: type = converted %int.make_type_32, %.loc11_13.1 [template = i32] -// CHECK:STDOUT: %a.loc11_10.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Print.1.%a: i32 = bind_name a, %a.loc11_10.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/access_modifers.carbon b/toolchain/check/testdata/class/access_modifers.carbon index ab035420c1932..16980a945d350 100644 --- a/toolchain/check/testdata/class/access_modifers.carbon +++ b/toolchain/check/testdata/class/access_modifers.carbon @@ -203,14 +203,14 @@ class A { // CHECK:STDOUT: %.loc6_45: i32 = int_literal 5 [template = constants.%.3] // CHECK:STDOUT: %SOME_INTERNAL_CONSTANT: i32 = bind_name SOME_INTERNAL_CONSTANT, %.loc6_45 // CHECK:STDOUT: %SomeInternalFunction.decl: %SomeInternalFunction.type = fn_decl @SomeInternalFunction [template = constants.%SomeInternalFunction] { -// CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc8_40.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] -// CHECK:STDOUT: %.loc8_40.2: type = converted %int.make_type_32.loc8, %.loc8_40.1 [template = i32] -// CHECK:STDOUT: %return.var.loc8: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc8_40.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc8_40.2: type = converted %int.make_type_32, %.loc8_40.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [template = constants.%Circle] -// CHECK:STDOUT: %return.var.loc12: ref %Circle = var +// CHECK:STDOUT: %return: ref %Circle = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -229,15 +229,15 @@ class A { // CHECK:STDOUT: return %.loc9 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Make() -> @Circle.%return.var.loc12: %Circle { +// CHECK:STDOUT: fn @Make() -> %return: %Circle { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc13_23: i32 = int_literal 5 [template = constants.%.3] // CHECK:STDOUT: %.loc13_24.1: %.4 = struct_literal (%.loc13_23) -// CHECK:STDOUT: %.loc13_24.2: ref i32 = class_element_access @Circle.%return.var.loc12, element0 +// CHECK:STDOUT: %.loc13_24.2: ref i32 = class_element_access %return, element0 // CHECK:STDOUT: %.loc13_24.3: init i32 = initialize_from %.loc13_23 to %.loc13_24.2 [template = constants.%.3] -// CHECK:STDOUT: %.loc13_24.4: init %Circle = class_init (%.loc13_24.3), @Circle.%return.var.loc12 [template = constants.%struct] +// CHECK:STDOUT: %.loc13_24.4: init %Circle = class_init (%.loc13_24.3), %return [template = constants.%struct] // CHECK:STDOUT: %.loc13_25: init %Circle = converted %.loc13_24.1, %.loc13_24.4 [template = constants.%struct] -// CHECK:STDOUT: return %.loc13_25 to @Circle.%return.var.loc12 +// CHECK:STDOUT: return %.loc13_25 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { @@ -375,33 +375,33 @@ class A { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Circle { -// CHECK:STDOUT: %int.make_type_32.loc5: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc5_23.1: type = value_of_initializer %int.make_type_32.loc5 [template = i32] -// CHECK:STDOUT: %.loc5_23.2: type = converted %int.make_type_32.loc5, %.loc5_23.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc5_23.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc5_23.2: type = converted %int.make_type_32, %.loc5_23.1 [template = i32] // CHECK:STDOUT: %.loc5_21: %.2 = field_decl radius, element0 [template] // CHECK:STDOUT: %GetRadius.decl: %GetRadius.type = fn_decl @GetRadius [template = constants.%GetRadius] { -// CHECK:STDOUT: %Self.ref.loc7: type = name_ref Self, constants.%Circle [template = constants.%Circle] -// CHECK:STDOUT: %self.loc7_16.1: %Circle = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_16.2: %Circle = bind_name self, %self.loc7_16.1 -// CHECK:STDOUT: %int.make_type_32.loc7: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc7_33.1: type = value_of_initializer %int.make_type_32.loc7 [template = i32] -// CHECK:STDOUT: %.loc7_33.2: type = converted %int.make_type_32.loc7, %.loc7_33.1 [template = i32] -// CHECK:STDOUT: %return.var.loc7: ref i32 = var +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [template = constants.%Circle] +// CHECK:STDOUT: %self.param: %Circle = param self, runtime_param0 +// CHECK:STDOUT: %self: %Circle = bind_name self, %self.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc7_33.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc7_33.2: type = converted %int.make_type_32, %.loc7_33.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %SomeInternalFunction.decl: %SomeInternalFunction.type = fn_decl @SomeInternalFunction [template = constants.%SomeInternalFunction] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_40.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_40.2: type = converted %int.make_type_32.loc11, %.loc11_40.1 [template = i32] -// CHECK:STDOUT: %return.var.loc11: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_40.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_40.2: type = converted %int.make_type_32, %.loc11_40.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Compute.decl: %Compute.type = fn_decl @Compute [template = constants.%Compute] { -// CHECK:STDOUT: %Self.ref.loc15: type = name_ref Self, constants.%Circle [template = constants.%Circle] -// CHECK:STDOUT: %self.loc15_14.1: %Circle = param self, runtime_param0 -// CHECK:STDOUT: %self.loc15_14.2: %Circle = bind_name self, %self.loc15_14.1 -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_31.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_31.2: type = converted %int.make_type_32.loc15, %.loc15_31.1 [template = i32] -// CHECK:STDOUT: %return.var.loc15: ref i32 = var +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [template = constants.%Circle] +// CHECK:STDOUT: %self.param: %Circle = param self, runtime_param0 +// CHECK:STDOUT: %self: %Circle = bind_name self, %self.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_31.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_31.2: type = converted %int.make_type_32, %.loc15_31.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -414,9 +414,9 @@ class A { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @GetRadius[@Circle.%self.loc7_16.2: %Circle]() -> i32 { +// CHECK:STDOUT: fn @GetRadius[%self: %Circle]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Circle = name_ref self, @Circle.%self.loc7_16.2 +// CHECK:STDOUT: %self.ref: %Circle = name_ref self, %self // CHECK:STDOUT: %radius.ref: %.2 = name_ref radius, @Circle.%.loc5_21 [template = @Circle.%.loc5_21] // CHECK:STDOUT: %.loc8_16.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc8_16.2: i32 = bind_value %.loc8_16.1 @@ -429,9 +429,9 @@ class A { // CHECK:STDOUT: return %.loc12 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Compute[@Circle.%self.loc15_14.2: %Circle]() -> i32 { +// CHECK:STDOUT: fn @Compute[%self: %Circle]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Circle = name_ref self, @Circle.%self.loc15_14.2 +// CHECK:STDOUT: %self.ref: %Circle = name_ref self, %self // CHECK:STDOUT: %SomeInternalFunction.ref: %SomeInternalFunction.type = name_ref SomeInternalFunction, @Circle.%SomeInternalFunction.decl [template = constants.%SomeInternalFunction] // CHECK:STDOUT: %SomeInternalFunction.call: init i32 = call %SomeInternalFunction.ref() // CHECK:STDOUT: %.loc16_39.1: i32 = value_of_initializer %SomeInternalFunction.call diff --git a/toolchain/check/testdata/class/adapt.carbon b/toolchain/check/testdata/class/adapt.carbon index 78c30f8a5c13f..834d3f3868d6d 100644 --- a/toolchain/check/testdata/class/adapt.carbon +++ b/toolchain/check/testdata/class/adapt.carbon @@ -165,9 +165,9 @@ fn F(a: AdaptNotExtend) { // CHECK:STDOUT: %Adapted.decl: type = class_decl @Adapted [template = constants.%Adapted] {} // CHECK:STDOUT: %AdaptNotExtend.decl: type = class_decl @AdaptNotExtend [template = constants.%AdaptNotExtend] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %AdaptNotExtend.ref: type = name_ref AdaptNotExtend, %AdaptNotExtend.decl [template = constants.%AdaptNotExtend] -// CHECK:STDOUT: %a.loc12_6.1: %AdaptNotExtend = param a, runtime_param0 -// CHECK:STDOUT: @F.2.%a: %AdaptNotExtend = bind_name a, %a.loc12_6.1 +// CHECK:STDOUT: %AdaptNotExtend.ref: type = name_ref AdaptNotExtend, file.%AdaptNotExtend.decl [template = constants.%AdaptNotExtend] +// CHECK:STDOUT: %a.param: %AdaptNotExtend = param a, runtime_param0 +// CHECK:STDOUT: %a: %AdaptNotExtend = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 5f2f33856b412..b144b606dbbe1 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -84,13 +84,13 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %Derived.ref.loc21: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: @Make.%return: ref %Derived = var +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %return: ref %Derived = var // CHECK:STDOUT: } // CHECK:STDOUT: %Access.decl: %Access.type = fn_decl @Access [template = constants.%Access] { -// CHECK:STDOUT: %Derived.ref.loc25: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: %d.loc25_11.1: %Derived = param d, runtime_param0 -// CHECK:STDOUT: @Access.%d: %Derived = bind_name d, %d.loc25_11.1 +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %d.param: %Derived = param d, runtime_param0 +// CHECK:STDOUT: %d: %Derived = bind_name d, %d.param // CHECK:STDOUT: %int.make_type_32.loc25_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc25_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc25_35.1: %.14 = tuple_literal (%int.make_type_32.loc25_27, %int.make_type_32.loc25_32) @@ -99,7 +99,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: %.loc25_35.4: type = value_of_initializer %int.make_type_32.loc25_32 [template = i32] // CHECK:STDOUT: %.loc25_35.5: type = converted %int.make_type_32.loc25_32, %.loc25_35.4 [template = i32] // CHECK:STDOUT: %.loc25_35.6: type = converted %.loc25_35.1, constants.%.15 [template = constants.%.15] -// CHECK:STDOUT: @Access.%return: ref %.15 = var +// CHECK:STDOUT: %return: ref %.15 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 61399eca8acb5..c67d0c1bede22 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -74,15 +74,15 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %Access.decl: %Access.type = fn_decl @Access [template = constants.%Access] { -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc24_21: type = ptr_type %Derived [template = constants.%.8] -// CHECK:STDOUT: %p.loc24_11.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @Access.%p: %.8 = bind_name p, %p.loc24_11.1 +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc24_30.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc24_30.2: type = converted %int.make_type_32, %.loc24_30.1 [template = i32] // CHECK:STDOUT: %.loc24_30.3: type = ptr_type i32 [template = constants.%.9] -// CHECK:STDOUT: @Access.%return: ref %.9 = var +// CHECK:STDOUT: %return: ref %.9 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index 527854420b142..29a9258bfde54 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -75,18 +75,18 @@ fn Call(p: Derived*) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] +// CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %.loc17_26: type = ptr_type %Base [template = constants.%.3] -// CHECK:STDOUT: %self.loc17_16.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %.3 = bind_name self, %self.loc17_16.1 -// CHECK:STDOUT: @F.%.loc17: %.3 = addr_pattern @F.%self +// CHECK:STDOUT: %self.param.loc17: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc17: %.3 = bind_name self, %self.param.loc17 +// CHECK:STDOUT: %.loc17_11: %.3 = addr_pattern %self.loc17 // CHECK:STDOUT: } // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] { -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc25: type = ptr_type %Derived [template = constants.%.9] -// CHECK:STDOUT: %p.loc25_9.1: %.9 = param p, runtime_param0 -// CHECK:STDOUT: @Call.%p: %.9 = bind_name p, %p.loc25_9.1 +// CHECK:STDOUT: %p.param: %.9 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.9 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -96,11 +96,11 @@ fn Call(p: Derived*) { // CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32, %.loc12_10.1 [template = i32] // CHECK:STDOUT: %.loc12_8: %.2 = field_decl a, element0 [template] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] +// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %.loc14_23: type = ptr_type %Base [template = constants.%.3] -// CHECK:STDOUT: %self.loc14_13.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_13.3: %.3 = bind_name self, %self.loc14_13.1 -// CHECK:STDOUT: %.loc14_8: %.3 = addr_pattern %self.loc14_13.3 +// CHECK:STDOUT: %self.param.loc14: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc14: %.3 = bind_name self, %self.param.loc14 +// CHECK:STDOUT: %.loc14_8: %.3 = addr_pattern %self.loc14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -121,9 +121,9 @@ fn Call(p: Derived*) { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[addr %self: %.3]() { +// CHECK:STDOUT: fn @F[addr %self.loc17: %.3]() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %.3 = name_ref self, %self +// CHECK:STDOUT: %self.ref: %.3 = name_ref self, %self.loc17 // CHECK:STDOUT: %.loc18_4: ref %Base = deref %self.ref // CHECK:STDOUT: %a.ref: %.2 = name_ref a, @Base.%.loc12_8 [template = @Base.%.loc12_8] // CHECK:STDOUT: %.loc18_10: ref i32 = class_element_access %.loc18_4, element0 diff --git a/toolchain/check/testdata/class/base_method_qualified.carbon b/toolchain/check/testdata/class/base_method_qualified.carbon index 0e28dc09fb1be..e7584c0a82631 100644 --- a/toolchain/check/testdata/class/base_method_qualified.carbon +++ b/toolchain/check/testdata/class/base_method_qualified.carbon @@ -101,42 +101,42 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Derived.decl.loc18: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] { -// CHECK:STDOUT: %Derived.ref.loc25: type = name_ref Derived, %Derived.decl.loc11 [template = constants.%Derived] -// CHECK:STDOUT: %a.loc25_9.1: %Derived = param a, runtime_param0 -// CHECK:STDOUT: @Call.%a: %Derived = bind_name a, %a.loc25_9.1 -// CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc25_24.1: type = value_of_initializer %int.make_type_32.loc25 [template = i32] -// CHECK:STDOUT: %.loc25_24.2: type = converted %int.make_type_32.loc25, %.loc25_24.1 [template = i32] -// CHECK:STDOUT: @Call.%return: ref i32 = var +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc11 [template = constants.%Derived] +// CHECK:STDOUT: %a.param: %Derived = param a, runtime_param0 +// CHECK:STDOUT: %a: %Derived = bind_name a, %a.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc25_24.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc25_24.2: type = converted %int.make_type_32, %.loc25_24.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallIndirect.decl: %CallIndirect.type = fn_decl @CallIndirect [template = constants.%CallIndirect] { -// CHECK:STDOUT: %Derived.ref.loc29: type = name_ref Derived, %Derived.decl.loc11 [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc11 [template = constants.%Derived] // CHECK:STDOUT: %.loc29_27: type = ptr_type %Derived [template = constants.%.8] -// CHECK:STDOUT: %p.loc29_17.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @CallIndirect.%p: %.8 = bind_name p, %p.loc29_17.1 -// CHECK:STDOUT: %int.make_type_32.loc29: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc29_33.1: type = value_of_initializer %int.make_type_32.loc29 [template = i32] -// CHECK:STDOUT: %.loc29_33.2: type = converted %int.make_type_32.loc29, %.loc29_33.1 [template = i32] -// CHECK:STDOUT: @CallIndirect.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc29_33.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc29_33.2: type = converted %int.make_type_32, %.loc29_33.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %PassDerivedToBase.decl: %PassDerivedToBase.type = fn_decl @PassDerivedToBase [template = constants.%PassDerivedToBase] { -// CHECK:STDOUT: %Derived.ref.loc33: type = name_ref Derived, %Derived.decl.loc11 [template = constants.%Derived] -// CHECK:STDOUT: %a.loc33_22.1: %Derived = param a, runtime_param0 -// CHECK:STDOUT: @PassDerivedToBase.%a: %Derived = bind_name a, %a.loc33_22.1 -// CHECK:STDOUT: %int.make_type_32.loc33: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc33_37.1: type = value_of_initializer %int.make_type_32.loc33 [template = i32] -// CHECK:STDOUT: %.loc33_37.2: type = converted %int.make_type_32.loc33, %.loc33_37.1 [template = i32] -// CHECK:STDOUT: @PassDerivedToBase.%return: ref i32 = var +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc11 [template = constants.%Derived] +// CHECK:STDOUT: %a.param: %Derived = param a, runtime_param0 +// CHECK:STDOUT: %a: %Derived = bind_name a, %a.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc33_37.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc33_37.2: type = converted %int.make_type_32, %.loc33_37.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %PassDerivedToBaseIndirect.decl: %PassDerivedToBaseIndirect.type = fn_decl @PassDerivedToBaseIndirect [template = constants.%PassDerivedToBaseIndirect] { -// CHECK:STDOUT: %Derived.ref.loc37: type = name_ref Derived, %Derived.decl.loc11 [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc11 [template = constants.%Derived] // CHECK:STDOUT: %.loc37_40: type = ptr_type %Derived [template = constants.%.8] -// CHECK:STDOUT: %p.loc37_30.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @PassDerivedToBaseIndirect.%p: %.8 = bind_name p, %p.loc37_30.1 -// CHECK:STDOUT: %int.make_type_32.loc37: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc37_46.1: type = value_of_initializer %int.make_type_32.loc37 [template = i32] -// CHECK:STDOUT: %.loc37_46.2: type = converted %int.make_type_32.loc37, %.loc37_46.1 [template = i32] -// CHECK:STDOUT: @PassDerivedToBaseIndirect.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc37_46.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc37_46.2: type = converted %int.make_type_32, %.loc37_46.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -144,14 +144,14 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc19: %.4 = base_decl %Base, element0 [template] // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Derived [template = constants.%Derived] -// CHECK:STDOUT: %self.loc21_8.1: %Derived = param self, runtime_param0 -// CHECK:STDOUT: %self.loc21_8.2: %Derived = bind_name self, %self.loc21_8.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [template = constants.%Derived] +// CHECK:STDOUT: %self.param: %Derived = param self, runtime_param0 +// CHECK:STDOUT: %self: %Derived = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type.2 = fn_decl @G.2 [template = constants.%G.2] { -// CHECK:STDOUT: %Self.ref.loc22: type = name_ref Self, constants.%Derived [template = constants.%Derived] -// CHECK:STDOUT: %self.loc22_8.1: %Derived = param self, runtime_param0 -// CHECK:STDOUT: %self.loc22_8.2: %Derived = bind_name self, %self.loc22_8.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Derived [template = constants.%Derived] +// CHECK:STDOUT: %self.param: %Derived = param self, runtime_param0 +// CHECK:STDOUT: %self: %Derived = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -165,21 +165,21 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: class @Base { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] -// CHECK:STDOUT: %self.loc14_8.1: %Base = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_8.2: %Base = bind_name self, %self.loc14_8.1 -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_25.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_25.2: type = converted %int.make_type_32.loc14, %.loc14_25.1 [template = i32] -// CHECK:STDOUT: %return.var.loc14: ref i32 = var +// CHECK:STDOUT: %self.param: %Base = param self, runtime_param0 +// CHECK:STDOUT: %self: %Base = bind_name self, %self.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_25.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_25.2: type = converted %int.make_type_32, %.loc14_25.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type.1 = fn_decl @G.1 [template = constants.%G.1] { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl.loc11 [template = constants.%Derived] -// CHECK:STDOUT: %self.loc15_8.1: %Derived = param self, runtime_param0 -// CHECK:STDOUT: %self.loc15_8.2: %Derived = bind_name self, %self.loc15_8.1 -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_28.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_28.2: type = converted %int.make_type_32.loc15, %.loc15_28.1 [template = i32] -// CHECK:STDOUT: %return.var.loc15: ref i32 = var +// CHECK:STDOUT: %self.param: %Derived = param self, runtime_param0 +// CHECK:STDOUT: %self: %Derived = bind_name self, %self.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_28.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_28.2: type = converted %int.make_type_32, %.loc15_28.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -190,13 +190,13 @@ fn PassDerivedToBaseIndirect(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1[@Base.%self.loc14_8.2: %Base]() -> i32; +// CHECK:STDOUT: fn @F.1[%self: %Base]() -> i32; // CHECK:STDOUT: -// CHECK:STDOUT: fn @G.1[@Base.%self.loc15_8.2: %Derived]() -> i32; +// CHECK:STDOUT: fn @G.1[%self: %Derived]() -> i32; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[@Derived.%self.loc21_8.2: %Derived](); +// CHECK:STDOUT: fn @F.2[%self: %Derived](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G.2[@Derived.%self.loc22_8.2: %Derived](); +// CHECK:STDOUT: fn @G.2[%self: %Derived](); // CHECK:STDOUT: // CHECK:STDOUT: fn @Call(%a: %Derived) -> i32 { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index 1797652342f1d..cc48dc179e464 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -94,22 +94,22 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] { -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc29_13: type = ptr_type %A [template = constants.%.1] -// CHECK:STDOUT: %a.loc29_9.1: %.1 = param a, runtime_param0 -// CHECK:STDOUT: @Call.%a: %.1 = bind_name a, %a.loc29_9.1 -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %a.param: %.1 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.1 = bind_name a, %a.param +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc29_20: type = ptr_type %B [template = constants.%.6] -// CHECK:STDOUT: %b.loc29_16.1: %.6 = param b, runtime_param1 -// CHECK:STDOUT: @Call.%b: %.6 = bind_name b, %b.loc29_16.1 -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %.6 = param b, runtime_param1 +// CHECK:STDOUT: %b: %.6 = bind_name b, %b.param +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc29_27: type = ptr_type %C [template = constants.%.11] -// CHECK:STDOUT: %c.loc29_23.1: %.11 = param c, runtime_param2 -// CHECK:STDOUT: @Call.%c: %.11 = bind_name c, %c.loc29_23.1 -// CHECK:STDOUT: %D.ref: type = name_ref D, %D.decl [template = constants.%D] +// CHECK:STDOUT: %c.param: %.11 = param c, runtime_param2 +// CHECK:STDOUT: %c: %.11 = bind_name c, %c.param +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] // CHECK:STDOUT: %.loc29_34: type = ptr_type %D [template = constants.%.14] -// CHECK:STDOUT: %d.loc29_30.1: %.14 = param d, runtime_param3 -// CHECK:STDOUT: @Call.%d: %.14 = bind_name d, %d.loc29_30.1 +// CHECK:STDOUT: %d.param: %.14 = param d, runtime_param3 +// CHECK:STDOUT: %d: %.14 = bind_name d, %d.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -117,9 +117,9 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%A [template = constants.%A] // CHECK:STDOUT: %.loc12_23: type = ptr_type %A [template = constants.%.1] -// CHECK:STDOUT: %self.loc12_13.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_13.3: %.1 = bind_name self, %self.loc12_13.1 -// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self.loc12_13.3 +// CHECK:STDOUT: %self.param: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.1 = bind_name self, %self.param +// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -133,9 +133,9 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [template = constants.%B] // CHECK:STDOUT: %.loc17_23: type = ptr_type %B [template = constants.%.6] -// CHECK:STDOUT: %self.loc17_13.1: %.6 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc17_13.3: %.6 = bind_name self, %self.loc17_13.1 -// CHECK:STDOUT: %.loc17_8: %.6 = addr_pattern %self.loc17_13.3 +// CHECK:STDOUT: %self.param: %.6 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.6 = bind_name self, %self.param +// CHECK:STDOUT: %.loc17_8: %.6 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -151,9 +151,9 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %F.decl: %F.type.3 = fn_decl @F.3 [template = constants.%F.3] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] // CHECK:STDOUT: %.loc22_23: type = ptr_type %C [template = constants.%.11] -// CHECK:STDOUT: %self.loc22_13.1: %.11 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc22_13.3: %.11 = bind_name self, %self.loc22_13.1 -// CHECK:STDOUT: %.loc22_8: %.11 = addr_pattern %self.loc22_13.3 +// CHECK:STDOUT: %self.param: %.11 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.11 = bind_name self, %self.param +// CHECK:STDOUT: %.loc22_8: %.11 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -173,11 +173,11 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: extend name_scope3 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1[addr @A.%self.loc12_13.3: %.1](); +// CHECK:STDOUT: fn @F.1[addr %self: %.1](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[addr @B.%self.loc17_13.3: %.6](); +// CHECK:STDOUT: fn @F.2[addr %self: %.6](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.3[addr @C.%self.loc22_13.3: %.11](); +// CHECK:STDOUT: fn @F.3[addr %self: %.11](); // CHECK:STDOUT: // CHECK:STDOUT: fn @Call(%a: %.1, %b: %.6, %c: %.11, %d: %.14) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index f1e23316f8f1c..2dffef8323f86 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -72,18 +72,18 @@ fn Run() -> i32 { // CHECK:STDOUT: %int.make_type_32.loc21_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_15.1: type = value_of_initializer %int.make_type_32.loc21_15 [template = i32] // CHECK:STDOUT: %.loc21_15.2: type = converted %int.make_type_32.loc21_15, %.loc21_15.1 [template = i32] -// CHECK:STDOUT: %n.loc21_12.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @G.%n: i32 = bind_name n, %n.loc21_12.1 +// CHECK:STDOUT: %n.param.loc21: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc21: i32 = bind_name n, %n.param.loc21 // CHECK:STDOUT: %int.make_type_32.loc21_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_23.1: type = value_of_initializer %int.make_type_32.loc21_23 [template = i32] // CHECK:STDOUT: %.loc21_23.2: type = converted %int.make_type_32.loc21_23, %.loc21_23.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] { -// CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc25_13.1: type = value_of_initializer %int.make_type_32.loc25 [template = i32] -// CHECK:STDOUT: %.loc25_13.2: type = converted %int.make_type_32.loc25, %.loc25_13.1 [template = i32] -// CHECK:STDOUT: @Run.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc25_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc25_13.2: type = converted %int.make_type_32, %.loc25_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -92,27 +92,27 @@ fn Run() -> i32 { // CHECK:STDOUT: %int.make_type_32.loc12_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32.loc12_11 [template = i32] // CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32.loc12_11, %.loc12_11.1 [template = i32] -// CHECK:STDOUT: %n.loc12_8.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: %n.loc12_8.2: i32 = bind_name n, %n.loc12_8.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc12_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_19.1: type = value_of_initializer %int.make_type_32.loc12_19 [template = i32] // CHECK:STDOUT: %.loc12_19.2: type = converted %int.make_type_32.loc12_19, %.loc12_19.1 [template = i32] -// CHECK:STDOUT: %return.var.loc12: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %int.make_type_32.loc16_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %int.make_type_32.loc16_11 [template = i32] // CHECK:STDOUT: %.loc16_11.2: type = converted %int.make_type_32.loc16_11, %.loc16_11.1 [template = i32] -// CHECK:STDOUT: %n.loc16_8.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: %n.loc16_8.2: i32 = bind_name n, %n.loc16_8.1 +// CHECK:STDOUT: %n.param.loc16: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc16: i32 = bind_name n, %n.param.loc16 // CHECK:STDOUT: %int.make_type_32.loc16_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_19.1: type = value_of_initializer %int.make_type_32.loc16_19 [template = i32] // CHECK:STDOUT: %.loc16_19.2: type = converted %int.make_type_32.loc16_19, %.loc16_19.1 [template = i32] // CHECK:STDOUT: %return.var.loc16: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_10.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] -// CHECK:STDOUT: %.loc18_10.2: type = converted %int.make_type_32.loc18, %.loc18_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc18_10.2: type = converted %int.make_type_32, %.loc18_10.1 [template = i32] // CHECK:STDOUT: %.loc18_8: %.2 = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -124,15 +124,15 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F(@Class.%n.loc12_8.2: i32) -> i32 { +// CHECK:STDOUT: fn @F(%n: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: i32 = name_ref n, @Class.%n.loc12_8.2 +// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @G(%n: i32) -> i32 { +// CHECK:STDOUT: fn @G(%n.loc21: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n +// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n.loc21 // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/complete_in_member_fn.carbon b/toolchain/check/testdata/class/complete_in_member_fn.carbon index 44bfc58af4138..89bc3cd496dd0 100644 --- a/toolchain/check/testdata/class/complete_in_member_fn.carbon +++ b/toolchain/check/testdata/class/complete_in_member_fn.carbon @@ -55,16 +55,16 @@ class C { // CHECK:STDOUT: class @C { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %c.loc12_8.1: %C = param c, runtime_param0 -// CHECK:STDOUT: %c.loc12_8.2: %C = bind_name c, %c.loc12_8.1 -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_17.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_17.2: type = converted %int.make_type_32.loc12, %.loc12_17.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_17.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_17.2: type = converted %int.make_type_32, %.loc12_17.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_10.2: type = converted %int.make_type_32.loc14, %.loc14_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_10.2: type = converted %int.make_type_32, %.loc14_10.1 [template = i32] // CHECK:STDOUT: %.loc14_8: %.2 = field_decl a, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -75,9 +75,9 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F(@C.%c.loc12_8.2: %C) -> i32 { +// CHECK:STDOUT: fn @F(%c: %C) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %c.ref: %C = name_ref c, @C.%c.loc12_8.2 +// CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %a.ref: %.2 = name_ref a, @C.%.loc14_8 [template = @C.%.loc14_8] // CHECK:STDOUT: %.loc12_31.1: ref i32 = class_element_access %c.ref, element0 // CHECK:STDOUT: %.loc12_31.2: i32 = bind_value %.loc12_31.1 diff --git a/toolchain/check/testdata/class/compound_field.carbon b/toolchain/check/testdata/class/compound_field.carbon index 9c42115e087bb..bf8e1afecb89d 100644 --- a/toolchain/check/testdata/class/compound_field.carbon +++ b/toolchain/check/testdata/class/compound_field.carbon @@ -95,44 +95,44 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %AccessDerived.decl: %AccessDerived.type = fn_decl @AccessDerived [template = constants.%AccessDerived] { -// CHECK:STDOUT: %Derived.ref.loc24: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: %d.loc24_18.1: %Derived = param d, runtime_param0 -// CHECK:STDOUT: @AccessDerived.%d: %Derived = bind_name d, %d.loc24_18.1 -// CHECK:STDOUT: %int.make_type_32.loc24: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc24_33.1: type = value_of_initializer %int.make_type_32.loc24 [template = i32] -// CHECK:STDOUT: %.loc24_33.2: type = converted %int.make_type_32.loc24, %.loc24_33.1 [template = i32] -// CHECK:STDOUT: @AccessDerived.%return: ref i32 = var +// CHECK:STDOUT: %Derived.ref.loc24: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %d.param: %Derived = param d, runtime_param0 +// CHECK:STDOUT: %d: %Derived = bind_name d, %d.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc24_33.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc24_33.2: type = converted %int.make_type_32, %.loc24_33.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessBase.decl: %AccessBase.type = fn_decl @AccessBase [template = constants.%AccessBase] { -// CHECK:STDOUT: %Derived.ref.loc28: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: %d.loc28_15.1: %Derived = param d, runtime_param0 -// CHECK:STDOUT: @AccessBase.%d: %Derived = bind_name d, %d.loc28_15.1 -// CHECK:STDOUT: %int.make_type_32.loc28: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc28_30.1: type = value_of_initializer %int.make_type_32.loc28 [template = i32] -// CHECK:STDOUT: %.loc28_30.2: type = converted %int.make_type_32.loc28, %.loc28_30.1 [template = i32] -// CHECK:STDOUT: @AccessBase.%return: ref i32 = var +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %d.param: %Derived = param d, runtime_param0 +// CHECK:STDOUT: %d: %Derived = bind_name d, %d.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc28_30.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc28_30.2: type = converted %int.make_type_32, %.loc28_30.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessDerivedIndirect.decl: %AccessDerivedIndirect.type = fn_decl @AccessDerivedIndirect [template = constants.%AccessDerivedIndirect] { -// CHECK:STDOUT: %Derived.ref.loc32: type = name_ref Derived, %Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref.loc32: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc32_36: type = ptr_type %Derived [template = constants.%.11] -// CHECK:STDOUT: %p.loc32_26.1: %.11 = param p, runtime_param0 -// CHECK:STDOUT: @AccessDerivedIndirect.%p: %.11 = bind_name p, %p.loc32_26.1 -// CHECK:STDOUT: %int.make_type_32.loc32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc32_45.1: type = value_of_initializer %int.make_type_32.loc32 [template = i32] -// CHECK:STDOUT: %.loc32_45.2: type = converted %int.make_type_32.loc32, %.loc32_45.1 [template = i32] +// CHECK:STDOUT: %p.param: %.11 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.11 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc32_45.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc32_45.2: type = converted %int.make_type_32, %.loc32_45.1 [template = i32] // CHECK:STDOUT: %.loc32_45.3: type = ptr_type i32 [template = constants.%.12] -// CHECK:STDOUT: @AccessDerivedIndirect.%return: ref %.12 = var +// CHECK:STDOUT: %return: ref %.12 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessBaseIndirect.decl: %AccessBaseIndirect.type = fn_decl @AccessBaseIndirect [template = constants.%AccessBaseIndirect] { -// CHECK:STDOUT: %Derived.ref.loc36: type = name_ref Derived, %Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc36_33: type = ptr_type %Derived [template = constants.%.11] -// CHECK:STDOUT: %p.loc36_23.1: %.11 = param p, runtime_param0 -// CHECK:STDOUT: @AccessBaseIndirect.%p: %.11 = bind_name p, %p.loc36_23.1 -// CHECK:STDOUT: %int.make_type_32.loc36: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc36_42.1: type = value_of_initializer %int.make_type_32.loc36 [template = i32] -// CHECK:STDOUT: %.loc36_42.2: type = converted %int.make_type_32.loc36, %.loc36_42.1 [template = i32] +// CHECK:STDOUT: %p.param: %.11 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.11 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc36_42.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc36_42.2: type = converted %int.make_type_32, %.loc36_42.1 [template = i32] // CHECK:STDOUT: %.loc36_42.3: type = ptr_type i32 [template = constants.%.12] -// CHECK:STDOUT: @AccessBaseIndirect.%return: ref %.12 = var +// CHECK:STDOUT: %return: ref %.12 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -182,7 +182,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: fn @AccessDerived(%d: %Derived) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %d.ref.loc25_10: %Derived = name_ref d, %d -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref.loc25: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %d.ref.loc25_20: %.6 = name_ref d, @Derived.%.loc20_8 [template = @Derived.%.loc20_8] // CHECK:STDOUT: %.loc25_11.1: ref i32 = class_element_access %d.ref.loc25_10, element1 // CHECK:STDOUT: %.loc25_11.2: i32 = bind_value %.loc25_11.1 @@ -204,7 +204,7 @@ fn AccessBaseIndirect(p: Derived*) -> i32* { // CHECK:STDOUT: fn @AccessDerivedIndirect(%p: %.11) -> %.12 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.11 = name_ref p, %p -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref.loc33: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %d.ref: %.6 = name_ref d, @Derived.%.loc20_8 [template = @Derived.%.loc20_8] // CHECK:STDOUT: %.loc33_12.1: ref %Derived = deref %p.ref // CHECK:STDOUT: %.loc33_12.2: ref i32 = class_element_access %.loc33_12.1, element1 diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index f639a02da413e..8055aa7fe73a2 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -120,45 +120,45 @@ fn ConvertInit() { // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %ConvertCToB.decl: %ConvertCToB.type = fn_decl @ConvertCToB [template = constants.%ConvertCToB] { -// CHECK:STDOUT: %C.ref.loc25: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc25_20: type = ptr_type %C [template = constants.%.14] -// CHECK:STDOUT: %p.loc25_16.1: %.14 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertCToB.%p: %.14 = bind_name p, %p.loc25_16.1 -// CHECK:STDOUT: %B.ref.loc25: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %p.param: %.14 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.14 = bind_name p, %p.param +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc25_27: type = ptr_type %B [template = constants.%.15] -// CHECK:STDOUT: @ConvertCToB.%return: ref %.15 = var +// CHECK:STDOUT: %return: ref %.15 = var // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertBToA.decl: %ConvertBToA.type = fn_decl @ConvertBToA [template = constants.%ConvertBToA] { -// CHECK:STDOUT: %B.ref.loc26: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc26_20: type = ptr_type %B [template = constants.%.15] -// CHECK:STDOUT: %p.loc26_16.1: %.15 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertBToA.%p: %.15 = bind_name p, %p.loc26_16.1 -// CHECK:STDOUT: %A.ref.loc26: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %p.param: %.15 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.15 = bind_name p, %p.param +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc26_27: type = ptr_type %A [template = constants.%.19] -// CHECK:STDOUT: @ConvertBToA.%return: ref %.19 = var +// CHECK:STDOUT: %return: ref %.19 = var // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertCToA.decl: %ConvertCToA.type = fn_decl @ConvertCToA [template = constants.%ConvertCToA] { -// CHECK:STDOUT: %C.ref.loc27: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc27_20: type = ptr_type %C [template = constants.%.14] -// CHECK:STDOUT: %p.loc27_16.1: %.14 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertCToA.%p: %.14 = bind_name p, %p.loc27_16.1 -// CHECK:STDOUT: %A.ref.loc27: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %p.param: %.14 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.14 = bind_name p, %p.param +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc27_27: type = ptr_type %A [template = constants.%.19] -// CHECK:STDOUT: @ConvertCToA.%return: ref %.19 = var +// CHECK:STDOUT: %return: ref %.19 = var // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertValue.decl: %ConvertValue.type = fn_decl @ConvertValue [template = constants.%ConvertValue] { -// CHECK:STDOUT: %C.ref.loc29: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %c.loc29_17.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @ConvertValue.%c: %C = bind_name c, %c.loc29_17.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertRef.decl: %ConvertRef.type = fn_decl @ConvertRef [template = constants.%ConvertRef] { -// CHECK:STDOUT: %C.ref.loc33: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc33_19: type = ptr_type %C [template = constants.%.14] -// CHECK:STDOUT: %c.loc33_15.1: %.14 = param c, runtime_param0 -// CHECK:STDOUT: @ConvertRef.%c: %.14 = bind_name c, %c.loc33_15.1 -// CHECK:STDOUT: %A.ref.loc33: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %c.param: %.14 = param c, runtime_param0 +// CHECK:STDOUT: %c: %.14 = bind_name c, %c.param +// CHECK:STDOUT: %A.ref.loc33: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc33_26: type = ptr_type %A [template = constants.%.19] -// CHECK:STDOUT: @ConvertRef.%return: ref %.19 = var +// CHECK:STDOUT: %return: ref %.19 = var // CHECK:STDOUT: } // CHECK:STDOUT: %ConvertInit.decl: %ConvertInit.type = fn_decl @ConvertInit [template = constants.%ConvertInit] {} // CHECK:STDOUT: } @@ -253,7 +253,7 @@ fn ConvertInit() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %.14 = name_ref c, %c // CHECK:STDOUT: %.loc34_12: ref %C = deref %c.ref -// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %A.ref.loc34: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc34_15.1: ref %B = class_element_access %.loc34_12, element0 // CHECK:STDOUT: %.loc34_15.2: ref %A = class_element_access %.loc34_15.1, element0 // CHECK:STDOUT: %.loc34_15.3: ref %A = converted %.loc34_12, %.loc34_15.2 diff --git a/toolchain/check/testdata/class/extend_adapt.carbon b/toolchain/check/testdata/class/extend_adapt.carbon index 3d66737006e34..870d51e57fd10 100644 --- a/toolchain/check/testdata/class/extend_adapt.carbon +++ b/toolchain/check/testdata/class/extend_adapt.carbon @@ -145,14 +145,14 @@ class StructAdapter { // CHECK:STDOUT: %SomeClass.decl: type = class_decl @SomeClass [template = constants.%SomeClass] {} // CHECK:STDOUT: %SomeClassAdapter.decl.loc15: type = class_decl @SomeClassAdapter [template = constants.%SomeClassAdapter] {} // CHECK:STDOUT: %TestStaticMemberFunction.decl: %TestStaticMemberFunction.type = fn_decl @TestStaticMemberFunction [template = constants.%TestStaticMemberFunction] { -// CHECK:STDOUT: %SomeClassAdapter.ref.loc19: type = name_ref SomeClassAdapter, %SomeClassAdapter.decl.loc4 [template = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a.loc19_29.1: %SomeClassAdapter = param a, runtime_param0 -// CHECK:STDOUT: @TestStaticMemberFunction.%a: %SomeClassAdapter = bind_name a, %a.loc19_29.1 +// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [template = constants.%SomeClassAdapter] +// CHECK:STDOUT: %a.param: %SomeClassAdapter = param a, runtime_param0 +// CHECK:STDOUT: %a: %SomeClassAdapter = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %TestAdapterMethod.decl: %TestAdapterMethod.type = fn_decl @TestAdapterMethod [template = constants.%TestAdapterMethod] { -// CHECK:STDOUT: %SomeClassAdapter.ref.loc23: type = name_ref SomeClassAdapter, %SomeClassAdapter.decl.loc4 [template = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a.loc23_22.1: %SomeClassAdapter = param a, runtime_param0 -// CHECK:STDOUT: @TestAdapterMethod.%a: %SomeClassAdapter = bind_name a, %a.loc23_22.1 +// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [template = constants.%SomeClassAdapter] +// CHECK:STDOUT: %a.param: %SomeClassAdapter = param a, runtime_param0 +// CHECK:STDOUT: %a: %SomeClassAdapter = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -177,8 +177,8 @@ class StructAdapter { // CHECK:STDOUT: %StaticMemberFunction.decl: %StaticMemberFunction.type = fn_decl @StaticMemberFunction [template = constants.%StaticMemberFunction] {} // CHECK:STDOUT: %AdapterMethod.decl: %AdapterMethod.type = fn_decl @AdapterMethod [template = constants.%AdapterMethod] { // CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl.loc4 [template = constants.%SomeClassAdapter] -// CHECK:STDOUT: %self.loc12_20.1: %SomeClassAdapter = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_20.2: %SomeClassAdapter = bind_name self, %self.loc12_20.1 +// CHECK:STDOUT: %self.param: %SomeClassAdapter = param self, runtime_param0 +// CHECK:STDOUT: %self: %SomeClassAdapter = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -193,7 +193,7 @@ class StructAdapter { // CHECK:STDOUT: // CHECK:STDOUT: fn @StaticMemberFunction(); // CHECK:STDOUT: -// CHECK:STDOUT: fn @AdapterMethod[@SomeClass.%self.loc12_20.2: %SomeClassAdapter](); +// CHECK:STDOUT: fn @AdapterMethod[%self: %SomeClassAdapter](); // CHECK:STDOUT: // CHECK:STDOUT: fn @TestStaticMemberFunction(%a: %SomeClassAdapter) { // CHECK:STDOUT: !entry: @@ -273,9 +273,9 @@ class StructAdapter { // CHECK:STDOUT: %SomeClass.decl: type = class_decl @SomeClass [template = constants.%SomeClass] {} // CHECK:STDOUT: %SomeClassAdapter.decl: type = class_decl @SomeClassAdapter [template = constants.%SomeClassAdapter] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, %SomeClassAdapter.decl [template = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a.loc12_6.1: %SomeClassAdapter = param a, runtime_param0 -// CHECK:STDOUT: @F.2.%a: %SomeClassAdapter = bind_name a, %a.loc12_6.1 +// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl [template = constants.%SomeClassAdapter] +// CHECK:STDOUT: %a.param: %SomeClassAdapter = param a, runtime_param0 +// CHECK:STDOUT: %a: %SomeClassAdapter = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -301,8 +301,8 @@ class StructAdapter { // CHECK:STDOUT: class @SomeClass { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%SomeClass [template = constants.%SomeClass] -// CHECK:STDOUT: %self.loc5_8.1: %SomeClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc5_8.2: %SomeClass = bind_name self, %self.loc5_8.1 +// CHECK:STDOUT: %self.param: %SomeClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %SomeClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -319,7 +319,7 @@ class StructAdapter { // CHECK:STDOUT: extend name_scope2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1[@SomeClass.%self.loc5_8.2: %SomeClass](); +// CHECK:STDOUT: fn @F.1[%self: %SomeClass](); // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(%a: %SomeClassAdapter) { // CHECK:STDOUT: !entry: @@ -436,13 +436,13 @@ class StructAdapter { // CHECK:STDOUT: %SomeClass.decl: type = class_decl @SomeClass [template = constants.%SomeClass] {} // CHECK:STDOUT: %SomeClassAdapter.decl: type = class_decl @SomeClassAdapter [template = constants.%SomeClassAdapter] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, %SomeClassAdapter.decl [template = constants.%SomeClassAdapter] -// CHECK:STDOUT: %a.loc13_6.1: %SomeClassAdapter = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: %SomeClassAdapter = bind_name a, %a.loc13_6.1 +// CHECK:STDOUT: %SomeClassAdapter.ref: type = name_ref SomeClassAdapter, file.%SomeClassAdapter.decl [template = constants.%SomeClassAdapter] +// CHECK:STDOUT: %a.param: %SomeClassAdapter = param a, runtime_param0 +// CHECK:STDOUT: %a: %SomeClassAdapter = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_30.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc13_30.2: type = converted %int.make_type_32, %.loc13_30.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index 43559eaf94f42..67f14c44fa52c 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -86,13 +86,13 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: %Abstract.decl: type = class_decl @Abstract [template = constants.%Abstract] {} // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %Derived.ref.loc21: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: @Make.%return: ref %Derived = var +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %return: ref %Derived = var // CHECK:STDOUT: } // CHECK:STDOUT: %Access.decl: %Access.type = fn_decl @Access [template = constants.%Access] { -// CHECK:STDOUT: %Derived.ref.loc29: type = name_ref Derived, %Derived.decl [template = constants.%Derived] -// CHECK:STDOUT: %d.loc29_11.1: %Derived = param d, runtime_param0 -// CHECK:STDOUT: @Access.%d: %Derived = bind_name d, %d.loc29_11.1 +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %d.param: %Derived = param d, runtime_param0 +// CHECK:STDOUT: %d: %Derived = bind_name d, %d.param // CHECK:STDOUT: %int.make_type_32.loc29_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc29_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc29_35.1: %.14 = tuple_literal (%int.make_type_32.loc29_27, %int.make_type_32.loc29_32) @@ -101,7 +101,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: %.loc29_35.4: type = value_of_initializer %int.make_type_32.loc29_32 [template = i32] // CHECK:STDOUT: %.loc29_35.5: type = converted %int.make_type_32.loc29_32, %.loc29_35.4 [template = i32] // CHECK:STDOUT: %.loc29_35.6: type = converted %.loc29_35.1, constants.%.15 [template = constants.%.15] -// CHECK:STDOUT: @Access.%return: ref %.15 = var +// CHECK:STDOUT: %return: ref %.15 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_adapt_bad_decl.carbon b/toolchain/check/testdata/class/fail_adapt_bad_decl.carbon index 3f67a030456f6..ed6bf48e81acd 100644 --- a/toolchain/check/testdata/class/fail_adapt_bad_decl.carbon +++ b/toolchain/check/testdata/class/fail_adapt_bad_decl.carbon @@ -157,9 +157,9 @@ class C { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Bad.decl: type = class_decl @Bad [template = constants.%Bad] {} // CHECK:STDOUT: %Use.decl: %Use.type = fn_decl @Use [template = constants.%Use] { -// CHECK:STDOUT: %Bad.ref: type = name_ref Bad, %Bad.decl [template = constants.%Bad] -// CHECK:STDOUT: %b.loc19_8.1: %Bad = param b, runtime_param0 -// CHECK:STDOUT: @Use.%b: %Bad = bind_name b, %b.loc19_8.1 +// CHECK:STDOUT: %Bad.ref: type = name_ref Bad, file.%Bad.decl [template = constants.%Bad] +// CHECK:STDOUT: %b.param: %Bad = param b, runtime_param0 +// CHECK:STDOUT: %b: %Bad = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -294,9 +294,9 @@ class C { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Bad.decl: type = class_decl @Bad [template = constants.%Bad] {} // CHECK:STDOUT: %Use.decl: %Use.type = fn_decl @Use [template = constants.%Use] { -// CHECK:STDOUT: %Bad.ref: type = name_ref Bad, %Bad.decl [template = constants.%Bad] -// CHECK:STDOUT: %b.loc16_8.1: %Bad = param b, runtime_param0 -// CHECK:STDOUT: @Use.%b: %Bad = bind_name b, %b.loc16_8.1 +// CHECK:STDOUT: %Bad.ref: type = name_ref Bad, file.%Bad.decl [template = constants.%Bad] +// CHECK:STDOUT: %b.param: %Bad = param b, runtime_param0 +// CHECK:STDOUT: %b: %Bad = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index 4b3f69a5f0669..2001efa52bf67 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -58,16 +58,16 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Class.ref.loc16: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc16: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %a.loc16_13.1: %.1 = param a, runtime_param0 -// CHECK:STDOUT: %a.loc16_13.2: %.1 = bind_name a, %a.loc16_13.1 +// CHECK:STDOUT: %a.param: %.1 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.1 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Class.ref.loc21: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc21: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %b.loc21_13.1: %.1 = param b, runtime_param0 -// CHECK:STDOUT: %b.loc21_13.2: %.1 = bind_name b, %b.loc21_13.1 +// CHECK:STDOUT: %b.param: %.1 = param b, runtime_param0 +// CHECK:STDOUT: %b: %.1 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -76,7 +76,7 @@ class Class { // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[@Class.%a.loc16_13.2: %.1](); +// CHECK:STDOUT: fn @F[%a: %.1](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G(@Class.%b.loc21_13.2: %.1); +// CHECK:STDOUT: fn @G(%b: %.1); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index f616994e6ae3e..96d2374bf85bd 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -108,13 +108,13 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %Class.ref.loc16_9: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc16_6.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @F.2.%c: %Class = bind_name c, %c.loc16_6.1 -// CHECK:STDOUT: %Class.ref.loc16_19: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref.loc16_9: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param +// CHECK:STDOUT: %Class.ref.loc16_19: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc16: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %p.loc16_16.1: %.1 = param p, runtime_param1 -// CHECK:STDOUT: @F.2.%p: %.1 = bind_name p, %p.loc16_16.1 +// CHECK:STDOUT: %p.param: %.1 = param p, runtime_param1 +// CHECK:STDOUT: %p: %.1 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -139,17 +139,17 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { -// CHECK:STDOUT: %Class.ref.loc12: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc12_24: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %self.loc12_13.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_13.3: %.1 = bind_name self, %self.loc12_13.1 -// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self.loc12_13.3 +// CHECK:STDOUT: %self.param: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.1 = bind_name self, %self.param +// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Class.ref.loc13: type = name_ref Class, file.%Class.decl [template = constants.%Class] -// CHECK:STDOUT: %self.loc13_13.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_13.3: %Class = bind_name self, %self.loc13_13.1 -// CHECK:STDOUT: %.loc13: %Class = addr_pattern %self.loc13_13.3 +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %self.param: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self: %Class = bind_name self, %self.param +// CHECK:STDOUT: %.loc13: %Class = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -158,9 +158,9 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1[addr @Class.%self.loc12_13.3: %.1](); +// CHECK:STDOUT: fn @F.1[addr %self: %.1](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[addr @Class.%self.loc13_13.3: %Class](); +// CHECK:STDOUT: fn @G[addr %self: %Class](); // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(%c: %Class, %p: %.1) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index 761f3faab1604..a5f9c7c67cb72 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -307,76 +307,76 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %Final.decl: type = class_decl @Final [template = constants.%Final] {} // CHECK:STDOUT: %DeriveFromError.decl: type = class_decl @DeriveFromError [template = constants.%DeriveFromError] {} // CHECK:STDOUT: %AccessMemberWithInvalidBaseError.decl: %AccessMemberWithInvalidBaseError.type = fn_decl @AccessMemberWithInvalidBaseError [template = constants.%AccessMemberWithInvalidBaseError] { -// CHECK:STDOUT: %DeriveFromError.ref: type = name_ref DeriveFromError, %DeriveFromError.decl [template = constants.%DeriveFromError] +// CHECK:STDOUT: %DeriveFromError.ref: type = name_ref DeriveFromError, file.%DeriveFromError.decl [template = constants.%DeriveFromError] // CHECK:STDOUT: %.loc25_55: type = ptr_type %DeriveFromError [template = constants.%.5] -// CHECK:STDOUT: %p.loc25_37.1: %.5 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseError.%p: %.5 = bind_name p, %p.loc25_37.1 -// CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc25_61.1: type = value_of_initializer %int.make_type_32.loc25 [template = i32] -// CHECK:STDOUT: %.loc25_61.2: type = converted %int.make_type_32.loc25, %.loc25_61.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseError.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.5 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.5 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc25_61.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc25_61.2: type = converted %int.make_type_32, %.loc25_61.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DeriveFromNonType.decl: type = class_decl @DeriveFromNonType [template = constants.%DeriveFromNonType] {} // CHECK:STDOUT: %AccessMemberWithInvalidBasNonType.decl: %AccessMemberWithInvalidBasNonType.type = fn_decl @AccessMemberWithInvalidBasNonType [template = constants.%AccessMemberWithInvalidBasNonType] { -// CHECK:STDOUT: %DeriveFromNonType.ref: type = name_ref DeriveFromNonType, %DeriveFromNonType.decl [template = constants.%DeriveFromNonType] +// CHECK:STDOUT: %DeriveFromNonType.ref: type = name_ref DeriveFromNonType, file.%DeriveFromNonType.decl [template = constants.%DeriveFromNonType] // CHECK:STDOUT: %.loc38_58: type = ptr_type %DeriveFromNonType [template = constants.%.14] -// CHECK:STDOUT: %p.loc38_38.1: %.14 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBasNonType.%p: %.14 = bind_name p, %p.loc38_38.1 -// CHECK:STDOUT: %int.make_type_32.loc38: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc38_64.1: type = value_of_initializer %int.make_type_32.loc38 [template = i32] -// CHECK:STDOUT: %.loc38_64.2: type = converted %int.make_type_32.loc38, %.loc38_64.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBasNonType.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.14 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.14 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc38_64.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc38_64.2: type = converted %int.make_type_32, %.loc38_64.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DeriveFromi32.decl: type = class_decl @DeriveFromi32 [template = constants.%DeriveFromi32] {} // CHECK:STDOUT: %ConvertToBadBasei32.decl: %ConvertToBadBasei32.type = fn_decl @ConvertToBadBasei32 [template = constants.%ConvertToBadBasei32] { -// CHECK:STDOUT: %DeriveFromi32.ref.loc57: type = name_ref DeriveFromi32, %DeriveFromi32.decl [template = constants.%DeriveFromi32] +// CHECK:STDOUT: %DeriveFromi32.ref: type = name_ref DeriveFromi32, file.%DeriveFromi32.decl [template = constants.%DeriveFromi32] // CHECK:STDOUT: %.loc57_40: type = ptr_type %DeriveFromi32 [template = constants.%.15] -// CHECK:STDOUT: %p.loc57_24.1: %.15 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertToBadBasei32.%p: %.15 = bind_name p, %p.loc57_24.1 -// CHECK:STDOUT: %int.make_type_32.loc57: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc57_49.1: type = value_of_initializer %int.make_type_32.loc57 [template = i32] -// CHECK:STDOUT: %.loc57_49.2: type = converted %int.make_type_32.loc57, %.loc57_49.1 [template = i32] +// CHECK:STDOUT: %p.param: %.15 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.15 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc57_49.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc57_49.2: type = converted %int.make_type_32, %.loc57_49.1 [template = i32] // CHECK:STDOUT: %.loc57_49.3: type = ptr_type i32 [template = constants.%.16] -// CHECK:STDOUT: @ConvertToBadBasei32.%return: ref %.16 = var +// CHECK:STDOUT: %return: ref %.16 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBasei32.decl: %AccessMemberWithInvalidBasei32.type = fn_decl @AccessMemberWithInvalidBasei32 [template = constants.%AccessMemberWithInvalidBasei32] { -// CHECK:STDOUT: %DeriveFromi32.ref.loc59: type = name_ref DeriveFromi32, %DeriveFromi32.decl [template = constants.%DeriveFromi32] +// CHECK:STDOUT: %DeriveFromi32.ref: type = name_ref DeriveFromi32, file.%DeriveFromi32.decl [template = constants.%DeriveFromi32] // CHECK:STDOUT: %.loc59_51: type = ptr_type %DeriveFromi32 [template = constants.%.15] -// CHECK:STDOUT: %p.loc59_35.1: %.15 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBasei32.%p: %.15 = bind_name p, %p.loc59_35.1 -// CHECK:STDOUT: %int.make_type_32.loc59: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc59_57.1: type = value_of_initializer %int.make_type_32.loc59 [template = i32] -// CHECK:STDOUT: %.loc59_57.2: type = converted %int.make_type_32.loc59, %.loc59_57.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBasei32.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.15 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.15 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc59_57.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc59_57.2: type = converted %int.make_type_32, %.loc59_57.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DeriveFromTuple.decl: type = class_decl @DeriveFromTuple [template = constants.%DeriveFromTuple] {} // CHECK:STDOUT: %ConvertToBadBaseTuple.decl: %ConvertToBadBaseTuple.type = fn_decl @ConvertToBadBaseTuple [template = constants.%ConvertToBadBaseTuple] { -// CHECK:STDOUT: %DeriveFromTuple.ref.loc76: type = name_ref DeriveFromTuple, %DeriveFromTuple.decl [template = constants.%DeriveFromTuple] +// CHECK:STDOUT: %DeriveFromTuple.ref: type = name_ref DeriveFromTuple, file.%DeriveFromTuple.decl [template = constants.%DeriveFromTuple] // CHECK:STDOUT: %.loc76_44: type = ptr_type %DeriveFromTuple [template = constants.%.24] -// CHECK:STDOUT: %p.loc76_26.1: %.24 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertToBadBaseTuple.%p: %.24 = bind_name p, %p.loc76_26.1 -// CHECK:STDOUT: %Base.ref: type = name_ref Base, %Base.decl [template = constants.%Base] +// CHECK:STDOUT: %p.param: %.24 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.24 = bind_name p, %p.param +// CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc76_56: %.20 = tuple_literal (%Base.ref) // CHECK:STDOUT: %.loc76_57.1: type = converted %.loc76_56, constants.%.21 [template = constants.%.21] // CHECK:STDOUT: %.loc76_57.2: type = ptr_type %.21 [template = constants.%.25] -// CHECK:STDOUT: @ConvertToBadBaseTuple.%return: ref %.25 = var +// CHECK:STDOUT: %return: ref %.25 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBaseTuple.decl: %AccessMemberWithInvalidBaseTuple.type = fn_decl @AccessMemberWithInvalidBaseTuple [template = constants.%AccessMemberWithInvalidBaseTuple] { -// CHECK:STDOUT: %DeriveFromTuple.ref.loc78: type = name_ref DeriveFromTuple, %DeriveFromTuple.decl [template = constants.%DeriveFromTuple] +// CHECK:STDOUT: %DeriveFromTuple.ref: type = name_ref DeriveFromTuple, file.%DeriveFromTuple.decl [template = constants.%DeriveFromTuple] // CHECK:STDOUT: %.loc78_55: type = ptr_type %DeriveFromTuple [template = constants.%.24] -// CHECK:STDOUT: %p.loc78_37.1: %.24 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseTuple.%p: %.24 = bind_name p, %p.loc78_37.1 -// CHECK:STDOUT: %int.make_type_32.loc78: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc78_61.1: type = value_of_initializer %int.make_type_32.loc78 [template = i32] -// CHECK:STDOUT: %.loc78_61.2: type = converted %int.make_type_32.loc78, %.loc78_61.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseTuple.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.24 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.24 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc78_61.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc78_61.2: type = converted %int.make_type_32, %.loc78_61.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DeriveFromStruct.decl: type = class_decl @DeriveFromStruct [template = constants.%DeriveFromStruct] {} // CHECK:STDOUT: %ConvertToBadBaseStruct.decl: %ConvertToBadBaseStruct.type = fn_decl @ConvertToBadBaseStruct [template = constants.%ConvertToBadBaseStruct] { -// CHECK:STDOUT: %DeriveFromStruct.ref.loc97: type = name_ref DeriveFromStruct, %DeriveFromStruct.decl [template = constants.%DeriveFromStruct] +// CHECK:STDOUT: %DeriveFromStruct.ref: type = name_ref DeriveFromStruct, file.%DeriveFromStruct.decl [template = constants.%DeriveFromStruct] // CHECK:STDOUT: %.loc97_46: type = ptr_type %DeriveFromStruct [template = constants.%.31] -// CHECK:STDOUT: %p.loc97_27.1: %.31 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertToBadBaseStruct.%p: %.31 = bind_name p, %p.loc97_27.1 +// CHECK:STDOUT: %p.param: %.31 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.31 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc97_57: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc97_57.1: type = value_of_initializer %int.make_type_32.loc97_57 [template = i32] // CHECK:STDOUT: %.loc97_57.2: type = converted %int.make_type_32.loc97_57, %.loc97_57.1 [template = i32] @@ -385,68 +385,68 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %.loc97_66.2: type = converted %int.make_type_32.loc97_66, %.loc97_66.1 [template = i32] // CHECK:STDOUT: %.loc97_69: type = struct_type {.a: i32, .b: i32} [template = constants.%.29] // CHECK:STDOUT: %.loc97_70: type = ptr_type %.29 [template = constants.%.30] -// CHECK:STDOUT: @ConvertToBadBaseStruct.%return: ref %.30 = var +// CHECK:STDOUT: %return: ref %.30 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBaseStruct.decl: %AccessMemberWithInvalidBaseStruct.type = fn_decl @AccessMemberWithInvalidBaseStruct [template = constants.%AccessMemberWithInvalidBaseStruct] { -// CHECK:STDOUT: %DeriveFromStruct.ref.loc100: type = name_ref DeriveFromStruct, %DeriveFromStruct.decl [template = constants.%DeriveFromStruct] +// CHECK:STDOUT: %DeriveFromStruct.ref: type = name_ref DeriveFromStruct, file.%DeriveFromStruct.decl [template = constants.%DeriveFromStruct] // CHECK:STDOUT: %.loc100_57: type = ptr_type %DeriveFromStruct [template = constants.%.31] -// CHECK:STDOUT: %p.loc100_38.1: %.31 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseStruct.%p: %.31 = bind_name p, %p.loc100_38.1 -// CHECK:STDOUT: %int.make_type_32.loc100: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc100_63.1: type = value_of_initializer %int.make_type_32.loc100 [template = i32] -// CHECK:STDOUT: %.loc100_63.2: type = converted %int.make_type_32.loc100, %.loc100_63.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseStruct.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.31 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.31 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc100_63.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc100_63.2: type = converted %int.make_type_32, %.loc100_63.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Incomplete.decl: type = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %DeriveFromIncomplete.decl: type = class_decl @DeriveFromIncomplete [template = constants.%DeriveFromIncomplete] {} // CHECK:STDOUT: %ConvertToBadBaseIncomplete.decl: %ConvertToBadBaseIncomplete.type = fn_decl @ConvertToBadBaseIncomplete [template = constants.%ConvertToBadBaseIncomplete] { -// CHECK:STDOUT: %DeriveFromIncomplete.ref.loc122: type = name_ref DeriveFromIncomplete, %DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] +// CHECK:STDOUT: %DeriveFromIncomplete.ref: type = name_ref DeriveFromIncomplete, file.%DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] // CHECK:STDOUT: %.loc122_54: type = ptr_type %DeriveFromIncomplete [template = constants.%.35] -// CHECK:STDOUT: %p.loc122_31.1: %.35 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertToBadBaseIncomplete.%p: %.35 = bind_name p, %p.loc122_31.1 -// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] +// CHECK:STDOUT: %p.param: %.35 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.35 = bind_name p, %p.param +// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, file.%Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc122_70: type = ptr_type %Incomplete [template = constants.%.36] -// CHECK:STDOUT: @ConvertToBadBaseIncomplete.%return: ref %.36 = var +// CHECK:STDOUT: %return: ref %.36 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBaseIncomplete.decl: %AccessMemberWithInvalidBaseIncomplete.type = fn_decl @AccessMemberWithInvalidBaseIncomplete [template = constants.%AccessMemberWithInvalidBaseIncomplete] { -// CHECK:STDOUT: %DeriveFromIncomplete.ref.loc124: type = name_ref DeriveFromIncomplete, %DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] +// CHECK:STDOUT: %DeriveFromIncomplete.ref: type = name_ref DeriveFromIncomplete, file.%DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] // CHECK:STDOUT: %.loc124_65: type = ptr_type %DeriveFromIncomplete [template = constants.%.35] -// CHECK:STDOUT: %p.loc124_42.1: %.35 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseIncomplete.%p: %.35 = bind_name p, %p.loc124_42.1 -// CHECK:STDOUT: %int.make_type_32.loc124: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc124_71.1: type = value_of_initializer %int.make_type_32.loc124 [template = i32] -// CHECK:STDOUT: %.loc124_71.2: type = converted %int.make_type_32.loc124, %.loc124_71.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseIncomplete.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.35 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.35 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc124_71.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc124_71.2: type = converted %int.make_type_32, %.loc124_71.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DeriveFromFinal.decl: type = class_decl @DeriveFromFinal [template = constants.%DeriveFromFinal] {} // CHECK:STDOUT: %ConvertToBadBaseFinal.decl: %ConvertToBadBaseFinal.type = fn_decl @ConvertToBadBaseFinal [template = constants.%ConvertToBadBaseFinal] { -// CHECK:STDOUT: %DeriveFromFinal.ref.loc135: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] +// CHECK:STDOUT: %DeriveFromFinal.ref: type = name_ref DeriveFromFinal, file.%DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc135_44: type = ptr_type %DeriveFromFinal [template = constants.%.43] -// CHECK:STDOUT: %p.loc135_26.1: %.43 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertToBadBaseFinal.%p: %.43 = bind_name p, %p.loc135_26.1 -// CHECK:STDOUT: %Final.ref: type = name_ref Final, %Final.decl [template = constants.%Final] +// CHECK:STDOUT: %p.param: %.43 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.43 = bind_name p, %p.param +// CHECK:STDOUT: %Final.ref: type = name_ref Final, file.%Final.decl [template = constants.%Final] // CHECK:STDOUT: %.loc135_55: type = ptr_type %Final [template = constants.%.44] -// CHECK:STDOUT: @ConvertToBadBaseFinal.%return: ref %.44 = var +// CHECK:STDOUT: %return: ref %.44 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_WithMember.decl: %AccessMemberWithInvalidBaseFinal_WithMember.type = fn_decl @AccessMemberWithInvalidBaseFinal_WithMember [template = constants.%AccessMemberWithInvalidBaseFinal_WithMember] { -// CHECK:STDOUT: %DeriveFromFinal.ref.loc139: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] +// CHECK:STDOUT: %DeriveFromFinal.ref: type = name_ref DeriveFromFinal, file.%DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc139_66: type = ptr_type %DeriveFromFinal [template = constants.%.43] -// CHECK:STDOUT: %p.loc139_48.1: %.43 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_WithMember.%p: %.43 = bind_name p, %p.loc139_48.1 -// CHECK:STDOUT: %int.make_type_32.loc139: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc139_72.1: type = value_of_initializer %int.make_type_32.loc139 [template = i32] -// CHECK:STDOUT: %.loc139_72.2: type = converted %int.make_type_32.loc139, %.loc139_72.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_WithMember.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.43 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.43 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc139_72.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc139_72.2: type = converted %int.make_type_32, %.loc139_72.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_NoMember.decl: %AccessMemberWithInvalidBaseFinal_NoMember.type = fn_decl @AccessMemberWithInvalidBaseFinal_NoMember [template = constants.%AccessMemberWithInvalidBaseFinal_NoMember] { -// CHECK:STDOUT: %DeriveFromFinal.ref.loc143: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] +// CHECK:STDOUT: %DeriveFromFinal.ref: type = name_ref DeriveFromFinal, file.%DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc143_64: type = ptr_type %DeriveFromFinal [template = constants.%.43] -// CHECK:STDOUT: %p.loc143_46.1: %.43 = param p, runtime_param0 -// CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_NoMember.%p: %.43 = bind_name p, %p.loc143_46.1 -// CHECK:STDOUT: %int.make_type_32.loc143: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc143_70.1: type = value_of_initializer %int.make_type_32.loc143 [template = i32] -// CHECK:STDOUT: %.loc143_70.2: type = converted %int.make_type_32.loc143, %.loc143_70.1 [template = i32] -// CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_NoMember.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.43 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.43 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc143_70.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc143_70.2: type = converted %int.make_type_32, %.loc143_70.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -576,7 +576,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBaseError(%p: %.5) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.5 = name_ref p, %p -// CHECK:STDOUT: %.loc25: ref %DeriveFromError = deref %p.ref +// CHECK:STDOUT: %.loc25_75: ref %DeriveFromError = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -592,7 +592,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBasNonType(%p: %.14) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.14 = name_ref p, %p -// CHECK:STDOUT: %.loc38: ref %DeriveFromNonType = deref %p.ref +// CHECK:STDOUT: %.loc38_78: ref %DeriveFromNonType = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -610,7 +610,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBasei32(%p: %.15) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.15 = name_ref p, %p -// CHECK:STDOUT: %.loc59: ref %DeriveFromi32 = deref %p.ref +// CHECK:STDOUT: %.loc59_71: ref %DeriveFromi32 = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -628,7 +628,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBaseTuple(%p: %.24) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.24 = name_ref p, %p -// CHECK:STDOUT: %.loc78: ref %DeriveFromTuple = deref %p.ref +// CHECK:STDOUT: %.loc78_75: ref %DeriveFromTuple = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -646,7 +646,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBaseStruct(%p: %.31) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.31 = name_ref p, %p -// CHECK:STDOUT: %.loc100: ref %DeriveFromStruct = deref %p.ref +// CHECK:STDOUT: %.loc100_77: ref %DeriveFromStruct = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -664,7 +664,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: fn @AccessMemberWithInvalidBaseIncomplete(%p: %.35) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.35 = name_ref p, %p -// CHECK:STDOUT: %.loc124: ref %DeriveFromIncomplete = deref %p.ref +// CHECK:STDOUT: %.loc124_85: ref %DeriveFromIncomplete = deref %p.ref // CHECK:STDOUT: %n.ref: = name_ref n, [template = ] // CHECK:STDOUT: return // 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 9ffa9d66da537..a30b16f9684b2 100644 --- a/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon +++ b/toolchain/check/testdata/class/fail_compound_type_mismatch.carbon @@ -93,13 +93,13 @@ fn AccessBInA(a: A) -> i32 { // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %AccessBInA.decl: %AccessBInA.type = fn_decl @AccessBInA [template = constants.%AccessBInA] { -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %a.loc19_15.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @AccessBInA.%a: %A = bind_name a, %a.loc19_15.1 +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_24.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc19_24.2: type = converted %int.make_type_32, %.loc19_24.1 [template = i32] -// CHECK:STDOUT: @AccessBInA.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon index ddc4528b46caf..2e4c67236280a 100644 --- a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon +++ b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon @@ -52,8 +52,8 @@ fn Make() -> C { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @Make.%return: ref %C = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 315090831b31d..bac52bddfafa5 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -128,23 +128,23 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: %A2.decl: type = class_decl @A2 [template = constants.%A2] {} // CHECK:STDOUT: %B2.decl: type = class_decl @B2 [template = constants.%B2] {} // CHECK:STDOUT: %ConvertUnrelated.decl: %ConvertUnrelated.type = fn_decl @ConvertUnrelated [template = constants.%ConvertUnrelated] { -// CHECK:STDOUT: %B2.ref: type = name_ref B2, %B2.decl [template = constants.%B2] +// CHECK:STDOUT: %B2.ref: type = name_ref B2, file.%B2.decl [template = constants.%B2] // CHECK:STDOUT: %.loc31_26: type = ptr_type %B2 [template = constants.%.9] -// CHECK:STDOUT: %p.loc31_21.1: %.9 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertUnrelated.%p: %.9 = bind_name p, %p.loc31_21.1 -// CHECK:STDOUT: %A1.ref: type = name_ref A1, %A1.decl [template = constants.%A1] +// CHECK:STDOUT: %p.param: %.9 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.9 = bind_name p, %p.param +// CHECK:STDOUT: %A1.ref: type = name_ref A1, file.%A1.decl [template = constants.%A1] // CHECK:STDOUT: %.loc31_34: type = ptr_type %A1 [template = constants.%.10] -// CHECK:STDOUT: @ConvertUnrelated.%return: ref %.10 = var +// CHECK:STDOUT: %return: ref %.10 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Incomplete.decl: type = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %ConvertIncomplete.decl: %ConvertIncomplete.type = fn_decl @ConvertIncomplete [template = constants.%ConvertIncomplete] { -// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] +// CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, file.%Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc41_35: type = ptr_type %Incomplete [template = constants.%.21] -// CHECK:STDOUT: %p.loc41_22.1: %.21 = param p, runtime_param0 -// CHECK:STDOUT: @ConvertIncomplete.%p: %.21 = bind_name p, %p.loc41_22.1 -// CHECK:STDOUT: %A2.ref: type = name_ref A2, %A2.decl [template = constants.%A2] +// CHECK:STDOUT: %p.param: %.21 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.21 = bind_name p, %p.param +// CHECK:STDOUT: %A2.ref: type = name_ref A2, file.%A2.decl [template = constants.%A2] // CHECK:STDOUT: %.loc41_43: type = ptr_type %A2 [template = constants.%.22] -// CHECK:STDOUT: @ConvertIncomplete.%return: ref %.22 = var +// CHECK:STDOUT: %return: ref %.22 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_generic_method.carbon b/toolchain/check/testdata/class/fail_generic_method.carbon index 0c3ad8525e0dc..f1be4aeaa5731 100644 --- a/toolchain/check/testdata/class/fail_generic_method.carbon +++ b/toolchain/check/testdata/class/fail_generic_method.carbon @@ -72,44 +72,44 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.4] { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc32_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc32_14.2: type = converted %int.make_type_32, %.loc32_14.1 [template = i32] -// CHECK:STDOUT: %N.loc32_10.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc32_10.2: i32 = bind_symbolic_name N 0, %N.loc32_10.1 [symbolic = @.1.%N (constants.%N)] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc32: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: %Self.ref: = name_ref Self, [template = ] -// CHECK:STDOUT: %self.loc32_21.1: = param self, runtime_param0 -// CHECK:STDOUT: @.1.%self: = bind_name self, %self.loc32_21.1 +// CHECK:STDOUT: %self.param: = param self, runtime_param0 +// CHECK:STDOUT: %self: = bind_name self, %self.param // CHECK:STDOUT: %T.ref: = name_ref T, [template = ] -// CHECK:STDOUT: %n.loc32_33.1: = param n, runtime_param1 -// CHECK:STDOUT: @.1.%n: = bind_name n, %n.loc32_33.1 +// CHECK:STDOUT: %n.param: = param n, runtime_param1 +// CHECK:STDOUT: %n: = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] -// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @Class.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref.loc12: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc12: @Class.%.1 (%.2) = field_decl a, element0 [template] -// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %.loc13: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @F.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc13 [symbolic = @F.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc13_8.1: @F.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_8.2: @F.%Class (%Class.2) = bind_name self, %self.loc13_8.1 -// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, file.%T.loc11_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %n.loc13_20.1: @F.%T (%T) = param n, runtime_param1 -// CHECK:STDOUT: %n.loc13_20.2: @F.%T (%T) = bind_name n, %n.loc13_20.1 +// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = @Class.%F (constants.%F)] { +// CHECK:STDOUT: %.loc13: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc13 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param: @F.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.%Class (%Class.2) = bind_name self, %self.param +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %n.param: @F.%T (%T) = param n, runtime_param1 +// CHECK:STDOUT: %n: @F.%T (%T) = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -119,17 +119,17 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @F(@Class.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Class.%self.loc13_8.2: @F.%Class (%Class.2)](@Class.%n.loc13_20.2: @F.%T (%T)); +// CHECK:STDOUT: fn[%self: @F.%Class (%Class.2)](%n: @F.%T (%T)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%N.loc32_10.2: i32) { -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 0 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic fn @.1(%N.loc32: i32) { +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 0 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -140,11 +140,11 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@F.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T) { @@ -152,11 +152,11 @@ fn Class(N:! i32).F[self: Self](n: T) {} // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%N) { -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index 11981ae131688..500f074be0761 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -203,61 +203,61 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.2] {} // CHECK:STDOUT: %CallClassFunction.decl: %CallClassFunction.type = fn_decl @CallClassFunction [template = constants.%CallClassFunction] {} -// CHECK:STDOUT: %Class.ref.loc40: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %global_var.var: ref = var global_var // CHECK:STDOUT: %global_var: ref = bind_name global_var, %global_var.var // CHECK:STDOUT: %ConvertFromStruct.decl: %ConvertFromStruct.type = fn_decl @ConvertFromStruct [template = constants.%ConvertFromStruct] { -// CHECK:STDOUT: %Class.ref.loc49: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @ConvertFromStruct.%return: ref %Class = var +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Class.ref.loc51: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc51_14: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc51_6.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @G.%p: %.4 = bind_name p, %p.loc51_6.1 -// CHECK:STDOUT: %int.make_type_32.loc51: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc51_20.1: type = value_of_initializer %int.make_type_32.loc51 [template = i32] -// CHECK:STDOUT: %.loc51_20.2: type = converted %int.make_type_32.loc51, %.loc51_20.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc51_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc51_20.2: type = converted %int.make_type_32, %.loc51_20.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %MemberAccess.decl: %MemberAccess.type = fn_decl @MemberAccess [template = constants.%MemberAccess] { -// CHECK:STDOUT: %Class.ref.loc62: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc62_25: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc62_17.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @MemberAccess.%p: %.4 = bind_name p, %p.loc62_17.1 -// CHECK:STDOUT: %int.make_type_32.loc62: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc62_31.1: type = value_of_initializer %int.make_type_32.loc62 [template = i32] -// CHECK:STDOUT: %.loc62_31.2: type = converted %int.make_type_32.loc62, %.loc62_31.1 [template = i32] -// CHECK:STDOUT: @MemberAccess.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc62_31.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc62_31.2: type = converted %int.make_type_32, %.loc62_31.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Copy.decl: %Copy.type = fn_decl @Copy [template = constants.%Copy] { -// CHECK:STDOUT: %Class.ref.loc80_12: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref.loc80_12: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc80: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc80_9.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @Copy.%p: %.4 = bind_name p, %p.loc80_9.1 -// CHECK:STDOUT: %Class.ref.loc80_23: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @Copy.%return: ref %Class = var +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param +// CHECK:STDOUT: %Class.ref.loc80_23: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %Let.decl: %Let.type = fn_decl @Let [template = constants.%Let] { -// CHECK:STDOUT: %Class.ref.loc84: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref.loc84: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc84: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc84_8.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @Let.%p: %.4 = bind_name p, %p.loc84_8.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %TakeIncomplete.decl: %TakeIncomplete.type = fn_decl @TakeIncomplete [template = constants.%TakeIncomplete] { -// CHECK:STDOUT: %Class.ref.loc95: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc95_19.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @TakeIncomplete.%c: %Class = bind_name c, %c.loc95_19.1 +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %ReturnIncomplete.decl: %ReturnIncomplete.type = fn_decl @ReturnIncomplete [template = constants.%ReturnIncomplete] { -// CHECK:STDOUT: %Class.ref.loc97: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @ReturnIncomplete.%return: ref %Class = var +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallTakeIncomplete.decl: %CallTakeIncomplete.type = fn_decl @CallTakeIncomplete [template = constants.%CallTakeIncomplete] { -// CHECK:STDOUT: %Class.ref.loc99: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc99: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc99_23.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @CallTakeIncomplete.%p: %.4 = bind_name p, %p.loc99_23.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallReturnIncomplete.decl: %CallReturnIncomplete.type = fn_decl @CallReturnIncomplete [template = constants.%CallReturnIncomplete] {} // CHECK:STDOUT: } @@ -307,7 +307,7 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Let(%p: %.4) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref.loc92: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %p.ref: %.4 = name_ref p, %p // CHECK:STDOUT: %.loc92: ref %Class = deref %p.ref // CHECK:STDOUT: %c: = bind_name c, diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index aec3868aa2d4b..68a31e00247fa 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -71,10 +71,10 @@ fn F() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc16: type = ptr_type %Class [template = constants.%.4] -// CHECK:STDOUT: %p.loc16_6.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @G.%p: %.4 = bind_name p, %p.loc16_6.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index fbe6387553365..ce3acd94d2967 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -81,13 +81,13 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc19: type = struct_type {.a: %A} [template = constants.%.6] -// CHECK:STDOUT: %s.loc19_6.1: %.6 = param s, runtime_param0 -// CHECK:STDOUT: @F.2.%s: %.6 = bind_name s, %s.loc19_6.1 -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] -// CHECK:STDOUT: %b.loc19_18.1: %B = param b, runtime_param1 -// CHECK:STDOUT: @F.2.%b: %B = bind_name b, %b.loc19_18.1 +// CHECK:STDOUT: %s.param: %.6 = param s, runtime_param0 +// CHECK:STDOUT: %s: %.6 = bind_name s, %s.param +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] +// CHECK:STDOUT: %b.param: %B = param b, runtime_param1 +// CHECK:STDOUT: %b: %B = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -95,9 +95,9 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc12_20: type = ptr_type %A [template = constants.%.1] -// CHECK:STDOUT: %self.loc12_13.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_13.3: %.1 = bind_name self, %self.loc12_13.1 -// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self.loc12_13.3 +// CHECK:STDOUT: %self.param: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.1 = bind_name self, %self.param +// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -114,7 +114,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: .a = %.loc16 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1[addr @A.%self.loc12_13.3: %.1](); +// CHECK:STDOUT: fn @F.1[addr %self: %.1](); // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(%s: %.6, %b: %B) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index 4234a5e42415e..a5882938714f8 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -70,7 +70,7 @@ fn T.F() {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 5b809b1d78458..110bb5670ae18 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -83,13 +83,13 @@ fn F(c: Class) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} -// CHECK:STDOUT: %Class.ref.loc16: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %WithSelf.ref: %WithSelf.type = name_ref WithSelf, @Class.%WithSelf.decl [template = constants.%WithSelf] // CHECK:STDOUT: %A: %WithSelf.type = bind_alias A, @Class.%WithSelf.decl [template = constants.%WithSelf] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Class.ref.loc18: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc18_6.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @F.%c: %Class = bind_name c, %c.loc18_6.1 +// CHECK:STDOUT: %Class.ref.loc18: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -97,8 +97,8 @@ fn F(c: Class) { // CHECK:STDOUT: %NoSelf.decl: %NoSelf.type = fn_decl @NoSelf [template = constants.%NoSelf] {} // CHECK:STDOUT: %WithSelf.decl: %WithSelf.type = fn_decl @WithSelf [template = constants.%WithSelf] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] -// CHECK:STDOUT: %self.loc13_15.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_15.2: %Class = bind_name self, %self.loc13_15.1 +// CHECK:STDOUT: %self.param: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self: %Class = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -109,7 +109,7 @@ fn F(c: Class) { // CHECK:STDOUT: // CHECK:STDOUT: fn @NoSelf(); // CHECK:STDOUT: -// CHECK:STDOUT: fn @WithSelf[@Class.%self.loc13_15.2: %Class](); +// CHECK:STDOUT: fn @WithSelf[%self: %Class](); // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%c: %Class) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/fail_method_modifiers.carbon b/toolchain/check/testdata/class/fail_method_modifiers.carbon index 10ae2779f654e..83d4bafb9cb0c 100644 --- a/toolchain/check/testdata/class/fail_method_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_method_modifiers.carbon @@ -103,14 +103,14 @@ base class BaseClass { // CHECK:STDOUT: // CHECK:STDOUT: class @FinalClass { // CHECK:STDOUT: %Abstract.decl: %Abstract.type.1 = fn_decl @Abstract.1 [template = constants.%Abstract.1] { -// CHECK:STDOUT: %Self.ref.loc20: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] -// CHECK:STDOUT: %self.loc20_24.1: %FinalClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc20_24.2: %FinalClass = bind_name self, %self.loc20_24.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] +// CHECK:STDOUT: %self.param: %FinalClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %FinalClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Virtual.decl: %Virtual.type = fn_decl @Virtual [template = constants.%Virtual] { -// CHECK:STDOUT: %Self.ref.loc29: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] -// CHECK:STDOUT: %self.loc29_22.1: %FinalClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc29_22.2: %FinalClass = bind_name self, %self.loc29_22.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] +// CHECK:STDOUT: %self.param: %FinalClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %FinalClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -121,14 +121,14 @@ base class BaseClass { // CHECK:STDOUT: // CHECK:STDOUT: class @AbstractClass { // CHECK:STDOUT: %Default.decl: %Default.type = fn_decl @Default [template = constants.%Default] { -// CHECK:STDOUT: %Self.ref.loc38: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] -// CHECK:STDOUT: %self.loc38_22.1: %AbstractClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc38_22.2: %AbstractClass = bind_name self, %self.loc38_22.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] +// CHECK:STDOUT: %self.param: %AbstractClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %AbstractClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Final.decl: %Final.type = fn_decl @Final [template = constants.%Final] { -// CHECK:STDOUT: %Self.ref.loc44: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] -// CHECK:STDOUT: %self.loc44_18.1: %AbstractClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc44_18.2: %AbstractClass = bind_name self, %self.loc44_18.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] +// CHECK:STDOUT: %self.param: %AbstractClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %AbstractClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -140,8 +140,8 @@ base class BaseClass { // CHECK:STDOUT: class @BaseClass { // CHECK:STDOUT: %Abstract.decl: %Abstract.type.2 = fn_decl @Abstract.2 [template = constants.%Abstract.2] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%BaseClass [template = constants.%BaseClass] -// CHECK:STDOUT: %self.loc55_24.1: %BaseClass = param self, runtime_param0 -// CHECK:STDOUT: %self.loc55_24.2: %BaseClass = bind_name self, %self.loc55_24.1 +// CHECK:STDOUT: %self.param: %BaseClass = param self, runtime_param0 +// CHECK:STDOUT: %self: %BaseClass = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -149,13 +149,13 @@ base class BaseClass { // CHECK:STDOUT: .Abstract = %Abstract.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Abstract.1[@FinalClass.%self.loc20_24.2: %FinalClass](); +// CHECK:STDOUT: fn @Abstract.1[%self: %FinalClass](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @Virtual[@FinalClass.%self.loc29_22.2: %FinalClass](); +// CHECK:STDOUT: fn @Virtual[%self: %FinalClass](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @Default[@AbstractClass.%self.loc38_22.2: %AbstractClass](); +// CHECK:STDOUT: fn @Default[%self: %AbstractClass](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @Final[@AbstractClass.%self.loc44_18.2: %AbstractClass](); +// CHECK:STDOUT: fn @Final[%self: %AbstractClass](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @Abstract.2[@BaseClass.%self.loc55_24.2: %BaseClass](); +// CHECK:STDOUT: fn @Abstract.2[%self: %BaseClass](); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index ec8e760b4e0e5..ca53c08fcfced 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -63,7 +63,7 @@ fn G() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc17_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc17_11.2: type = converted %int.make_type_32, %.loc17_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -72,7 +72,7 @@ fn G() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index d0418ebb78ad9..0f7409b3f85b0 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -120,18 +120,18 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %Self.ref.loc25: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc25_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @F.1.%self: %Class = bind_name self, %self.loc25_12.1 +// CHECK:STDOUT: %self.param.loc25: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc25: %Class = bind_name self, %self.param.loc25 // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc28: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: @G.%return: ref %Class = var +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %WrongSelf.decl: type = class_decl @WrongSelf [template = constants.%WrongSelf] {} // CHECK:STDOUT: %CallWrongSelf.decl: %CallWrongSelf.type = fn_decl @CallWrongSelf [template = constants.%CallWrongSelf] { -// CHECK:STDOUT: %WrongSelf.ref: type = name_ref WrongSelf, %WrongSelf.decl [template = constants.%WrongSelf] -// CHECK:STDOUT: %ws.loc45_18.1: %WrongSelf = param ws, runtime_param0 -// CHECK:STDOUT: @CallWrongSelf.%ws: %WrongSelf = bind_name ws, %ws.loc45_18.1 +// CHECK:STDOUT: %WrongSelf.ref: type = name_ref WrongSelf, file.%WrongSelf.decl [template = constants.%WrongSelf] +// CHECK:STDOUT: %ws.param: %WrongSelf = param ws, runtime_param0 +// CHECK:STDOUT: %ws: %WrongSelf = bind_name ws, %ws.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -157,12 +157,12 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { // CHECK:STDOUT: %Self.ref.loc16: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc16_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc16_8.2: %Class = bind_name self, %self.loc16_8.1 +// CHECK:STDOUT: %self.param.loc16: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc16: %Class = bind_name self, %self.param.loc16 // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %return.var: ref %Class = var +// CHECK:STDOUT: %return.var.loc18: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -174,8 +174,8 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: class @WrongSelf { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] -// CHECK:STDOUT: %self.loc42_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc42_8.2: %Class = bind_name self, %self.loc42_8.1 +// CHECK:STDOUT: %self.param: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self: %Class = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -183,14 +183,14 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.1(%self: %Class) { +// CHECK:STDOUT: fn @F.1(%self.loc25: %Class) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %return: %Class { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %Self.ref.loc33: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.var: ref %Class = var self // CHECK:STDOUT: %self: ref %Class = bind_name self, %self.var // CHECK:STDOUT: %self.ref: ref %Class = name_ref self, %self @@ -198,7 +198,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: return to %return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[@WrongSelf.%self.loc42_8.2: %Class](); +// CHECK:STDOUT: fn @F.2[%self: %Class](); // CHECK:STDOUT: // CHECK:STDOUT: fn @CallWrongSelf(%ws: %WrongSelf) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index 23ff4d6b69d3e..099e9a9b854cf 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -69,20 +69,20 @@ fn G() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc22_11.2: type = converted %int.make_type_32, %.loc22_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_14.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_14.2: type = converted %int.make_type_32.loc12, %.loc12_14.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_14.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_14.2: type = converted %int.make_type_32, %.loc12_14.1 [template = i32] // CHECK:STDOUT: %.loc12_12: %.2 = field_decl field, element0 [template] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32.loc13, %.loc13_13.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32, %.loc13_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 8be8461b43d83..e6047cc9a98f0 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -58,13 +58,13 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc15_6.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: %Class = bind_name c, %c.loc15_6.1 +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_19.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc15_19.2: type = converted %int.make_type_32, %.loc15_19.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 43a5b552d4f7b..47dc96547ff44 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -44,13 +44,13 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Class.ref.loc13_9: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref.loc13_9: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc13_14: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %p.loc13_6.1: %.1 = param p, runtime_param0 -// CHECK:STDOUT: @F.%p: %.1 = bind_name p, %p.loc13_6.1 -// CHECK:STDOUT: %Class.ref.loc13_20: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %p.param: %.1 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.1 = bind_name p, %p.param +// CHECK:STDOUT: %Class.ref.loc13_20: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc13_25: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/basic.carbon b/toolchain/check/testdata/class/generic/basic.carbon index b8ebb6782dee9..d9ff5f2616145 100644 --- a/toolchain/check/testdata/class/generic/basic.carbon +++ b/toolchain/check/testdata/class/generic/basic.carbon @@ -66,47 +66,47 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %Declaration.decl: %Declaration.type = class_decl @Declaration [template = constants.%Declaration.1] { -// CHECK:STDOUT: %T.loc24_19.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc24_19.2: type = bind_symbolic_name T 0, %T.loc24_19.1 [symbolic = @Declaration.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc24: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %GetAddr.type: type = fn_type @GetAddr, @Class(%T) [symbolic = %GetAddr.type (constants.%GetAddr.type)] +// CHECK:STDOUT: %GetAddr.type: type = fn_type @GetAddr, @Class(%T.1) [symbolic = %GetAddr.type (constants.%GetAddr.type)] // CHECK:STDOUT: %GetAddr: @Class.%GetAddr.type (%GetAddr.type) = struct_value () [symbolic = %GetAddr (constants.%GetAddr)] -// CHECK:STDOUT: %GetValue.type: type = fn_type @GetValue, @Class(%T) [symbolic = %GetValue.type (constants.%GetValue.type)] +// CHECK:STDOUT: %GetValue.type: type = fn_type @GetValue, @Class(%T.1) [symbolic = %GetValue.type (constants.%GetValue.type)] // CHECK:STDOUT: %GetValue: @Class.%GetValue.type (%GetValue.type) = struct_value () [symbolic = %GetValue (constants.%GetValue)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %GetAddr.decl: @Class.%GetAddr.type (%GetAddr.type) = fn_decl @GetAddr [symbolic = %GetAddr (constants.%GetAddr)] { -// CHECK:STDOUT: %.loc12_25: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @GetAddr.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref.loc12: type = name_ref Self, %.loc12_25 [symbolic = @GetAddr.%Class (constants.%Class.2)] -// CHECK:STDOUT: %.loc12_29: type = ptr_type %Class.2 [symbolic = @GetAddr.%.1 (constants.%.2)] -// CHECK:STDOUT: %self.loc12_19.1: @GetAddr.%.1 (%.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_19.3: @GetAddr.%.1 (%.2) = bind_name self, %self.loc12_19.1 -// CHECK:STDOUT: %.loc12_14: @GetAddr.%.1 (%.2) = addr_pattern %self.loc12_19.3 -// CHECK:STDOUT: %T.ref.loc12: type = name_ref T, file.%T.loc11_13.2 [symbolic = @GetAddr.%T (constants.%T)] -// CHECK:STDOUT: %.loc12_38: type = ptr_type %T [symbolic = @GetAddr.%.2 (constants.%.3)] -// CHECK:STDOUT: %return.var.loc12: ref @GetAddr.%.2 (%.3) = var +// CHECK:STDOUT: %GetAddr.decl: @Class.%GetAddr.type (%GetAddr.type) = fn_decl @GetAddr [symbolic = @Class.%GetAddr (constants.%GetAddr)] { +// CHECK:STDOUT: %.loc12_25: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc12_25 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.loc12_29: type = ptr_type %Class.2 [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %self.param: @GetAddr.%.1 (%.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @GetAddr.%.1 (%.2) = bind_name self, %self.param +// CHECK:STDOUT: %.loc12_14: @GetAddr.%.1 (%.2) = addr_pattern %self +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %.loc12_38: type = ptr_type %T [symbolic = %.2 (constants.%.3)] +// CHECK:STDOUT: %return: ref @GetAddr.%.2 (%.3) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %GetValue.decl: @Class.%GetValue.type (%GetValue.type) = fn_decl @GetValue [symbolic = %GetValue (constants.%GetValue)] { -// CHECK:STDOUT: %.loc17: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @GetValue.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, %.loc17 [symbolic = @GetValue.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc17_15.1: @GetValue.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc17_15.2: @GetValue.%Class (%Class.2) = bind_name self, %self.loc17_15.1 -// CHECK:STDOUT: %T.ref.loc17: type = name_ref T, file.%T.loc11_13.2 [symbolic = @GetValue.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc17: ref @GetValue.%T (%T) = var +// CHECK:STDOUT: %GetValue.decl: @Class.%GetValue.type (%GetValue.type) = fn_decl @GetValue [symbolic = @Class.%GetValue (constants.%GetValue)] { +// CHECK:STDOUT: %.loc17: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc17 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param: @GetValue.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @GetValue.%Class (%Class.2) = bind_name self, %self.param +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @GetValue.%T (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %T.ref.loc21: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc21: @Class.%.1 (%.4) = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -117,13 +117,13 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Declaration(file.%T.loc24_19.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Declaration(%T.loc24: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @GetAddr(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @GetAddr(@Class.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: %.1: type = ptr_type @GetAddr.%Class (%Class.2) [symbolic = %.1 (constants.%.2)] @@ -132,9 +132,9 @@ class Declaration(T:! type); // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.3: type = unbound_element_type @GetAddr.%Class (%Class.2), @GetAddr.%T (%T) [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[addr @Class.%self.loc12_19.3: @GetAddr.%.1 (%.2)]() -> @GetAddr.%.2 (%.3) { +// CHECK:STDOUT: fn[addr %self: @GetAddr.%.1 (%.2)]() -> @GetAddr.%.2 (%.3) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @GetAddr.%.1 (%.2) = name_ref self, @Class.%self.loc12_19.3 +// CHECK:STDOUT: %self.ref: @GetAddr.%.1 (%.2) = name_ref self, %self // CHECK:STDOUT: %.loc13_17.1: ref @GetAddr.%Class (%Class.2) = deref %self.ref // CHECK:STDOUT: %k.ref: @GetAddr.%.3 (%.4) = name_ref k, @Class.%.loc21 [template = @Class.%.loc21] // CHECK:STDOUT: %.loc13_17.2: ref @GetAddr.%T (%T) = class_element_access %.loc13_17.1, element0 @@ -143,16 +143,16 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @GetValue(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @GetValue(@Class.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1: type = unbound_element_type @GetValue.%Class (%Class.2), @GetValue.%T (%T) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Class.%self.loc17_15.2: @GetValue.%Class (%Class.2)]() -> @GetValue.%T (%T) { +// CHECK:STDOUT: fn[%self: @GetValue.%Class (%Class.2)]() -> @GetValue.%T (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @GetValue.%Class (%Class.2) = name_ref self, @Class.%self.loc17_15.2 +// CHECK:STDOUT: %self.ref: @GetValue.%Class (%Class.2) = name_ref self, %self // CHECK:STDOUT: %k.ref: @GetValue.%.1 (%.4) = name_ref k, @Class.%.loc21 [template = @Class.%.loc21] // CHECK:STDOUT: %.loc18_16.1: ref @GetValue.%T (%T) = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc18_16.2: @GetValue.%T (%T) = bind_value %.loc18_16.1 @@ -161,7 +161,7 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %GetAddr.type => constants.%GetAddr.type @@ -173,7 +173,7 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@GetAddr.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GetAddr(constants.%T) { @@ -184,7 +184,7 @@ class Declaration(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@GetValue.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GetValue(constants.%T) { @@ -192,11 +192,11 @@ class Declaration(T:! type); // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Declaration(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index 6b740a8035cfd..64695299d53f1 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -129,18 +129,18 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: %N.loc4_23.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc4_23.2: i32 = bind_symbolic_name N 1, %N.loc4_23.1 [symbolic = @Class.%N (constants.%N)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32, %.loc4_27.1 [template = i32] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc4: i32 = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: %Class.ref.loc6: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_17.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] -// CHECK:STDOUT: %.loc6_17.2: type = converted %int.make_type_32.loc6, %.loc6_17.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_17.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc6_17.2: type = converted %int.make_type_32, %.loc6_17.1 [template = i32] // CHECK:STDOUT: %.loc6_17.3: type = ptr_type i32 [template = constants.%.3] // CHECK:STDOUT: %.loc6_20: i32 = int_literal 5 [template = constants.%.4] // CHECK:STDOUT: %Class.loc6: type = class_type @Class, @Class(constants.%.3, constants.%.4) [template = constants.%Class.3] @@ -155,9 +155,9 @@ class Outer(T:! type) { // CHECK:STDOUT: %b: ref %Class.4 = bind_name b, %b.var // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type, file.%N.loc4_23.2: i32) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type, %N.loc4: i32) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -170,20 +170,20 @@ class Outer(T:! type) { // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T, constants.%N) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%.3, constants.%.4) { -// CHECK:STDOUT: %T => constants.%.3 -// CHECK:STDOUT: %N => constants.%.4 +// CHECK:STDOUT: %T.1 => constants.%.3 +// CHECK:STDOUT: %N.1 => constants.%.4 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%.1, constants.%.6) { -// CHECK:STDOUT: %T => constants.%.1 -// CHECK:STDOUT: %N => constants.%.6 +// CHECK:STDOUT: %T.1 => constants.%.1 +// CHECK:STDOUT: %N.1 => constants.%.6 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: } @@ -226,26 +226,26 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: %N.loc4_23.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc4_23.2: i32 = bind_symbolic_name N 1, %N.loc4_23.1 [symbolic = @Class.%N (constants.%N)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32, %.loc4_27.1 [template = i32] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc4: i32 = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_17.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_17.2: type = converted %int.make_type_32.loc13, %.loc13_17.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_17.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_17.2: type = converted %int.make_type_32, %.loc13_17.1 [template = i32] // CHECK:STDOUT: %.loc13_17.3: type = ptr_type i32 [template = constants.%.3] // CHECK:STDOUT: %a.var: ref = var a // CHECK:STDOUT: %a: ref = bind_name a, %a.var // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type, file.%N.loc4_23.2: i32) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type, %N.loc4: i32) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -258,8 +258,8 @@ class Outer(T:! type) { // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T, constants.%N) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_too_many.carbon @@ -302,18 +302,18 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: %N.loc4_23.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc4_23.2: i32 = bind_symbolic_name N 1, %N.loc4_23.1 [symbolic = @Class.%N (constants.%N)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32, %.loc4_27.1 [template = i32] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc4: i32 = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_17.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_17.2: type = converted %int.make_type_32.loc13, %.loc13_17.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_17.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_17.2: type = converted %int.make_type_32, %.loc13_17.1 [template = i32] // CHECK:STDOUT: %.loc13_17.3: type = ptr_type i32 [template = constants.%.3] // CHECK:STDOUT: %.loc13_20: i32 = int_literal 1 [template = constants.%.4] // CHECK:STDOUT: %.loc13_23: i32 = int_literal 2 [template = constants.%.5] @@ -321,9 +321,9 @@ class Outer(T:! type) { // CHECK:STDOUT: %a: ref = bind_name a, %a.var // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type, file.%N.loc4_23.2: i32) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type, %N.loc4: i32) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -336,8 +336,8 @@ class Outer(T:! type) { // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T, constants.%N) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_no_conversion.carbon @@ -402,19 +402,19 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32.loc4, %.loc4_27.1 [template = i32] -// CHECK:STDOUT: %N.loc4_23.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc4_23.2: i32 = bind_symbolic_name N 1, %N.loc4_23.1 [symbolic = @Class.%N (constants.%N)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_27.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_27.2: type = converted %int.make_type_32, %.loc4_27.1 [template = i32] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc4: i32 = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] // CHECK:STDOUT: %.loc15_14: i32 = int_literal 5 [template = constants.%.3] -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_20.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_20.2: type = converted %int.make_type_32.loc15, %.loc15_20.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_20.2: type = converted %int.make_type_32, %.loc15_20.1 [template = i32] // CHECK:STDOUT: %.loc15_20.3: type = ptr_type i32 [template = constants.%.4] // CHECK:STDOUT: %.loc15_13.1: type = interface_type @ImplicitAs, @ImplicitAs(type) [template = constants.%.8] // CHECK:STDOUT: %.loc15_13.2: %.9 = specific_constant imports.%import_ref.4, @ImplicitAs(type) [template = constants.%.10] @@ -443,9 +443,9 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type, file.%N.loc4_23.2: i32) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type, %N.loc4: i32) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -466,8 +466,8 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T, constants.%N) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @ImplicitAs(constants.%Dest) { @@ -560,22 +560,22 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Outer.decl: %Outer.type = class_decl @Outer [template = constants.%Outer.1] { -// CHECK:STDOUT: %T.loc2_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc2_13.2: type = bind_symbolic_name T 0, %T.loc2_13.1 [symbolic = @Outer.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc2: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Outer(file.%T.loc2_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Outer(%T.loc2: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Inner.type: type = generic_class_type @Inner, @Outer(%T) [symbolic = %Inner.type (constants.%Inner.type.1)] +// CHECK:STDOUT: %Inner.type: type = generic_class_type @Inner, @Outer(%T.1) [symbolic = %Inner.type (constants.%Inner.type.1)] // CHECK:STDOUT: %Inner: @Outer.%Inner.type (%Inner.type.1) = struct_value () [symbolic = %Inner (constants.%Inner.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %Inner.decl: @Outer.%Inner.type (%Inner.type.1) = class_decl @Inner [symbolic = %Inner (constants.%Inner.1)] { -// CHECK:STDOUT: %U.loc3_15.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc3_15.2: type = bind_symbolic_name U 1, %U.loc3_15.1 [symbolic = @Inner.%U (constants.%U)] +// CHECK:STDOUT: %Inner.decl: @Outer.%Inner.type (%Inner.type.1) = class_decl @Inner [symbolic = @Outer.%Inner (constants.%Inner.1)] { +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc3: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -584,46 +584,46 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Inner(file.%T.loc2_13.2: type, @Outer.%U.loc3_15.2: type) { -// CHECK:STDOUT: %U: type = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic class @Inner(@Outer.%T.loc2: type, %U.loc3: type) { +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %A.type: type = fn_type @A, @Inner(%T, %U) [symbolic = %A.type (constants.%A.type.1)] +// CHECK:STDOUT: %A.type: type = fn_type @A, @Inner(%T, %U.1) [symbolic = %A.type (constants.%A.type.1)] // CHECK:STDOUT: %A: @Inner.%A.type (%A.type.1) = struct_value () [symbolic = %A (constants.%A.1)] -// CHECK:STDOUT: %B.type: type = fn_type @B, @Inner(%T, %U) [symbolic = %B.type (constants.%B.type.1)] +// CHECK:STDOUT: %B.type: type = fn_type @B, @Inner(%T, %U.1) [symbolic = %B.type (constants.%B.type.1)] // CHECK:STDOUT: %B: @Inner.%B.type (%B.type.1) = struct_value () [symbolic = %B (constants.%B.1)] -// CHECK:STDOUT: %C.type: type = fn_type @C, @Inner(%T, %U) [symbolic = %C.type (constants.%C.type.1)] +// CHECK:STDOUT: %C.type: type = fn_type @C, @Inner(%T, %U.1) [symbolic = %C.type (constants.%C.type.1)] // CHECK:STDOUT: %C: @Inner.%C.type (%C.type.1) = struct_value () [symbolic = %C (constants.%C.1)] -// CHECK:STDOUT: %D.type: type = fn_type @D, @Inner(%T, %U) [symbolic = %D.type (constants.%D.type.1)] +// CHECK:STDOUT: %D.type: type = fn_type @D, @Inner(%T, %U.1) [symbolic = %D.type (constants.%D.type.1)] // CHECK:STDOUT: %D: @Inner.%D.type (%D.type.1) = struct_value () [symbolic = %D (constants.%D.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %A.decl: @Inner.%A.type (%A.type.1) = fn_decl @A [symbolic = %A (constants.%A.1)] { -// CHECK:STDOUT: %Outer.ref.loc4: %Outer.type = name_ref Outer, file.%Outer.decl [template = constants.%Outer.1] -// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, file.%T.loc2_13.2 [symbolic = @A.%T (constants.%T)] -// CHECK:STDOUT: %Outer.loc4: type = class_type @Outer, @Outer(constants.%T) [symbolic = @A.%Outer (constants.%Outer.2)] -// CHECK:STDOUT: %return.var.loc4: ref @A.%Outer (%Outer.2) = var +// CHECK:STDOUT: %A.decl: @Inner.%A.type (%A.type.1) = fn_decl @A [symbolic = @Inner.%A (constants.%A.1)] { +// CHECK:STDOUT: %Outer.ref: %Outer.type = name_ref Outer, file.%Outer.decl [template = constants.%Outer.1] +// CHECK:STDOUT: %T.ref: type = name_ref T, @Outer.%T.loc2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %Outer.loc4: type = class_type @Outer, @Outer(constants.%T) [symbolic = %Outer.1 (constants.%Outer.2)] +// CHECK:STDOUT: %return: ref @A.%Outer.1 (%Outer.2) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %B.decl: @Inner.%B.type (%B.type.1) = fn_decl @B [symbolic = %B (constants.%B.1)] { -// CHECK:STDOUT: %Outer.ref.loc7: %Outer.type = name_ref Outer, file.%Outer.decl [template = constants.%Outer.1] -// CHECK:STDOUT: %U.ref.loc7: type = name_ref U, @Outer.%U.loc3_15.2 [symbolic = @B.%U (constants.%U)] -// CHECK:STDOUT: %Outer.loc7: type = class_type @Outer, @Outer(constants.%U) [symbolic = @B.%Outer (constants.%Outer.3)] -// CHECK:STDOUT: %return.var.loc7: ref @B.%Outer (%Outer.3) = var +// CHECK:STDOUT: %B.decl: @Inner.%B.type (%B.type.1) = fn_decl @B [symbolic = @Inner.%B (constants.%B.1)] { +// CHECK:STDOUT: %Outer.ref: %Outer.type = name_ref Outer, file.%Outer.decl [template = constants.%Outer.1] +// CHECK:STDOUT: %U.ref: type = name_ref U, @Inner.%U.loc3 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: %Outer.loc7: type = class_type @Outer, @Outer(constants.%U) [symbolic = %Outer.1 (constants.%Outer.3)] +// CHECK:STDOUT: %return: ref @B.%Outer.1 (%Outer.3) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %C.decl: @Inner.%C.type (%C.type.1) = fn_decl @C [symbolic = %C (constants.%C.1)] { -// CHECK:STDOUT: %.loc10: @C.%Inner.type (%Inner.type.1) = specific_constant @Outer.%Inner.decl, @Outer(constants.%T) [symbolic = @C.%Inner.1 (constants.%Inner.1)] -// CHECK:STDOUT: %Inner.ref.loc10: @C.%Inner.type (%Inner.type.1) = name_ref Inner, %.loc10 [symbolic = @C.%Inner.1 (constants.%Inner.1)] -// CHECK:STDOUT: %T.ref.loc10: type = name_ref T, file.%T.loc2_13.2 [symbolic = @C.%T (constants.%T)] -// CHECK:STDOUT: %Inner.loc10: type = class_type @Inner, @Inner(constants.%T, constants.%T) [symbolic = @C.%Inner.2 (constants.%Inner.3)] -// CHECK:STDOUT: %return.var.loc10: ref @C.%Inner.2 (%Inner.3) = var +// CHECK:STDOUT: %C.decl: @Inner.%C.type (%C.type.1) = fn_decl @C [symbolic = @Inner.%C (constants.%C.1)] { +// CHECK:STDOUT: %.loc10: @C.%Inner.type (%Inner.type.1) = specific_constant @Outer.%Inner.decl, @Outer(constants.%T) [symbolic = %Inner.1 (constants.%Inner.1)] +// CHECK:STDOUT: %Inner.ref: @C.%Inner.type (%Inner.type.1) = name_ref Inner, %.loc10 [symbolic = %Inner.1 (constants.%Inner.1)] +// CHECK:STDOUT: %T.ref: type = name_ref T, @Outer.%T.loc2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %Inner.loc10: type = class_type @Inner, @Inner(constants.%T, constants.%T) [symbolic = %Inner.2 (constants.%Inner.3)] +// CHECK:STDOUT: %return: ref @C.%Inner.2 (%Inner.3) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %D.decl: @Inner.%D.type (%D.type.1) = fn_decl @D [symbolic = %D (constants.%D.1)] { -// CHECK:STDOUT: %.loc13: @D.%Inner.type (%Inner.type.1) = specific_constant @Outer.%Inner.decl, @Outer(constants.%T) [symbolic = @D.%Inner.1 (constants.%Inner.1)] -// CHECK:STDOUT: %Inner.ref.loc13: @D.%Inner.type (%Inner.type.1) = name_ref Inner, %.loc13 [symbolic = @D.%Inner.1 (constants.%Inner.1)] -// CHECK:STDOUT: %U.ref.loc13: type = name_ref U, @Outer.%U.loc3_15.2 [symbolic = @D.%U (constants.%U)] -// CHECK:STDOUT: %Inner.loc13: type = class_type @Inner, @Inner(constants.%T, constants.%U) [symbolic = @D.%Inner.2 (constants.%Inner.2)] -// CHECK:STDOUT: %return.var.loc13: ref @D.%Inner.2 (%Inner.2) = var +// CHECK:STDOUT: %D.decl: @Inner.%D.type (%D.type.1) = fn_decl @D [symbolic = @Inner.%D (constants.%D.1)] { +// CHECK:STDOUT: %.loc13: @D.%Inner.type (%Inner.type.1) = specific_constant @Outer.%Inner.decl, @Outer(constants.%T) [symbolic = %Inner.1 (constants.%Inner.1)] +// CHECK:STDOUT: %Inner.ref: @D.%Inner.type (%Inner.type.1) = name_ref Inner, %.loc13 [symbolic = %Inner.1 (constants.%Inner.1)] +// CHECK:STDOUT: %U.ref: type = name_ref U, @Inner.%U.loc3 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: %Inner.loc13: type = class_type @Inner, @Inner(constants.%T, constants.%U) [symbolic = %Inner.2 (constants.%Inner.2)] +// CHECK:STDOUT: %return: ref @D.%Inner.2 (%Inner.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -635,39 +635,39 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @A(file.%T.loc2_13.2: type, @Outer.%U.loc3_15.2: type) { +// CHECK:STDOUT: generic fn @A(@Outer.%T.loc2: type, @Inner.%U.loc3: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %Outer: type = class_type @Outer, @Outer(%T) [symbolic = %Outer (constants.%Outer.2)] +// CHECK:STDOUT: %Outer.1: type = class_type @Outer, @Outer(%T) [symbolic = %Outer.1 (constants.%Outer.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %struct: @A.%Outer (%Outer.2) = struct_value () [symbolic = %struct (constants.%struct.1)] +// CHECK:STDOUT: %struct: @A.%Outer.1 (%Outer.2) = struct_value () [symbolic = %struct (constants.%struct.1)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @Inner.%return.var.loc4: @A.%Outer (%Outer.2) { +// CHECK:STDOUT: fn() -> %return: @A.%Outer.1 (%Outer.2) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc5_15.1: %.2 = struct_literal () -// CHECK:STDOUT: %.loc5_15.2: init @A.%Outer (%Outer.2) = class_init (), @Inner.%return.var.loc4 [symbolic = %struct (constants.%struct.1)] -// CHECK:STDOUT: %.loc5_16: init @A.%Outer (%Outer.2) = converted %.loc5_15.1, %.loc5_15.2 [symbolic = %struct (constants.%struct.1)] -// CHECK:STDOUT: return %.loc5_16 to @Inner.%return.var.loc4 +// CHECK:STDOUT: %.loc5_15.2: init @A.%Outer.1 (%Outer.2) = class_init (), %return [symbolic = %struct (constants.%struct.1)] +// CHECK:STDOUT: %.loc5_16: init @A.%Outer.1 (%Outer.2) = converted %.loc5_15.1, %.loc5_15.2 [symbolic = %struct (constants.%struct.1)] +// CHECK:STDOUT: return %.loc5_16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @B(file.%T.loc2_13.2: type, @Outer.%U.loc3_15.2: type) { +// CHECK:STDOUT: generic fn @B(@Outer.%T.loc2: type, @Inner.%U.loc3: type) { // CHECK:STDOUT: %U: type = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] -// CHECK:STDOUT: %Outer: type = class_type @Outer, @Outer(%U) [symbolic = %Outer (constants.%Outer.3)] +// CHECK:STDOUT: %Outer.1: type = class_type @Outer, @Outer(%U) [symbolic = %Outer.1 (constants.%Outer.3)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %struct: @B.%Outer (%Outer.3) = struct_value () [symbolic = %struct (constants.%struct.2)] +// CHECK:STDOUT: %struct: @B.%Outer.1 (%Outer.3) = struct_value () [symbolic = %struct (constants.%struct.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @Inner.%return.var.loc7: @B.%Outer (%Outer.3) { +// CHECK:STDOUT: fn() -> %return: @B.%Outer.1 (%Outer.3) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc8_15.1: %.2 = struct_literal () -// CHECK:STDOUT: %.loc8_15.2: init @B.%Outer (%Outer.3) = class_init (), @Inner.%return.var.loc7 [symbolic = %struct (constants.%struct.2)] -// CHECK:STDOUT: %.loc8_16: init @B.%Outer (%Outer.3) = converted %.loc8_15.1, %.loc8_15.2 [symbolic = %struct (constants.%struct.2)] -// CHECK:STDOUT: return %.loc8_16 to @Inner.%return.var.loc7 +// CHECK:STDOUT: %.loc8_15.2: init @B.%Outer.1 (%Outer.3) = class_init (), %return [symbolic = %struct (constants.%struct.2)] +// CHECK:STDOUT: %.loc8_16: init @B.%Outer.1 (%Outer.3) = converted %.loc8_15.1, %.loc8_15.2 [symbolic = %struct (constants.%struct.2)] +// CHECK:STDOUT: return %.loc8_16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @C(file.%T.loc2_13.2: type, @Outer.%U.loc3_15.2: type) { +// CHECK:STDOUT: generic fn @C(@Outer.%T.loc2: type, @Inner.%U.loc3: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Inner.type: type = generic_class_type @Inner, @Outer(%T) [symbolic = %Inner.type (constants.%Inner.type.1)] // CHECK:STDOUT: %Inner.1: @C.%Inner.type (%Inner.type.1) = struct_value () [symbolic = %Inner.1 (constants.%Inner.1)] @@ -676,16 +676,16 @@ class Outer(T:! type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %struct: @C.%Inner.2 (%Inner.3) = struct_value () [symbolic = %struct (constants.%struct.3)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @Inner.%return.var.loc10: @C.%Inner.2 (%Inner.3) { +// CHECK:STDOUT: fn() -> %return: @C.%Inner.2 (%Inner.3) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc11_15.1: %.2 = struct_literal () -// CHECK:STDOUT: %.loc11_15.2: init @C.%Inner.2 (%Inner.3) = class_init (), @Inner.%return.var.loc10 [symbolic = %struct (constants.%struct.3)] +// CHECK:STDOUT: %.loc11_15.2: init @C.%Inner.2 (%Inner.3) = class_init (), %return [symbolic = %struct (constants.%struct.3)] // CHECK:STDOUT: %.loc11_16: init @C.%Inner.2 (%Inner.3) = converted %.loc11_15.1, %.loc11_15.2 [symbolic = %struct (constants.%struct.3)] -// CHECK:STDOUT: return %.loc11_16 to @Inner.%return.var.loc10 +// CHECK:STDOUT: return %.loc11_16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @D(file.%T.loc2_13.2: type, @Outer.%U.loc3_15.2: type) { +// CHECK:STDOUT: generic fn @D(@Outer.%T.loc2: type, @Inner.%U.loc3: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Inner.type: type = generic_class_type @Inner, @Outer(%T) [symbolic = %Inner.type (constants.%Inner.type.1)] // CHECK:STDOUT: %Inner.1: @D.%Inner.type (%Inner.type.1) = struct_value () [symbolic = %Inner.1 (constants.%Inner.1)] @@ -695,17 +695,17 @@ class Outer(T:! type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %struct: @D.%Inner.2 (%Inner.2) = struct_value () [symbolic = %struct (constants.%struct.4)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @Inner.%return.var.loc13: @D.%Inner.2 (%Inner.2) { +// CHECK:STDOUT: fn() -> %return: @D.%Inner.2 (%Inner.2) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc14_15.1: %.2 = struct_literal () -// CHECK:STDOUT: %.loc14_15.2: init @D.%Inner.2 (%Inner.2) = class_init (), @Inner.%return.var.loc13 [symbolic = %struct (constants.%struct.4)] +// CHECK:STDOUT: %.loc14_15.2: init @D.%Inner.2 (%Inner.2) = class_init (), %return [symbolic = %struct (constants.%struct.4)] // CHECK:STDOUT: %.loc14_16: init @D.%Inner.2 (%Inner.2) = converted %.loc14_15.1, %.loc14_15.2 [symbolic = %struct (constants.%struct.4)] -// CHECK:STDOUT: return %.loc14_16 to @Inner.%return.var.loc13 +// CHECK:STDOUT: return %.loc14_16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Inner.type => constants.%Inner.type.1 @@ -713,7 +713,7 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Inner(constants.%T, constants.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T => constants.%T @@ -728,16 +728,16 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(@A.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @A(constants.%T, constants.%U) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %Outer => constants.%Outer.2 +// CHECK:STDOUT: %Outer.1 => constants.%Outer.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(constants.%U) { -// CHECK:STDOUT: %T => constants.%U +// CHECK:STDOUT: %T.1 => constants.%U // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Inner.type => constants.%Inner.type.2 @@ -745,16 +745,16 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(@B.%U) { -// CHECK:STDOUT: %T => constants.%U +// CHECK:STDOUT: %T.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @B(constants.%T, constants.%U) { // CHECK:STDOUT: %U => constants.%U -// CHECK:STDOUT: %Outer => constants.%Outer.3 +// CHECK:STDOUT: %Outer.1 => constants.%Outer.3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Inner(constants.%T, constants.%T) { -// CHECK:STDOUT: %U => constants.%T +// CHECK:STDOUT: %U.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T => constants.%T @@ -769,11 +769,11 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(@C.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Inner(@C.%T, @C.%T) { -// CHECK:STDOUT: %U => constants.%T +// CHECK:STDOUT: %U.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%T, constants.%U) { @@ -784,11 +784,11 @@ class Outer(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Outer(@D.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Inner(@D.%T, @D.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @D(constants.%T, constants.%U) { @@ -799,11 +799,11 @@ class Outer(T:! type) { // CHECK:STDOUT: %Inner.2 => constants.%Inner.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Inner(@Inner.%T, @Inner.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: specific @Inner(@Inner.%T, @Inner.%U.1) { +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Outer(@Outer.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Outer(@Outer.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/field.carbon b/toolchain/check/testdata/class/generic/field.carbon index b41840c845f09..ea2755c44054d 100644 --- a/toolchain/check/testdata/class/generic/field.carbon +++ b/toolchain/check/testdata/class/generic/field.carbon @@ -75,55 +75,55 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Class.ref.loc15: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] // CHECK:STDOUT: %int.make_type_32.loc15_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_14.1: type = value_of_initializer %int.make_type_32.loc15_15 [template = i32] // CHECK:STDOUT: %.loc15_14.2: type = converted %int.make_type_32.loc15_15, %.loc15_14.1 [template = i32] -// CHECK:STDOUT: %Class.loc15: type = class_type @Class, @Class(i32) [template = constants.%Class.3] -// CHECK:STDOUT: %c.loc15_6.1: %Class.3 = param c, runtime_param0 -// CHECK:STDOUT: @F.%c: %Class.3 = bind_name c, %c.loc15_6.1 +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(i32) [template = constants.%Class.3] +// CHECK:STDOUT: %c.param: %Class.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc15_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_24.1: type = value_of_initializer %int.make_type_32.loc15_24 [template = i32] // CHECK:STDOUT: %.loc15_24.2: type = converted %int.make_type_32.loc15_24, %.loc15_24.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %T.loc19_6.1: type = param T, runtime_param -// CHECK:STDOUT: @G.%T.loc19: type = bind_symbolic_name T 0, %T.loc19_6.1 [symbolic = @G.%T.1 (constants.%T)] -// CHECK:STDOUT: %Class.ref.loc19: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref.loc19_25: type = name_ref T, @G.%T.loc19 [symbolic = @G.%T.1 (constants.%T)] -// CHECK:STDOUT: %Class.loc19: type = class_type @Class, @Class(constants.%T) [symbolic = @G.%Class (constants.%Class.2)] -// CHECK:STDOUT: %c.loc19_16.1: @G.%Class (%Class.2) = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: @G.%Class (%Class.2) = bind_name c, %c.loc19_16.1 -// CHECK:STDOUT: %T.ref.loc19_32: type = name_ref T, @G.%T.loc19 [symbolic = @G.%T.1 (constants.%T)] -// CHECK:STDOUT: @G.%return: ref @G.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc19: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %T.ref.loc19_25: type = name_ref T, %T.loc19 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class.loc19: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] +// CHECK:STDOUT: %c.param: @G.%Class.1 (%Class.2) = param c, runtime_param0 +// CHECK:STDOUT: %c: @G.%Class.1 (%Class.2) = bind_name c, %c.param +// CHECK:STDOUT: %T.ref.loc19_32: type = name_ref T, %T.loc19 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @G.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { -// CHECK:STDOUT: %U.loc23_6.1: type = param U, runtime_param -// CHECK:STDOUT: @H.%U.loc23: type = bind_symbolic_name U 0, %U.loc23_6.1 [symbolic = @H.%U.1 (constants.%U)] -// CHECK:STDOUT: %Class.ref.loc23: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %U.ref.loc23_25: type = name_ref U, @H.%U.loc23 [symbolic = @H.%U.1 (constants.%U)] -// CHECK:STDOUT: %Class.loc23: type = class_type @Class, @Class(constants.%U) [symbolic = @H.%Class (constants.%Class.4)] -// CHECK:STDOUT: %c.loc23_16.1: @H.%Class (%Class.4) = param c, runtime_param0 -// CHECK:STDOUT: @H.%c: @H.%Class (%Class.4) = bind_name c, %c.loc23_16.1 -// CHECK:STDOUT: %U.ref.loc23_32: type = name_ref U, @H.%U.loc23 [symbolic = @H.%U.1 (constants.%U)] -// CHECK:STDOUT: @H.%return: ref @H.%U.1 (%U) = var +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc23: type = bind_symbolic_name U 0, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %U.ref.loc23_25: type = name_ref U, %U.loc23 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %Class.loc23: type = class_type @Class, @Class(constants.%U) [symbolic = %Class.1 (constants.%Class.4)] +// CHECK:STDOUT: %c.param: @H.%Class.1 (%Class.4) = param c, runtime_param0 +// CHECK:STDOUT: %c: @H.%Class.1 (%Class.4) = bind_name c, %c.param +// CHECK:STDOUT: %U.ref.loc23_32: type = name_ref U, %U.loc23 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %return: ref @H.%U.1 (%U) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc12: @Class.%.1 (%.2) = field_decl x, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -145,14 +145,14 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G(%T.loc19: type) { // CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Class.1: type = class_type @Class, @Class(%T.1) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class (%Class.2), @G.%T.1 (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class.1 (%Class.2), @G.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(%T.loc19: type, %c: @G.%Class (%Class.2)) -> @G.%T.1 (%T) { +// CHECK:STDOUT: fn(%T.loc19: type, %c: @G.%Class.1 (%Class.2)) -> @G.%T.1 (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %c.ref: @G.%Class (%Class.2) = name_ref c, %c +// CHECK:STDOUT: %c.ref: @G.%Class.1 (%Class.2) = name_ref c, %c // CHECK:STDOUT: %x.ref: @G.%.1 (%.2) = name_ref x, @Class.%.loc12 [template = @Class.%.loc12] // CHECK:STDOUT: %.loc20_11.1: ref @G.%T.1 (%T) = class_element_access %c.ref, element0 // CHECK:STDOUT: %.loc20_11.2: @G.%T.1 (%T) = bind_value %.loc20_11.1 @@ -162,14 +162,14 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: // CHECK:STDOUT: generic fn @H(%U.loc23: type) { // CHECK:STDOUT: %U.1: type = bind_symbolic_name U 0 [symbolic = %U.1 (constants.%U)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%U.1) [symbolic = %Class (constants.%Class.4)] +// CHECK:STDOUT: %Class.1: type = class_type @Class, @Class(%U.1) [symbolic = %Class.1 (constants.%Class.4)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = unbound_element_type @H.%Class (%Class.4), @H.%U.1 (%U) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.1: type = unbound_element_type @H.%Class.1 (%Class.4), @H.%U.1 (%U) [symbolic = %.1 (constants.%.6)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(%U.loc23: type, %c: @H.%Class (%Class.4)) -> @H.%U.1 (%U) { +// CHECK:STDOUT: fn(%U.loc23: type, %c: @H.%Class.1 (%Class.4)) -> @H.%U.1 (%U) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %c.ref: @H.%Class (%Class.4) = name_ref c, %c +// CHECK:STDOUT: %c.ref: @H.%Class.1 (%Class.4) = name_ref c, %c // CHECK:STDOUT: %x.ref: @H.%.1 (%.6) = name_ref x, @Class.%.loc12 [template = @Class.%.loc12] // CHECK:STDOUT: %.loc24_11.1: ref @H.%U.1 (%U) = class_element_access %c.ref, element0 // CHECK:STDOUT: %.loc24_11.2: @H.%U.1 (%U) = bind_value %.loc24_11.1 @@ -178,19 +178,19 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: %.1 => constants.%.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(i32) { -// CHECK:STDOUT: %T => i32 +// CHECK:STDOUT: %T.1 => i32 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.3 @@ -198,16 +198,16 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@G.%T.1) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @G(constants.%T) { // CHECK:STDOUT: %T.1 => constants.%T -// CHECK:STDOUT: %Class => constants.%Class.2 +// CHECK:STDOUT: %Class.1 => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%U) { -// CHECK:STDOUT: %T => constants.%U +// CHECK:STDOUT: %T.1 => constants.%U // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.4 @@ -215,11 +215,11 @@ fn H(U:! type, c: Class(U)) -> U { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@H.%U.1) { -// CHECK:STDOUT: %T => constants.%U +// CHECK:STDOUT: %T.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @H(constants.%U) { // CHECK:STDOUT: %U.1 => constants.%U -// CHECK:STDOUT: %Class => constants.%Class.4 +// CHECK:STDOUT: %Class.1 => constants.%Class.4 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index 4b2abb4edb10b..a67c54dd98803 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -133,48 +133,48 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %CompleteClass.decl: %CompleteClass.type = class_decl @CompleteClass [template = constants.%CompleteClass.1] { -// CHECK:STDOUT: %T.loc6_21.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc6_21.2: type = bind_symbolic_name T 0, %T.loc6_21.1 [symbolic = @CompleteClass.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, %CompleteClass.decl [template = constants.%CompleteClass.1] +// CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, file.%CompleteClass.decl [template = constants.%CompleteClass.1] // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_24.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_24.2: type = converted %int.make_type_32, %.loc11_24.1 [template = i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(i32) [template = constants.%CompleteClass.3] -// CHECK:STDOUT: @F.2.%return: ref %CompleteClass.3 = var +// CHECK:STDOUT: %return: ref %CompleteClass.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @CompleteClass(file.%T.loc6_21.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @CompleteClass(%T.loc6: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(%T) [symbolic = %CompleteClass (constants.%CompleteClass.2)] +// CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(%T.1) [symbolic = %CompleteClass (constants.%CompleteClass.2)] // CHECK:STDOUT: %.1: type = unbound_element_type @CompleteClass.%CompleteClass (%CompleteClass.2), i32 [symbolic = %.1 (constants.%.2)] -// CHECK:STDOUT: %F.type: type = fn_type @F.1, @CompleteClass(%T) [symbolic = %F.type (constants.%F.type.1)] +// CHECK:STDOUT: %F.type: type = fn_type @F.1, @CompleteClass(%T.1) [symbolic = %F.type (constants.%F.type.1)] // CHECK:STDOUT: %F: @CompleteClass.%F.type (%F.type.1) = struct_value () [symbolic = %F (constants.%F.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %int.make_type_32.loc7: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc7_10.1: type = value_of_initializer %int.make_type_32.loc7 [template = i32] -// CHECK:STDOUT: %.loc7_10.2: type = converted %int.make_type_32.loc7, %.loc7_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc7_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc7_10.2: type = converted %int.make_type_32, %.loc7_10.1 [template = i32] // CHECK:STDOUT: %.loc7_8: @CompleteClass.%.1 (%.2) = field_decl n, element0 [template] -// CHECK:STDOUT: %F.decl: @CompleteClass.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = %F (constants.%F.1)] { -// CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc8_13.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] -// CHECK:STDOUT: %.loc8_13.2: type = converted %int.make_type_32.loc8, %.loc8_13.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %F.decl: @CompleteClass.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = @CompleteClass.%F (constants.%F.1)] { +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc8_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc8_13.2: type = converted %int.make_type_32, %.loc8_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -186,24 +186,24 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F.1(file.%T.loc6_21.2: type) { +// CHECK:STDOUT: generic fn @F.1(@CompleteClass.%T.loc6: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: fn() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc8: i32 = int_literal 0 [template = constants.%.4] -// CHECK:STDOUT: return %.loc8 +// CHECK:STDOUT: %.loc8_26: i32 = int_literal 0 [template = constants.%.4] +// CHECK:STDOUT: return %.loc8_26 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2() -> %CompleteClass.3; // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @CompleteClass(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %CompleteClass => constants.%CompleteClass.2 @@ -214,12 +214,12 @@ class Class(U:! type) { // CHECK:STDOUT: // CHECK:STDOUT: specific @F.1(constants.%T) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @CompleteClass(@CompleteClass.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @CompleteClass(@CompleteClass.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @CompleteClass(i32) { -// CHECK:STDOUT: %T => i32 +// CHECK:STDOUT: %T.1 => i32 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- foo.impl.carbon @@ -284,8 +284,8 @@ class Class(U:! type) { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.2 [template = constants.%CompleteClass.1] @@ -293,19 +293,19 @@ class Class(U:! type) { // CHECK:STDOUT: %.loc8_24.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc8_24.2: type = converted %int.make_type_32, %.loc8_24.1 [template = i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(i32) [template = constants.%CompleteClass.3] -// CHECK:STDOUT: @F.2.%return: ref %CompleteClass.3 = var +// CHECK:STDOUT: %return: ref %CompleteClass.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Class(constants.%T: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc5: @Class.%.1 (%.2) = field_decl x, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -351,11 +351,11 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @CompleteClass(constants.%T) { @@ -447,13 +447,13 @@ class Class(U:! type) { // CHECK:STDOUT: %int.make_type_32.loc5: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_19.1: type = value_of_initializer %int.make_type_32.loc5 [template = i32] // CHECK:STDOUT: %.loc5_19.2: type = converted %int.make_type_32.loc5, %.loc5_19.1 [template = i32] -// CHECK:STDOUT: @UseMethod.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %UseField.decl: %UseField.type = fn_decl @UseField [template = constants.%UseField] { // CHECK:STDOUT: %int.make_type_32.loc10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_18.1: type = value_of_initializer %int.make_type_32.loc10 [template = i32] // CHECK:STDOUT: %.loc10_18.2: type = converted %int.make_type_32.loc10, %.loc10_18.1 [template = i32] -// CHECK:STDOUT: @UseField.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -479,9 +479,9 @@ class Class(U:! type) { // CHECK:STDOUT: fn @UseMethod() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.2 [template = constants.%CompleteClass.1] -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_23.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc6_23.2: type = converted %int.make_type_32, %.loc6_23.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_23.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] +// CHECK:STDOUT: %.loc6_23.2: type = converted %int.make_type_32.loc6, %.loc6_23.1 [template = i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(i32) [template = constants.%CompleteClass.3] // CHECK:STDOUT: %v.var: ref %CompleteClass.3 = var v // CHECK:STDOUT: %v: ref %CompleteClass.3 = bind_name v, %v.var @@ -509,9 +509,9 @@ class Class(U:! type) { // CHECK:STDOUT: fn @UseField() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %CompleteClass.ref: %CompleteClass.type = name_ref CompleteClass, imports.%import_ref.2 [template = constants.%CompleteClass.1] -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_23.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_23.2: type = converted %int.make_type_32, %.loc11_23.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_23.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_23.2: type = converted %int.make_type_32.loc11, %.loc11_23.1 [template = i32] // CHECK:STDOUT: %CompleteClass: type = class_type @CompleteClass, @CompleteClass(i32) [template = constants.%CompleteClass.3] // CHECK:STDOUT: %v.var: ref %CompleteClass.3 = var v // CHECK:STDOUT: %v: ref %CompleteClass.3 = bind_name v, %v.var @@ -824,8 +824,8 @@ class Class(U:! type) { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %U.loc14_13.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc14_13.2: type = bind_symbolic_name U 0, %U.loc14_13.1 [symbolic = @.1.%U (constants.%U)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc14: type = bind_symbolic_name U 0, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -835,8 +835,8 @@ class Class(U:! type) { // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%U.loc14_13.2: type) { -// CHECK:STDOUT: %U: type = bind_symbolic_name U 0 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic class @.1(%U.loc14: type) { +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 0 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -855,6 +855,6 @@ class Class(U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index b79b29e0ca320..051abd5823b49 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -75,29 +75,29 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc2_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc2_13.2: type = bind_symbolic_name T 0, %T.loc2_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc2: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %InitFromStructGeneric.decl: %InitFromStructGeneric.type = fn_decl @InitFromStructGeneric [template = constants.%InitFromStructGeneric] { -// CHECK:STDOUT: %T.loc6_26.1: type = param T, runtime_param -// CHECK:STDOUT: @InitFromStructGeneric.%T.loc6: type = bind_symbolic_name T 0, %T.loc6_26.1 [symbolic = @InitFromStructGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc6_39: type = name_ref T, @InitFromStructGeneric.%T.loc6 [symbolic = @InitFromStructGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc6_36.1: @InitFromStructGeneric.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @InitFromStructGeneric.%x: @InitFromStructGeneric.%T.1 (%T) = bind_name x, %x.loc6_36.1 -// CHECK:STDOUT: %T.ref.loc6_45: type = name_ref T, @InitFromStructGeneric.%T.loc6 [symbolic = @InitFromStructGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: @InitFromStructGeneric.%return: ref @InitFromStructGeneric.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc6_39: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @InitFromStructGeneric.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @InitFromStructGeneric.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc6_45: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @InitFromStructGeneric.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc2_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc2: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc2_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc2 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc3: @Class.%.1 (%.2) = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -117,7 +117,7 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: fn(%T.loc6: type, %x: @InitFromStructGeneric.%T.1 (%T)) -> @InitFromStructGeneric.%T.1 (%T) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc7: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %Class.loc7: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: %v.var: ref @InitFromStructGeneric.%Class.1 (%Class.2) = var v // CHECK:STDOUT: %v: ref @InitFromStructGeneric.%Class.1 (%Class.2) = bind_name v, %v.var @@ -137,15 +137,15 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: %.1 => constants.%.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @InitFromStructGeneric(constants.%T) { @@ -153,7 +153,7 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@InitFromStructGeneric.%T.1) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_todo_init.carbon @@ -223,14 +223,14 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %InitFromStructSpecific.decl: %InitFromStructSpecific.type = fn_decl @InitFromStructSpecific [template = constants.%InitFromStructSpecific] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc9_32.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc9_32.2: type = converted %int.make_type_32, %.loc9_32.1 [template = i32] -// CHECK:STDOUT: @InitFromStructSpecific.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc9: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc9_32.1: type = value_of_initializer %int.make_type_32.loc9 [template = i32] +// CHECK:STDOUT: %.loc9_32.2: type = converted %int.make_type_32.loc9, %.loc9_32.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -253,15 +253,15 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc5: @Class.%.1 (%.2) = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -275,9 +275,9 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: fn @InitFromStructSpecific() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_15.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc16_15.2: type = converted %int.make_type_32, %.loc16_15.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_15.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] +// CHECK:STDOUT: %.loc16_15.2: type = converted %int.make_type_32.loc16, %.loc16_15.1 [template = i32] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(i32) [template = constants.%Class.3] // CHECK:STDOUT: %v.var: ref %Class.3 = var v // CHECK:STDOUT: %v: ref %Class.3 = bind_name v, %v.var @@ -304,15 +304,15 @@ fn InitFromStructSpecific() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(i32) { -// CHECK:STDOUT: %T => i32 +// CHECK:STDOUT: %T.1 => i32 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.3 diff --git a/toolchain/check/testdata/class/generic/member_access.carbon b/toolchain/check/testdata/class/generic/member_access.carbon index 3daafacbadedd..e6dffbe843c83 100644 --- a/toolchain/check/testdata/class/generic/member_access.carbon +++ b/toolchain/check/testdata/class/generic/member_access.carbon @@ -108,83 +108,83 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc2_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc2_13.2: type = bind_symbolic_name T 0, %T.loc2_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc2: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %DirectFieldAccess.decl: %DirectFieldAccess.type = fn_decl @DirectFieldAccess [template = constants.%DirectFieldAccess] { -// CHECK:STDOUT: %Class.ref.loc10: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] // CHECK:STDOUT: %int.make_type_32.loc10_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_30.1: type = value_of_initializer %int.make_type_32.loc10_31 [template = i32] // CHECK:STDOUT: %.loc10_30.2: type = converted %int.make_type_32.loc10_31, %.loc10_30.1 [template = i32] -// CHECK:STDOUT: %Class.loc10: type = class_type @Class, @Class(i32) [template = constants.%Class.3] -// CHECK:STDOUT: %x.loc10_22.1: %Class.3 = param x, runtime_param0 -// CHECK:STDOUT: @DirectFieldAccess.%x: %Class.3 = bind_name x, %x.loc10_22.1 +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(i32) [template = constants.%Class.3] +// CHECK:STDOUT: %x.param: %Class.3 = param x, runtime_param0 +// CHECK:STDOUT: %x: %Class.3 = bind_name x, %x.param // CHECK:STDOUT: %int.make_type_32.loc10_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_40.1: type = value_of_initializer %int.make_type_32.loc10_40 [template = i32] // CHECK:STDOUT: %.loc10_40.2: type = converted %int.make_type_32.loc10_40, %.loc10_40.1 [template = i32] -// CHECK:STDOUT: @DirectFieldAccess.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %MethodCall.decl: %MethodCall.type = fn_decl @MethodCall [template = constants.%MethodCall] { -// CHECK:STDOUT: %Class.ref.loc14: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] // CHECK:STDOUT: %int.make_type_32.loc14_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_23.1: type = value_of_initializer %int.make_type_32.loc14_24 [template = i32] // CHECK:STDOUT: %.loc14_23.2: type = converted %int.make_type_32.loc14_24, %.loc14_23.1 [template = i32] -// CHECK:STDOUT: %Class.loc14: type = class_type @Class, @Class(i32) [template = constants.%Class.3] -// CHECK:STDOUT: %x.loc14_15.1: %Class.3 = param x, runtime_param0 -// CHECK:STDOUT: @MethodCall.%x: %Class.3 = bind_name x, %x.loc14_15.1 +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(i32) [template = constants.%Class.3] +// CHECK:STDOUT: %x.param: %Class.3 = param x, runtime_param0 +// CHECK:STDOUT: %x: %Class.3 = bind_name x, %x.param // CHECK:STDOUT: %int.make_type_32.loc14_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_33.1: type = value_of_initializer %int.make_type_32.loc14_33 [template = i32] // CHECK:STDOUT: %.loc14_33.2: type = converted %int.make_type_32.loc14_33, %.loc14_33.1 [template = i32] -// CHECK:STDOUT: @MethodCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AddrMethodCall.decl: %AddrMethodCall.type = fn_decl @AddrMethodCall [template = constants.%AddrMethodCall] { -// CHECK:STDOUT: %Class.ref.loc18: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] // CHECK:STDOUT: %int.make_type_32.loc18_28: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_27.1: type = value_of_initializer %int.make_type_32.loc18_28 [template = i32] // CHECK:STDOUT: %.loc18_27.2: type = converted %int.make_type_32.loc18_28, %.loc18_27.1 [template = i32] -// CHECK:STDOUT: %Class.loc18: type = class_type @Class, @Class(i32) [template = constants.%Class.3] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(i32) [template = constants.%Class.3] // CHECK:STDOUT: %.loc18_32: type = ptr_type %Class.3 [template = constants.%.8] -// CHECK:STDOUT: %p.loc18_19.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @AddrMethodCall.%p: %.8 = bind_name p, %p.loc18_19.1 +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc18_38: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_38.1: type = value_of_initializer %int.make_type_32.loc18_38 [template = i32] // CHECK:STDOUT: %.loc18_38.2: type = converted %int.make_type_32.loc18_38, %.loc18_38.1 [template = i32] -// CHECK:STDOUT: @AddrMethodCall.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc2_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc2: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] -// CHECK:STDOUT: %Get.type: type = fn_type @Get, @Class(%T) [symbolic = %Get.type (constants.%Get.type.1)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Get.type: type = fn_type @Get, @Class(%T.1) [symbolic = %Get.type (constants.%Get.type.1)] // CHECK:STDOUT: %Get: @Class.%Get.type (%Get.type.1) = struct_value () [symbolic = %Get (constants.%Get.1)] -// CHECK:STDOUT: %GetAddr.type: type = fn_type @GetAddr, @Class(%T) [symbolic = %GetAddr.type (constants.%GetAddr.type.1)] +// CHECK:STDOUT: %GetAddr.type: type = fn_type @GetAddr, @Class(%T.1) [symbolic = %GetAddr.type (constants.%GetAddr.type.1)] // CHECK:STDOUT: %GetAddr: @Class.%GetAddr.type (%GetAddr.type.1) = struct_value () [symbolic = %GetAddr (constants.%GetAddr.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref.loc3: type = name_ref T, file.%T.loc2_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc2 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc3: @Class.%.1 (%.2) = field_decl x, element0 [template] -// CHECK:STDOUT: %Get.decl: @Class.%Get.type (%Get.type.1) = fn_decl @Get [symbolic = %Get (constants.%Get.1)] { -// CHECK:STDOUT: %.loc5: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @Get.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref.loc5: type = name_ref Self, %.loc5 [symbolic = @Get.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc5_10.1: @Get.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc5_10.2: @Get.%Class (%Class.2) = bind_name self, %self.loc5_10.1 -// CHECK:STDOUT: %T.ref.loc5: type = name_ref T, file.%T.loc2_13.2 [symbolic = @Get.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc5: ref @Get.%T (%T) = var +// CHECK:STDOUT: %Get.decl: @Class.%Get.type (%Get.type.1) = fn_decl @Get [symbolic = @Class.%Get (constants.%Get.1)] { +// CHECK:STDOUT: %.loc5_16: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc5_16 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param: @Get.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @Get.%Class (%Class.2) = bind_name self, %self.param +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @Get.%T (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %GetAddr.decl: @Class.%GetAddr.type (%GetAddr.type.1) = fn_decl @GetAddr [symbolic = %GetAddr (constants.%GetAddr.1)] { -// CHECK:STDOUT: %.loc7_25: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @GetAddr.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref.loc7: type = name_ref Self, %.loc7_25 [symbolic = @GetAddr.%Class (constants.%Class.2)] -// CHECK:STDOUT: %.loc7_29: type = ptr_type %Class.2 [symbolic = @GetAddr.%.1 (constants.%.3)] -// CHECK:STDOUT: %self.loc7_19.1: @GetAddr.%.1 (%.3) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_19.3: @GetAddr.%.1 (%.3) = bind_name self, %self.loc7_19.1 -// CHECK:STDOUT: %.loc7_14: @GetAddr.%.1 (%.3) = addr_pattern %self.loc7_19.3 -// CHECK:STDOUT: %T.ref.loc7: type = name_ref T, file.%T.loc2_13.2 [symbolic = @GetAddr.%T (constants.%T)] -// CHECK:STDOUT: %.loc7_38: type = ptr_type %T [symbolic = @GetAddr.%.2 (constants.%.4)] -// CHECK:STDOUT: %return.var.loc7: ref @GetAddr.%.2 (%.4) = var +// CHECK:STDOUT: %GetAddr.decl: @Class.%GetAddr.type (%GetAddr.type.1) = fn_decl @GetAddr [symbolic = @Class.%GetAddr (constants.%GetAddr.1)] { +// CHECK:STDOUT: %.loc7_25: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc7_25 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.loc7_29: type = ptr_type %Class.2 [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %self.param: @GetAddr.%.1 (%.3) = param self, runtime_param0 +// CHECK:STDOUT: %self: @GetAddr.%.1 (%.3) = bind_name self, %self.param +// CHECK:STDOUT: %.loc7_14: @GetAddr.%.1 (%.3) = addr_pattern %self +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %.loc7_38: type = ptr_type %T [symbolic = %.2 (constants.%.4)] +// CHECK:STDOUT: %return: ref @GetAddr.%.2 (%.4) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -195,16 +195,16 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Get(file.%T.loc2_13.2: type) { +// CHECK:STDOUT: generic fn @Get(@Class.%T.loc2: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1: type = unbound_element_type @Get.%Class (%Class.2), @Get.%T (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Class.%self.loc5_10.2: @Get.%Class (%Class.2)]() -> @Get.%T (%T) { +// CHECK:STDOUT: fn[%self: @Get.%Class (%Class.2)]() -> @Get.%T (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @Get.%Class (%Class.2) = name_ref self, @Class.%self.loc5_10.2 +// CHECK:STDOUT: %self.ref: @Get.%Class (%Class.2) = name_ref self, %self // CHECK:STDOUT: %x.ref: @Get.%.1 (%.2) = name_ref x, @Class.%.loc3 [template = @Class.%.loc3] // CHECK:STDOUT: %.loc5_42.1: ref @Get.%T (%T) = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc5_42.2: @Get.%T (%T) = bind_value %.loc5_42.1 @@ -212,7 +212,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @GetAddr(file.%T.loc2_13.2: type) { +// CHECK:STDOUT: generic fn @GetAddr(@Class.%T.loc2: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: %.1: type = ptr_type @GetAddr.%Class (%Class.2) [symbolic = %.1 (constants.%.3)] @@ -221,9 +221,9 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.3: type = unbound_element_type @GetAddr.%Class (%Class.2), @GetAddr.%T (%T) [symbolic = %.3 (constants.%.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[addr @Class.%self.loc7_19.3: @GetAddr.%.1 (%.3)]() -> @GetAddr.%.2 (%.4) { +// CHECK:STDOUT: fn[addr %self: @GetAddr.%.1 (%.3)]() -> @GetAddr.%.2 (%.4) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @GetAddr.%.1 (%.3) = name_ref self, @Class.%self.loc7_19.3 +// CHECK:STDOUT: %self.ref: @GetAddr.%.1 (%.3) = name_ref self, %self // CHECK:STDOUT: %.loc7_54.1: ref @GetAddr.%Class (%Class.2) = deref %self.ref // CHECK:STDOUT: %x.ref: @GetAddr.%.3 (%.2) = name_ref x, @Class.%.loc3 [template = @Class.%.loc3] // CHECK:STDOUT: %.loc7_54.2: ref @GetAddr.%T (%T) = class_element_access %.loc7_54.1, element0 @@ -272,7 +272,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.2 @@ -284,7 +284,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@Get.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Get(constants.%T) { @@ -293,7 +293,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@GetAddr.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GetAddr(constants.%T) { @@ -303,12 +303,12 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: %.2 => constants.%.4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(i32) { -// CHECK:STDOUT: %T => i32 +// CHECK:STDOUT: %T.1 => i32 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.3 @@ -392,16 +392,16 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %StaticMemberFunctionCall.decl: %StaticMemberFunctionCall.type = fn_decl @StaticMemberFunctionCall [template = constants.%StaticMemberFunctionCall] { -// CHECK:STDOUT: %T.loc8_29.1: type = param T, runtime_param -// CHECK:STDOUT: @StaticMemberFunctionCall.%T.loc8: type = bind_symbolic_name T 0, %T.loc8_29.1 [symbolic = @StaticMemberFunctionCall.%T.1 (constants.%T)] -// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, @StaticMemberFunctionCall.%T.loc8 [symbolic = @StaticMemberFunctionCall.%T.1 (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%T) [symbolic = @StaticMemberFunctionCall.%Class.1 (constants.%Class.2)] -// CHECK:STDOUT: @StaticMemberFunctionCall.%return: ref @StaticMemberFunctionCall.%Class.1 (%Class.2) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class.ref.loc8: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %T.ref.loc8: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class.loc8: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] +// CHECK:STDOUT: %return: ref @StaticMemberFunctionCall.%Class.1 (%Class.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -424,19 +424,19 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Make.type: type = fn_type @Make, @Class(%T) [symbolic = %Make.type (constants.%Make.type)] +// CHECK:STDOUT: %Make.type: type = fn_type @Make, @Class(%T.1) [symbolic = %Make.type (constants.%Make.type)] // CHECK:STDOUT: %Make: @Class.%Make.type (%Make.type) = struct_value () [symbolic = %Make (constants.%Make)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %Make.decl: @Class.%Make.type (%Make.type) = fn_decl @Make [symbolic = %Make (constants.%Make)] { +// CHECK:STDOUT: %Make.decl: @Class.%Make.type (%Make.type) = fn_decl @Make [symbolic = @Class.%Make (constants.%Make)] { // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_13.2 [symbolic = @Make.%T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%T) [symbolic = @Make.%Class (constants.%Class.2)] -// CHECK:STDOUT: %return.var: ref @Make.%Class (%Class.2) = var +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %Class.loc5: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] +// CHECK:STDOUT: %return: ref @Make.%Class.1 (%Class.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -445,19 +445,19 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Make(file.%T.loc4_13.2: type) { +// CHECK:STDOUT: generic fn @Make(@Class.%T.loc4: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Class.1: type = class_type @Class, @Class(%T) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %struct: @Make.%Class (%Class.2) = struct_value () [symbolic = %struct (constants.%struct)] +// CHECK:STDOUT: %struct: @Make.%Class.1 (%Class.2) = struct_value () [symbolic = %struct (constants.%struct)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @Class.%return.var: @Make.%Class (%Class.2) { +// CHECK:STDOUT: fn() -> %return: @Make.%Class.1 (%Class.2) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc5_35.1: %.2 = struct_literal () -// CHECK:STDOUT: %.loc5_35.2: init @Make.%Class (%Class.2) = class_init (), @Class.%return.var [symbolic = %struct (constants.%struct)] -// CHECK:STDOUT: %.loc5_36: init @Make.%Class (%Class.2) = converted %.loc5_35.1, %.loc5_35.2 [symbolic = %struct (constants.%struct)] -// CHECK:STDOUT: return %.loc5_36 to @Class.%return.var +// CHECK:STDOUT: %.loc5_35.2: init @Make.%Class.1 (%Class.2) = class_init (), %return [symbolic = %struct (constants.%struct)] +// CHECK:STDOUT: %.loc5_36: init @Make.%Class.1 (%Class.2) = converted %.loc5_35.1, %.loc5_35.2 [symbolic = %struct (constants.%struct)] +// CHECK:STDOUT: return %.loc5_36 to %return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -475,8 +475,8 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: // CHECK:STDOUT: fn(%T.loc8: type) -> %return: @StaticMemberFunctionCall.%Class.1 (%Class.2) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class.ref.loc15: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %T.ref.loc15: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %Class.loc15: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: %.loc15_18: @StaticMemberFunctionCall.%Make.type (%Make.type) = specific_constant @Class.%Make.decl, @Class(constants.%T) [symbolic = %Make (constants.%Make)] // CHECK:STDOUT: %Make.ref: @StaticMemberFunctionCall.%Make.type (%Make.type) = name_ref Make, %.loc15_18 [symbolic = %Make (constants.%Make)] @@ -500,7 +500,7 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Make.type => constants.%Make.type @@ -508,20 +508,20 @@ fn StaticMemberFunctionCall(T:! type) -> Class(T) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@Make.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Make(constants.%T) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %Class => constants.%Class.2 +// CHECK:STDOUT: %Class.1 => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@StaticMemberFunctionCall.%T.1) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @StaticMemberFunctionCall(constants.%T) { diff --git a/toolchain/check/testdata/class/generic/member_inline.carbon b/toolchain/check/testdata/class/generic/member_inline.carbon index 1f7be07eaf3f5..31fa3cbd8cb83 100644 --- a/toolchain/check/testdata/class/generic/member_inline.carbon +++ b/toolchain/check/testdata/class/generic/member_inline.carbon @@ -75,39 +75,39 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @Class.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] -// CHECK:STDOUT: %G.type: type = fn_type @G, @Class(%T) [symbolic = %G.type (constants.%G.type)] +// CHECK:STDOUT: %G.type: type = fn_type @G, @Class(%T.1) [symbolic = %G.type (constants.%G.type)] // CHECK:STDOUT: %G: @Class.%G.type (%G.type) = struct_value () [symbolic = %G (constants.%G)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %T.ref.loc5_11: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %n.loc5_8.1: @F.%T (%T) = param n, runtime_param0 -// CHECK:STDOUT: %n.loc5_8.2: @F.%T (%T) = bind_name n, %n.loc5_8.1 -// CHECK:STDOUT: %T.ref.loc5_17: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc5: ref @F.%T (%T) = var +// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = @Class.%F (constants.%F)] { +// CHECK:STDOUT: %T.ref.loc5_11: type = name_ref T, @Class.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %n.param: @F.%T (%T) = param n, runtime_param0 +// CHECK:STDOUT: %n: @F.%T (%T) = bind_name n, %n.param +// CHECK:STDOUT: %T.ref.loc5_17: type = name_ref T, @Class.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @F.%T (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %G.decl: @Class.%G.type (%G.type) = fn_decl @G [symbolic = %G (constants.%G)] { -// CHECK:STDOUT: %.loc9: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @G.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc9 [symbolic = @G.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc9_8.1: @G.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc9_8.2: @G.%Class (%Class.2) = bind_name self, %self.loc9_8.1 -// CHECK:STDOUT: %T.ref.loc9: type = name_ref T, file.%T.loc4_13.2 [symbolic = @G.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc9: ref @G.%T (%T) = var +// CHECK:STDOUT: %G.decl: @Class.%G.type (%G.type) = fn_decl @G [symbolic = @Class.%G (constants.%G)] { +// CHECK:STDOUT: %.loc9: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc9 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param: @G.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @G.%Class (%Class.2) = bind_name self, %self.param +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @G.%T (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, file.%T.loc4_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc13: @Class.%.1 (%.2) = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -118,28 +118,28 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_13.2: type) { +// CHECK:STDOUT: generic fn @F(@Class.%T.loc4: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn(@Class.%n.loc5_8.2: @F.%T (%T)) -> @F.%T (%T) { +// CHECK:STDOUT: fn(%n: @F.%T (%T)) -> @F.%T (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: @F.%T (%T) = name_ref n, @Class.%n.loc5_8.2 +// CHECK:STDOUT: %n.ref: @F.%T (%T) = name_ref n, %n // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @G(file.%T.loc4_13.2: type) { +// CHECK:STDOUT: generic fn @G(@Class.%T.loc4: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class (%Class.2), @G.%T (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Class.%self.loc9_8.2: @G.%Class (%Class.2)]() -> @G.%T (%T) { +// CHECK:STDOUT: fn[%self: @G.%Class (%Class.2)]() -> @G.%T (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, @Class.%self.loc9_8.2 +// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, %self // CHECK:STDOUT: %n.ref: @G.%.1 (%.2) = name_ref n, @Class.%.loc13 [template = @Class.%.loc13] // CHECK:STDOUT: %.loc10_16.1: ref @G.%T (%T) = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc10_16.2: @G.%T (%T) = bind_value %.loc10_16.1 @@ -148,7 +148,7 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %F.type => constants.%F.type @@ -164,7 +164,7 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@G.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @G(constants.%T) { @@ -172,8 +172,8 @@ class C(T:! type) { // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_member_inline.carbon @@ -211,22 +211,22 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: %C.type = class_decl @C [template = constants.%C.1] { -// CHECK:STDOUT: %T.loc4_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @C.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%T.loc4_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %F.type: type = fn_type @F, @C(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @C(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @C.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] -// CHECK:STDOUT: %C: type = class_type @C, @C(%T) [symbolic = %C (constants.%C.2)] +// CHECK:STDOUT: %C: type = class_type @C, @C(%T.1) [symbolic = %C (constants.%C.2)] // CHECK:STDOUT: %.1: type = unbound_element_type @C.%C (%C.2), %.2 [symbolic = %.1 (constants.%.3)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %F.decl: @C.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] {} +// CHECK:STDOUT: %F.decl: @C.%F.type (%F.type) = fn_decl @F [symbolic = @C.%F (constants.%F)] {} // CHECK:STDOUT: %.loc11_14.1: %.2 = struct_literal () // CHECK:STDOUT: %.loc11_14.2: type = converted %.loc11_14.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc11_11: @C.%.1 (%.3) = field_decl data, element0 [template] @@ -238,7 +238,7 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_9.2: type) { +// CHECK:STDOUT: generic fn @F(@C.%T.loc4: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %C: type = class_type @C, @C(%T) [symbolic = %C (constants.%C.2)] @@ -252,7 +252,7 @@ class C(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %F.type => constants.%F.type @@ -263,11 +263,11 @@ class C(T:! type) { // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @C(@C.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @C(@C.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(@F.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/member_out_of_line.carbon b/toolchain/check/testdata/class/generic/member_out_of_line.carbon index b72eef214b8bb..888a87843fc78 100644 --- a/toolchain/check/testdata/class/generic/member_out_of_line.carbon +++ b/toolchain/check/testdata/class/generic/member_out_of_line.carbon @@ -142,58 +142,58 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_13.2: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [symbolic = constants.%F] { -// CHECK:STDOUT: %T.loc10_10.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc10_10.2: type = bind_symbolic_name T 0, %T.loc10_10.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref.loc10_25: type = name_ref T, %T.loc10_10.2 [symbolic = constants.%T] -// CHECK:STDOUT: %n.loc10_22.1: %T = param n, runtime_param0 -// CHECK:STDOUT: @F.%n: %T = bind_name n, %n.loc10_22.1 -// CHECK:STDOUT: %T.ref.loc10_31: type = name_ref T, %T.loc10_10.2 [symbolic = constants.%T] -// CHECK:STDOUT: @F.%return: ref %T = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc10: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref.loc10_25: type = name_ref T, %T.loc10 [symbolic = constants.%T] +// CHECK:STDOUT: %n.param.loc10: %T = param n, runtime_param0 +// CHECK:STDOUT: %n.loc10: %T = bind_name n, %n.param.loc10 +// CHECK:STDOUT: %T.ref.loc10_31: type = name_ref T, %T.loc10 [symbolic = constants.%T] +// CHECK:STDOUT: %return: ref %T = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [symbolic = constants.%G] { -// CHECK:STDOUT: %T.loc14_10.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc14_10.2: type = bind_symbolic_name T 0, %T.loc14_10.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc14: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] // CHECK:STDOUT: %.loc14: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = constants.%Class.2] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc14 [symbolic = constants.%Class.2] -// CHECK:STDOUT: %self.loc14_22.1: %Class.2 = param self, runtime_param0 -// CHECK:STDOUT: @G.%self: %Class.2 = bind_name self, %self.loc14_22.1 -// CHECK:STDOUT: %T.ref.loc14: type = name_ref T, %T.loc14_10.2 [symbolic = constants.%T] -// CHECK:STDOUT: @G.%return: ref %T = var +// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, %.loc14 [symbolic = constants.%Class.2] +// CHECK:STDOUT: %self.param.loc14: %Class.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc14: %Class.2 = bind_name self, %self.param.loc14 +// CHECK:STDOUT: %T.ref.loc14: type = name_ref T, %T.loc14 [symbolic = constants.%T] +// CHECK:STDOUT: %return: ref %T = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @Class.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] -// CHECK:STDOUT: %G.type: type = fn_type @G, @Class(%T) [symbolic = %G.type (constants.%G.type)] +// CHECK:STDOUT: %G.type: type = fn_type @G, @Class(%T.1) [symbolic = %G.type (constants.%G.type)] // CHECK:STDOUT: %G: @Class.%G.type (%G.type) = struct_value () [symbolic = %G (constants.%G)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %T.ref.loc5_11: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %n.loc5_8.1: @F.%T (%T) = param n, runtime_param0 -// CHECK:STDOUT: %n.loc5_8.2: @F.%T (%T) = bind_name n, %n.loc5_8.1 -// CHECK:STDOUT: %T.ref.loc5_17: type = name_ref T, file.%T.loc4_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc5: ref @F.%T (%T) = var +// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = @Class.%F (constants.%F)] { +// CHECK:STDOUT: %T.ref.loc5_11: type = name_ref T, @Class.%T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %n.param.loc5: @F.%T.1 (%T) = param n, runtime_param0 +// CHECK:STDOUT: %n.loc5: @F.%T.1 (%T) = bind_name n, %n.param.loc5 +// CHECK:STDOUT: %T.ref.loc5_17: type = name_ref T, @Class.%T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return.var.loc5: ref @F.%T.1 (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %G.decl: @Class.%G.type (%G.type) = fn_decl @G [symbolic = %G (constants.%G)] { -// CHECK:STDOUT: %.loc6: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @G.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc6 [symbolic = @G.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc6_8.1: @G.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc6_8.2: @G.%Class (%Class.2) = bind_name self, %self.loc6_8.1 -// CHECK:STDOUT: %T.ref.loc6: type = name_ref T, file.%T.loc4_13.2 [symbolic = @G.%T (constants.%T)] -// CHECK:STDOUT: %return.var.loc6: ref @G.%T (%T) = var +// CHECK:STDOUT: %G.decl: @Class.%G.type (%G.type) = fn_decl @G [symbolic = @Class.%G (constants.%G)] { +// CHECK:STDOUT: %.loc6: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref.loc6: type = name_ref Self, %.loc6 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param.loc6: @G.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self.loc6: @G.%Class (%Class.2) = bind_name self, %self.param.loc6 +// CHECK:STDOUT: %T.ref.loc6: type = name_ref T, @Class.%T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return.var.loc6: ref @G.%T.1 (%T) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %T.ref.loc7: type = name_ref T, file.%T.loc4_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc7: @Class.%.1 (%.2) = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -204,37 +204,37 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic fn @F(@Class.%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn(%n: %T) -> %T { +// CHECK:STDOUT: fn(%n.loc10: %T) -> %T { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: @F.%T (%T) = name_ref n, %n +// CHECK:STDOUT: %n.ref: @F.%T.1 (%T) = name_ref n, %n.loc10 // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @G(file.%T.loc4_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: generic fn @G(@Class.%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class (%Class.2), @G.%T (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @G.%Class (%Class.2), @G.%T.1 (%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[%self: %Class.2]() -> %T { +// CHECK:STDOUT: fn[%self.loc14: %Class.2]() -> %T { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, %self +// CHECK:STDOUT: %self.ref: @G.%Class (%Class.2) = name_ref self, %self.loc14 // CHECK:STDOUT: %n.ref: @G.%.1 (%.2) = name_ref n, @Class.%.loc7 [template = @Class.%.loc7] -// CHECK:STDOUT: %.loc15_14.1: ref @G.%T (%T) = class_element_access %self.ref, element0 -// CHECK:STDOUT: %.loc15_14.2: @G.%T (%T) = bind_value %.loc15_14.1 +// CHECK:STDOUT: %.loc15_14.1: ref @G.%T.1 (%T) = class_element_access %self.ref, element0 +// CHECK:STDOUT: %.loc15_14.2: @G.%T.1 (%T) = bind_value %.loc15_14.1 // CHECK:STDOUT: return %.loc15_14.2 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %F.type => constants.%F.type @@ -246,20 +246,20 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@G.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@G.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @G(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- nested.carbon @@ -300,37 +300,37 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: %A.type = class_decl @A [template = constants.%A.1] { -// CHECK:STDOUT: %T.loc4_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @A.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [symbolic = constants.%F] { -// CHECK:STDOUT: %T.loc10_6.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc10_6.2: type = bind_symbolic_name T 0, %T.loc10_6.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref.loc10_22: type = name_ref T, %T.loc10_6.2 [symbolic = constants.%T] -// CHECK:STDOUT: %N.loc10_18.1: %T = param N, runtime_param -// CHECK:STDOUT: %N.loc10_18.2: %T = bind_symbolic_name N 1, %N.loc10_18.1 [symbolic = constants.%N] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc10: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref.loc10_22: type = name_ref T, %T.loc10 [symbolic = constants.%T] +// CHECK:STDOUT: %N.param: %T = param N, runtime_param +// CHECK:STDOUT: %N.loc10: %T = bind_symbolic_name N 1, %N.param [symbolic = constants.%N] // CHECK:STDOUT: %.loc10: type = specific_constant constants.%B.2, @B(constants.%T, constants.%N) [symbolic = constants.%B.2] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc10 [symbolic = constants.%B.2] -// CHECK:STDOUT: %self.loc10_27.1: %B.2 = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %B.2 = bind_name self, %self.loc10_27.1 -// CHECK:STDOUT: %T.ref.loc10_42: type = name_ref T, %T.loc10_6.2 [symbolic = constants.%T] -// CHECK:STDOUT: %a.loc10_39.1: %T = param a, runtime_param1 -// CHECK:STDOUT: @F.%a: %T = bind_name a, %a.loc10_39.1 +// CHECK:STDOUT: %Self.ref.loc10: type = name_ref Self, %.loc10 [symbolic = constants.%B.2] +// CHECK:STDOUT: %self.param.loc10: %B.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc10: %B.2 = bind_name self, %self.param.loc10 +// CHECK:STDOUT: %T.ref.loc10_42: type = name_ref T, %T.loc10 [symbolic = constants.%T] +// CHECK:STDOUT: %a.param.loc10: %T = param a, runtime_param1 +// CHECK:STDOUT: %a.loc10: %T = bind_name a, %a.param.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @A(file.%T.loc4_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @A(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %B.type: type = generic_class_type @B, @A(%T) [symbolic = %B.type (constants.%B.type)] +// CHECK:STDOUT: %B.type: type = generic_class_type @B, @A(%T.1) [symbolic = %B.type (constants.%B.type)] // CHECK:STDOUT: %B: @A.%B.type (%B.type) = struct_value () [symbolic = %B (constants.%B.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %B.decl: @A.%B.type (%B.type) = class_decl @B [symbolic = %B (constants.%B.1)] { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_9.2 [symbolic = @B.%T (constants.%T)] -// CHECK:STDOUT: %N.loc5_11.1: @B.%T (%T) = param N, runtime_param -// CHECK:STDOUT: %N.loc5_11.2: @B.%T (%T) = bind_symbolic_name N 1, %N.loc5_11.1 [symbolic = @B.%N (constants.%N)] +// CHECK:STDOUT: %B.decl: @A.%B.type (%B.type) = class_decl @B [symbolic = @A.%B (constants.%B.1)] { +// CHECK:STDOUT: %T.ref: type = name_ref T, @A.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %N.param: @B.%T (%T) = param N, runtime_param +// CHECK:STDOUT: %N.loc5: @B.%T (%T) = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -339,23 +339,23 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @B(file.%T.loc4_9.2: type, @A.%N.loc5_11.2: @B.%T (%T)) { +// CHECK:STDOUT: generic class @B(@A.%T.loc4: type, %N.loc5: @B.%T (%T)) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: %T = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: %N.1: %T = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %F.type: type = fn_type @F, @B(%T, %N) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @B(%T, %N.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @B.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %F.decl: @B.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %.loc6: type = specific_constant constants.%B.2, @B(constants.%T, constants.%N) [symbolic = @F.%B (constants.%B.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc6 [symbolic = @F.%B (constants.%B.2)] -// CHECK:STDOUT: %self.loc6_10.1: @F.%B (%B.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc6_10.2: @F.%B (%B.2) = bind_name self, %self.loc6_10.1 -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_9.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %a.loc6_22.1: @F.%T (%T) = param a, runtime_param1 -// CHECK:STDOUT: %a.loc6_22.2: @F.%T (%T) = bind_name a, %a.loc6_22.1 +// CHECK:STDOUT: %F.decl: @B.%F.type (%F.type) = fn_decl @F [symbolic = @B.%F (constants.%F)] { +// CHECK:STDOUT: %.loc6: type = specific_constant constants.%B.2, @B(constants.%T, constants.%N) [symbolic = %B (constants.%B.2)] +// CHECK:STDOUT: %Self.ref.loc6: type = name_ref Self, %.loc6 [symbolic = %B (constants.%B.2)] +// CHECK:STDOUT: %self.param.loc6: @F.%B (%B.2) = param self, runtime_param0 +// CHECK:STDOUT: %self.loc6: @F.%B (%B.2) = bind_name self, %self.param.loc6 +// CHECK:STDOUT: %T.ref.loc6: type = name_ref T, @A.%T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %a.param.loc6: @F.%T.1 (%T) = param a, runtime_param1 +// CHECK:STDOUT: %a.loc6: @F.%T.1 (%T) = bind_name a, %a.param.loc6 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -364,21 +364,21 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_9.2: type, @A.%N.loc5_11.2: @B.%T (%T)) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: %T = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] -// CHECK:STDOUT: %B: type = class_type @B, @B(%T, %N) [symbolic = %B (constants.%B.2)] +// CHECK:STDOUT: generic fn @F(@A.%T.loc4: type, @B.%N.loc5: @B.%T (%T)) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: %T = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] +// CHECK:STDOUT: %B: type = class_type @B, @B(%T.1, %N.1) [symbolic = %B (constants.%B.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn[%self: %B.2](%a: %T) { +// CHECK:STDOUT: fn[%self.loc10: %B.2](%a.loc10: %T) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @A(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %B.type => constants.%B.type @@ -387,31 +387,31 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: // CHECK:STDOUT: specific @B(constants.%T, constants.%N) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %F.type => constants.%F.type // CHECK:STDOUT: %F => constants.%F // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @B(@F.%T, @F.%N) { +// CHECK:STDOUT: specific @B(@F.%T.1, @F.%N.1) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T, constants.%N) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: %B => constants.%B.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @B(@B.%T, @B.%N) { +// CHECK:STDOUT: specific @B(@B.%T, @B.%N.1) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @A(@A.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @A(@A.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatched_not_generic_vs_generic.carbon @@ -448,8 +448,8 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %NotGeneric.decl: type = class_decl @NotGeneric [template = constants.%NotGeneric] {} // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %T.loc15_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc15_15.2: type = bind_symbolic_name T 0, %T.loc15_15.1 [symbolic = @.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc15: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -463,8 +463,8 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%T.loc15_15.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic fn @.1(%T.loc15: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -475,7 +475,7 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatched_too_few_args.carbon @@ -513,21 +513,21 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Generic.decl: %Generic.type = class_decl @Generic [template = constants.%Generic.1] { -// CHECK:STDOUT: %T.loc4_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_15.2: type = bind_symbolic_name T 0, %T.loc4_15.1 [symbolic = @Generic.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Generic(file.%T.loc4_15.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Generic(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %TooFew.type: type = fn_type @TooFew, @Generic(%T) [symbolic = %TooFew.type (constants.%TooFew.type)] +// CHECK:STDOUT: %TooFew.type: type = fn_type @TooFew, @Generic(%T.1) [symbolic = %TooFew.type (constants.%TooFew.type)] // CHECK:STDOUT: %TooFew: @Generic.%TooFew.type (%TooFew.type) = struct_value () [symbolic = %TooFew (constants.%TooFew)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %TooFew.decl: @Generic.%TooFew.type (%TooFew.type) = fn_decl @TooFew [symbolic = %TooFew (constants.%TooFew)] {} +// CHECK:STDOUT: %TooFew.decl: @Generic.%TooFew.type (%TooFew.type) = fn_decl @TooFew [symbolic = @Generic.%TooFew (constants.%TooFew)] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Generic.2 @@ -535,7 +535,7 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @TooFew(file.%T.loc4_15.2: type) { +// CHECK:STDOUT: generic fn @TooFew(@Generic.%T.loc4: type) { // CHECK:STDOUT: // CHECK:STDOUT: fn(); // CHECK:STDOUT: } @@ -546,13 +546,13 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @TooFew(constants.%T) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @Generic(@Generic.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Generic(@Generic.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatched_too_many_args.carbon @@ -591,26 +591,26 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Generic.decl: %Generic.type = class_decl @Generic [template = constants.%Generic.1] { -// CHECK:STDOUT: %T.loc4_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_15.2: type = bind_symbolic_name T 0, %T.loc4_15.1 [symbolic = @Generic.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %T.loc15_12.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc15_12.2: type = bind_symbolic_name T 0, %T.loc15_12.1 [symbolic = @.1.%T (constants.%T)] -// CHECK:STDOUT: %U.loc15_22.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc15_22.2: type = bind_symbolic_name U 1, %U.loc15_22.1 [symbolic = @.1.%U (constants.%U)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc15: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc15: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Generic(file.%T.loc4_15.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Generic(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %TooMany.type: type = fn_type @TooMany, @Generic(%T) [symbolic = %TooMany.type (constants.%TooMany.type)] +// CHECK:STDOUT: %TooMany.type: type = fn_type @TooMany, @Generic(%T.1) [symbolic = %TooMany.type (constants.%TooMany.type)] // CHECK:STDOUT: %TooMany: @Generic.%TooMany.type (%TooMany.type) = struct_value () [symbolic = %TooMany (constants.%TooMany)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %TooMany.decl: @Generic.%TooMany.type (%TooMany.type) = fn_decl @TooMany [symbolic = %TooMany (constants.%TooMany)] {} +// CHECK:STDOUT: %TooMany.decl: @Generic.%TooMany.type (%TooMany.type) = fn_decl @TooMany [symbolic = @Generic.%TooMany (constants.%TooMany)] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Generic.2 @@ -618,14 +618,14 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @TooMany(file.%T.loc4_15.2: type) { +// CHECK:STDOUT: generic fn @TooMany(@Generic.%T.loc4: type) { // CHECK:STDOUT: // CHECK:STDOUT: fn(); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%T.loc15_12.2: type, file.%U.loc15_22.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %U: type = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic fn @.1(%T.loc15: type, %U.loc15: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -636,18 +636,18 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @TooMany(constants.%T) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @Generic(@Generic.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Generic(@Generic.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T, constants.%U) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatched_wrong_arg_type.carbon @@ -686,26 +686,26 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Generic.decl: %Generic.type = class_decl @Generic [template = constants.%Generic.1] { -// CHECK:STDOUT: %T.loc4_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_15.2: type = bind_symbolic_name T 0, %T.loc4_15.1 [symbolic = @Generic.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { // CHECK:STDOUT: %.loc14_17.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc14_17.2: type = converted %.loc14_17.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %T.loc14_12.1: %.1 = param T, runtime_param -// CHECK:STDOUT: %T.loc14_12.2: %.1 = bind_symbolic_name T 0, %T.loc14_12.1 [symbolic = @.1.%T (constants.%T.2)] +// CHECK:STDOUT: %T.param: %.1 = param T, runtime_param +// CHECK:STDOUT: %T.loc14: %.1 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Generic(file.%T.loc4_15.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic class @Generic(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %WrongType.type: type = fn_type @WrongType, @Generic(%T) [symbolic = %WrongType.type (constants.%WrongType.type)] +// CHECK:STDOUT: %WrongType.type: type = fn_type @WrongType, @Generic(%T.1) [symbolic = %WrongType.type (constants.%WrongType.type)] // CHECK:STDOUT: %WrongType: @Generic.%WrongType.type (%WrongType.type) = struct_value () [symbolic = %WrongType (constants.%WrongType)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %WrongType.decl: @Generic.%WrongType.type (%WrongType.type) = fn_decl @WrongType [symbolic = %WrongType (constants.%WrongType)] {} +// CHECK:STDOUT: %WrongType.decl: @Generic.%WrongType.type (%WrongType.type) = fn_decl @WrongType [symbolic = @Generic.%WrongType (constants.%WrongType)] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Generic.2 @@ -713,13 +713,13 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @WrongType(file.%T.loc4_15.2: type) { +// CHECK:STDOUT: generic fn @WrongType(@Generic.%T.loc4: type) { // CHECK:STDOUT: // CHECK:STDOUT: fn(); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%T.loc14_12.2: %.1) { -// CHECK:STDOUT: %T: %.1 = bind_symbolic_name T 0 [symbolic = %T (constants.%T.2)] +// CHECK:STDOUT: generic fn @.1(%T.loc14: %.1) { +// CHECK:STDOUT: %T.1: %.1 = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -730,16 +730,16 @@ fn Generic(T:! ()).WrongType() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @WrongType(constants.%T.1) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @Generic(@Generic.%T) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: specific @Generic(@Generic.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T.2) { -// CHECK:STDOUT: %T => constants.%T.2 +// CHECK:STDOUT: %T.1 => constants.%T.2 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/method_deduce.carbon b/toolchain/check/testdata/class/generic/method_deduce.carbon index d1655f1aee7f1..9ec357c46ccc9 100644 --- a/toolchain/check/testdata/class/generic/method_deduce.carbon +++ b/toolchain/check/testdata/class/generic/method_deduce.carbon @@ -84,32 +84,32 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc14_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc14_13.2: type = bind_symbolic_name T 0, %T.loc14_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc14: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %CallGenericMethod.decl: %CallGenericMethod.type = fn_decl @CallGenericMethod [template = constants.%CallGenericMethod] { -// CHECK:STDOUT: %Class.ref.loc19: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %A.ref.loc19_31: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %Class.loc19: type = class_type @Class, @Class(constants.%A) [template = constants.%Class.3] -// CHECK:STDOUT: %c.loc19_22.1: %Class.3 = param c, runtime_param0 -// CHECK:STDOUT: @CallGenericMethod.%c: %Class.3 = bind_name c, %c.loc19_22.1 -// CHECK:STDOUT: %A.ref.loc19_39: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %B.ref.loc19: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %A.ref.loc19_31: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%A) [template = constants.%Class.3] +// CHECK:STDOUT: %c.param: %Class.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class.3 = bind_name c, %c.param +// CHECK:STDOUT: %A.ref.loc19_39: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %B.ref.loc19: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc19_43.1: %.3 = tuple_literal (%A.ref.loc19_39, %B.ref.loc19) // CHECK:STDOUT: %.loc19_43.2: type = converted %.loc19_43.1, constants.%.5 [template = constants.%.5] -// CHECK:STDOUT: @CallGenericMethod.%return: ref %.5 = var +// CHECK:STDOUT: %return: ref %.5 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGenericMethodWithNonDeducedParam.decl: %CallGenericMethodWithNonDeducedParam.type = fn_decl @CallGenericMethodWithNonDeducedParam [template = constants.%CallGenericMethodWithNonDeducedParam] { -// CHECK:STDOUT: %Class.ref.loc23: %Class.type = name_ref Class, %Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %A.ref.loc23_50: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %Class.loc23: type = class_type @Class, @Class(constants.%A) [template = constants.%Class.3] -// CHECK:STDOUT: %c.loc23_41.1: %Class.3 = param c, runtime_param0 -// CHECK:STDOUT: @CallGenericMethodWithNonDeducedParam.%c: %Class.3 = bind_name c, %c.loc23_41.1 -// CHECK:STDOUT: %A.ref.loc23_58: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %B.ref.loc23: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] +// CHECK:STDOUT: %A.ref.loc23_50: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%A) [template = constants.%Class.3] +// CHECK:STDOUT: %c.param: %Class.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class.3 = bind_name c, %c.param +// CHECK:STDOUT: %A.ref.loc23_58: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %B.ref.loc23: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc23_62.1: %.3 = tuple_literal (%A.ref.loc23_58, %B.ref.loc23) // CHECK:STDOUT: %.loc23_62.2: type = converted %.loc23_62.1, constants.%.5 [template = constants.%.5] -// CHECK:STDOUT: @CallGenericMethodWithNonDeducedParam.%return: ref %.5 = var +// CHECK:STDOUT: %return: ref %.5 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -123,36 +123,36 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: .Self = constants.%B // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc14_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc14: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Get.type: type = fn_type @Get, @Class(%T) [symbolic = %Get.type (constants.%Get.type.1)] +// CHECK:STDOUT: %Get.type: type = fn_type @Get, @Class(%T.1) [symbolic = %Get.type (constants.%Get.type.1)] // CHECK:STDOUT: %Get: @Class.%Get.type (%Get.type.1) = struct_value () [symbolic = %Get (constants.%Get.1)] -// CHECK:STDOUT: %GetNoDeduce.type: type = fn_type @GetNoDeduce, @Class(%T) [symbolic = %GetNoDeduce.type (constants.%GetNoDeduce.type.1)] +// CHECK:STDOUT: %GetNoDeduce.type: type = fn_type @GetNoDeduce, @Class(%T.1) [symbolic = %GetNoDeduce.type (constants.%GetNoDeduce.type.1)] // CHECK:STDOUT: %GetNoDeduce: @Class.%GetNoDeduce.type (%GetNoDeduce.type.1) = struct_value () [symbolic = %GetNoDeduce (constants.%GetNoDeduce.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %Get.decl: @Class.%Get.type (%Get.type.1) = fn_decl @Get [symbolic = %Get (constants.%Get.1)] { -// CHECK:STDOUT: %U.loc15_10.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc15_10.2: type = bind_symbolic_name U 1, %U.loc15_10.1 [symbolic = @Get.%U.1 (constants.%U)] -// CHECK:STDOUT: %T.ref.loc15: type = name_ref T, file.%T.loc14_13.2 [symbolic = @Get.%T (constants.%T)] -// CHECK:STDOUT: %U.ref.loc15: type = name_ref U, %U.loc15_10.2 [symbolic = @Get.%U.1 (constants.%U)] -// CHECK:STDOUT: %.loc15_28.1: %.3 = tuple_literal (%T.ref.loc15, %U.ref.loc15) -// CHECK:STDOUT: %.loc15_28.2: type = converted %.loc15_28.1, constants.%.4 [symbolic = @Get.%.1 (constants.%.4)] -// CHECK:STDOUT: %return.var.loc15: ref @Get.%.1 (%.4) = var +// CHECK:STDOUT: %Get.decl: @Class.%Get.type (%Get.type.1) = fn_decl @Get [symbolic = @Class.%Get (constants.%Get.1)] { +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc15: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc14 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc15 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %.loc15_28.1: %.3 = tuple_literal (%T.ref, %U.ref) +// CHECK:STDOUT: %.loc15_28.2: type = converted %.loc15_28.1, constants.%.4 [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %return: ref @Get.%.1 (%.4) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %GetNoDeduce.decl: @Class.%GetNoDeduce.type (%GetNoDeduce.type.1) = fn_decl @GetNoDeduce [symbolic = %GetNoDeduce (constants.%GetNoDeduce.1)] { -// CHECK:STDOUT: %T.ref.loc16_21: type = name_ref T, file.%T.loc14_13.2 [symbolic = @GetNoDeduce.%T (constants.%T)] -// CHECK:STDOUT: %x.loc16_18.1: @GetNoDeduce.%T (%T) = param x, runtime_param0 -// CHECK:STDOUT: %x.loc16_18.2: @GetNoDeduce.%T (%T) = bind_name x, %x.loc16_18.1 -// CHECK:STDOUT: %U.loc16_24.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc16_24.2: type = bind_symbolic_name U 1, %U.loc16_24.1 [symbolic = @GetNoDeduce.%U.1 (constants.%U)] -// CHECK:STDOUT: %T.ref.loc16_38: type = name_ref T, file.%T.loc14_13.2 [symbolic = @GetNoDeduce.%T (constants.%T)] -// CHECK:STDOUT: %U.ref.loc16: type = name_ref U, %U.loc16_24.2 [symbolic = @GetNoDeduce.%U.1 (constants.%U)] -// CHECK:STDOUT: %.loc16_42.1: %.3 = tuple_literal (%T.ref.loc16_38, %U.ref.loc16) -// CHECK:STDOUT: %.loc16_42.2: type = converted %.loc16_42.1, constants.%.4 [symbolic = @GetNoDeduce.%.1 (constants.%.4)] -// CHECK:STDOUT: %return.var.loc16: ref @GetNoDeduce.%.1 (%.4) = var +// CHECK:STDOUT: %GetNoDeduce.decl: @Class.%GetNoDeduce.type (%GetNoDeduce.type.1) = fn_decl @GetNoDeduce [symbolic = @Class.%GetNoDeduce (constants.%GetNoDeduce.1)] { +// CHECK:STDOUT: %T.ref.loc16_21: type = name_ref T, @Class.%T.loc14 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %x.param: @GetNoDeduce.%T (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @GetNoDeduce.%T (%T) = bind_name x, %x.param +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc16: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %T.ref.loc16_38: type = name_ref T, @Class.%T.loc14 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc16 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %.loc16_42.1: %.3 = tuple_literal (%T.ref.loc16_38, %U.ref) +// CHECK:STDOUT: %.loc16_42.2: type = converted %.loc16_42.1, constants.%.4 [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %return: ref @GetNoDeduce.%.1 (%.4) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -162,20 +162,20 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Get(file.%T.loc14_13.2: type, @Class.%U.loc15_10.2: type) { +// CHECK:STDOUT: generic fn @Get(@Class.%T.loc14: type, %U.loc15: type) { // CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %.1: type = tuple_type (@Get.%T (%T), @Get.%U.1 (%U)) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@Class.%U.loc15_10.2: type) -> @Get.%.1 (%.4); +// CHECK:STDOUT: fn(%U.loc15: type) -> @Get.%.1 (%.4); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @GetNoDeduce(file.%T.loc14_13.2: type, @Class.%U.loc16_24.2: type) { +// CHECK:STDOUT: generic fn @GetNoDeduce(@Class.%T.loc14: type, %U.loc16: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: %.1: type = tuple_type (@GetNoDeduce.%T (%T), @GetNoDeduce.%U.1 (%U)) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@Class.%x.loc16_18.2: @GetNoDeduce.%T (%T), @Class.%U.loc16_24.2: type) -> @GetNoDeduce.%.1 (%.4); +// CHECK:STDOUT: fn(%x: @GetNoDeduce.%T (%T), %U.loc16: type) -> @GetNoDeduce.%.1 (%.4); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @CallGenericMethod(%c: %Class.3) -> %return: %.5 { @@ -183,9 +183,9 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: %c.ref: %Class.3 = name_ref c, %c // CHECK:STDOUT: %.loc20: %Get.type.2 = specific_constant @Class.%Get.decl, @Class(constants.%A) [template = constants.%Get.2] // CHECK:STDOUT: %Get.ref: %Get.type.2 = name_ref Get, %.loc20 [template = constants.%Get.2] -// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] -// CHECK:STDOUT: %.loc19: ref %.5 = splice_block %return {} -// CHECK:STDOUT: %Get.call: init %.5 = call %Get.ref() to %.loc19 +// CHECK:STDOUT: %B.ref.loc20: type = name_ref B, file.%B.decl [template = constants.%B] +// CHECK:STDOUT: %.loc19_35: ref %.5 = splice_block %return {} +// CHECK:STDOUT: %Get.call: init %.5 = call %Get.ref() to %.loc19_35 // CHECK:STDOUT: return %Get.call to %return // CHECK:STDOUT: } // CHECK:STDOUT: @@ -195,19 +195,19 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: %.loc24_11: %GetNoDeduce.type.2 = specific_constant @Class.%GetNoDeduce.decl, @Class(constants.%A) [template = constants.%GetNoDeduce.2] // CHECK:STDOUT: %GetNoDeduce.ref: %GetNoDeduce.type.2 = name_ref GetNoDeduce, %.loc24_11 [template = constants.%GetNoDeduce.2] // CHECK:STDOUT: %.loc24_25.1: %.1 = struct_literal () -// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] -// CHECK:STDOUT: %.loc23: ref %.5 = splice_block %return {} +// CHECK:STDOUT: %B.ref.loc24: type = name_ref B, file.%B.decl [template = constants.%B] +// CHECK:STDOUT: %.loc23_54: ref %.5 = splice_block %return {} // CHECK:STDOUT: %.loc24_25.2: ref %A = temporary_storage // CHECK:STDOUT: %.loc24_25.3: init %A = class_init (), %.loc24_25.2 [template = constants.%struct] // CHECK:STDOUT: %.loc24_25.4: ref %A = temporary %.loc24_25.2, %.loc24_25.3 // CHECK:STDOUT: %.loc24_23.1: ref %A = converted %.loc24_25.1, %.loc24_25.4 // CHECK:STDOUT: %.loc24_23.2: %A = bind_value %.loc24_23.1 -// CHECK:STDOUT: %GetNoDeduce.call: init %.5 = call %GetNoDeduce.ref(%.loc24_23.2) to %.loc23 +// CHECK:STDOUT: %GetNoDeduce.call: init %.5 = call %GetNoDeduce.ref(%.loc24_23.2) to %.loc23_54 // CHECK:STDOUT: return %GetNoDeduce.call to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Get(constants.%T, constants.%U) { @@ -222,12 +222,12 @@ fn CallGenericMethodWithNonDeducedParam(c: Class(A)) -> (A, B) { // CHECK:STDOUT: %.1 => constants.%.4 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%A) { -// CHECK:STDOUT: %T => constants.%A +// CHECK:STDOUT: %T.1 => constants.%A // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Get.type => constants.%Get.type.2 diff --git a/toolchain/check/testdata/class/generic/redeclare.carbon b/toolchain/check/testdata/class/generic/redeclare.carbon index 6aa6592c0b8f0..e27bd3a08d331 100644 --- a/toolchain/check/testdata/class/generic/redeclare.carbon +++ b/toolchain/check/testdata/class/generic/redeclare.carbon @@ -117,17 +117,17 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Generic.decl.loc4: %Generic.type = class_decl @Generic [template = constants.%Generic.1] { -// CHECK:STDOUT: %T.loc4_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_15.2: type = bind_symbolic_name T 0, %T.loc4_15.1 [symbolic = @Generic.%T (constants.%T)] +// CHECK:STDOUT: %T.param.loc4: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param.loc4 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %Generic.decl.loc6: %Generic.type = class_decl @Generic [template = constants.%Generic.1] { -// CHECK:STDOUT: %T.loc6_15.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc6_15.2: type = bind_symbolic_name T 0, %T.loc6_15.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param.loc6: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param.loc6 [symbolic = constants.%T] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Generic(file.%T.loc4_15.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Generic(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -138,7 +138,7 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatch_param_list.carbon @@ -174,15 +174,15 @@ class E(U:! type) {} // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %T.loc12_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc12_9.2: type = bind_symbolic_name T 0, %T.loc12_9.1 [symbolic = @.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A; // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%T.loc12_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @.1(%T.loc12: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -193,7 +193,7 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatch_implicit_param_list.carbon @@ -239,27 +239,27 @@ class E(U:! type) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc4_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc4_13.2: type = converted %int.make_type_32, %.loc4_13.1 [template = i32] -// CHECK:STDOUT: %N.loc4_9.1: i32 = param N, runtime_param -// CHECK:STDOUT: %N.loc4_9.2: i32 = bind_symbolic_name N 0, %N.loc4_9.1 [symbolic = @B.%N (constants.%N.1)] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc4: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %T.loc12_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc12_9.2: type = bind_symbolic_name T 0, %T.loc12_9.1 [symbolic = @.1.%T (constants.%T)] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc12_9.2 [symbolic = @.1.%T (constants.%T)] -// CHECK:STDOUT: %N.loc12_19.1: @.1.%T (%T) = param N, runtime_param -// CHECK:STDOUT: %N.loc12_19.2: @.1.%T (%T) = bind_symbolic_name N 1, %N.loc12_19.1 [symbolic = @.1.%N (constants.%N.2)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.param: @.1.%T.1 (%T) = param N, runtime_param +// CHECK:STDOUT: %N.loc12: @.1.%T.1 (%T) = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N.2)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @B(file.%N.loc4_9.2: i32) { -// CHECK:STDOUT: %N: i32 = bind_symbolic_name N 0 [symbolic = %N (constants.%N.1)] +// CHECK:STDOUT: generic class @B(%N.loc4: i32) { +// CHECK:STDOUT: %N.1: i32 = bind_symbolic_name N 0 [symbolic = %N.1 (constants.%N.1)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%T.loc12_9.2: type, file.%N.loc12_19.2: @.1.%T (%T)) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %N: %T = bind_symbolic_name N 1 [symbolic = %N (constants.%N.2)] +// CHECK:STDOUT: generic class @.1(%T.loc12: type, %N.loc12: @.1.%T.1 (%T)) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %N.1: %T = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -272,12 +272,12 @@ class E(U:! type) {} // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @B(constants.%N.1) { -// CHECK:STDOUT: %N => constants.%N.1 +// CHECK:STDOUT: %N.1 => constants.%N.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T, constants.%N.2) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %N => constants.%N.2 +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %N.1 => constants.%N.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatch_param_count.carbon @@ -319,29 +319,29 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: %C.type = class_decl @C [template = constants.%C.1] { -// CHECK:STDOUT: %T.loc4_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @C.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %T.loc12_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc12_9.2: type = bind_symbolic_name T 0, %T.loc12_9.1 [symbolic = @.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_23.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc12_23.2: type = converted %int.make_type_32, %.loc12_23.1 [template = i32] -// CHECK:STDOUT: %U.loc12_19.1: i32 = param U, runtime_param -// CHECK:STDOUT: %U.loc12_19.2: i32 = bind_symbolic_name U 1, %U.loc12_19.1 [symbolic = @.1.%U (constants.%U)] +// CHECK:STDOUT: %U.param: i32 = param U, runtime_param +// CHECK:STDOUT: %U.loc12: i32 = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%T.loc4_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%T.loc12_9.2: type, file.%U.loc12_19.2: i32) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %U: i32 = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic class @.1(%T.loc12: type, %U.loc12: i32) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.1: i32 = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -354,12 +354,12 @@ class E(U:! type) {} // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T, constants.%U) { -// CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %T.1 => constants.%T +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatch_param_type.carbon @@ -401,26 +401,26 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %D.decl: %D.type = class_decl @D [template = constants.%D.1] { -// CHECK:STDOUT: %T.loc4_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @D.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %T.loc12_9.1: i32 = param T, runtime_param -// CHECK:STDOUT: %T.loc12_9.2: i32 = bind_symbolic_name T 0, %T.loc12_9.1 [symbolic = @.1.%T (constants.%T.2)] +// CHECK:STDOUT: %T.param: i32 = param T, runtime_param +// CHECK:STDOUT: %T.loc12: i32 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @D(file.%T.loc4_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic class @D(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%T.loc12_9.2: i32) { -// CHECK:STDOUT: %T: i32 = bind_symbolic_name T 0 [symbolic = %T (constants.%T.2)] +// CHECK:STDOUT: generic class @.1(%T.loc12: i32) { +// CHECK:STDOUT: %T.1: i32 = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -433,11 +433,11 @@ class E(U:! type) {} // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @D(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T.2) { -// CHECK:STDOUT: %T => constants.%T.2 +// CHECK:STDOUT: %T.1 => constants.%T.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_mismatch_param_name.carbon @@ -475,23 +475,23 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %E.decl: %E.type = class_decl @E [template = constants.%E.1] { -// CHECK:STDOUT: %T.loc4_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_9.2: type = bind_symbolic_name T 0, %T.loc4_9.1 [symbolic = @E.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %U.loc11_9.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc11_9.2: type = bind_symbolic_name U 0, %U.loc11_9.1 [symbolic = @.1.%U (constants.%U)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc11: type = bind_symbolic_name U 0, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @E(file.%T.loc4_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @E(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%U.loc11_9.2: type) { -// CHECK:STDOUT: %U: type = bind_symbolic_name U 0 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic class @.1(%U.loc11: type) { +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 0 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -502,10 +502,10 @@ class E(U:! type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @E(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic/self.carbon b/toolchain/check/testdata/class/generic/self.carbon index 0d0a1847ed82f..7ceba110acbd6 100644 --- a/toolchain/check/testdata/class/generic/self.carbon +++ b/toolchain/check/testdata/class/generic/self.carbon @@ -57,35 +57,35 @@ class Class(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %MakeSelf.type: type = fn_type @MakeSelf, @Class(%T) [symbolic = %MakeSelf.type (constants.%MakeSelf.type)] +// CHECK:STDOUT: %MakeSelf.type: type = fn_type @MakeSelf, @Class(%T.1) [symbolic = %MakeSelf.type (constants.%MakeSelf.type)] // CHECK:STDOUT: %MakeSelf: @Class.%MakeSelf.type (%MakeSelf.type) = struct_value () [symbolic = %MakeSelf (constants.%MakeSelf)] -// CHECK:STDOUT: %MakeClass.type: type = fn_type @MakeClass, @Class(%T) [symbolic = %MakeClass.type (constants.%MakeClass.type)] +// CHECK:STDOUT: %MakeClass.type: type = fn_type @MakeClass, @Class(%T.1) [symbolic = %MakeClass.type (constants.%MakeClass.type)] // CHECK:STDOUT: %MakeClass: @Class.%MakeClass.type (%MakeClass.type) = struct_value () [symbolic = %MakeClass (constants.%MakeClass)] -// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @Class.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %MakeSelf.decl: @Class.%MakeSelf.type (%MakeSelf.type) = fn_decl @MakeSelf [symbolic = %MakeSelf (constants.%MakeSelf)] { -// CHECK:STDOUT: %.loc14: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @MakeSelf.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc14 [symbolic = @MakeSelf.%Class (constants.%Class.2)] -// CHECK:STDOUT: %return.var.loc14: ref @MakeSelf.%Class (%Class.2) = var +// CHECK:STDOUT: %MakeSelf.decl: @Class.%MakeSelf.type (%MakeSelf.type) = fn_decl @MakeSelf [symbolic = @Class.%MakeSelf (constants.%MakeSelf)] { +// CHECK:STDOUT: %.loc14: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc14 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %return: ref @MakeSelf.%Class (%Class.2) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %MakeClass.decl: @Class.%MakeClass.type (%MakeClass.type) = fn_decl @MakeClass [symbolic = %MakeClass (constants.%MakeClass)] { +// CHECK:STDOUT: %MakeClass.decl: @Class.%MakeClass.type (%MakeClass.type) = fn_decl @MakeClass [symbolic = @Class.%MakeClass (constants.%MakeClass)] { // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc11_13.2 [symbolic = @MakeClass.%T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(constants.%T) [symbolic = @MakeClass.%Class (constants.%Class.2)] -// CHECK:STDOUT: %return.var.loc15: ref @MakeClass.%Class (%Class.2) = var +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %Class.loc15: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] +// CHECK:STDOUT: %return: ref @MakeClass.%Class.1 (%Class.2) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] {} +// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = @Class.%F (constants.%F)] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class.2 @@ -95,21 +95,21 @@ class Class(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @MakeSelf(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @MakeSelf(@Class.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: fn() -> @MakeSelf.%Class (%Class.2); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @MakeClass(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @MakeClass(@Class.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Class.1: type = class_type @Class, @Class(%T) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn() -> @MakeClass.%Class (%Class.2); +// CHECK:STDOUT: fn() -> @MakeClass.%Class.1 (%Class.2); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc11_13.2: type) { +// CHECK:STDOUT: generic fn @F(@Class.%T.loc11: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class.1: type = class_type @Class, @Class(%T) [symbolic = %Class.1 (constants.%Class.2)] @@ -121,7 +121,7 @@ class Class(T:! type) { // CHECK:STDOUT: fn() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, file.%Class.decl [template = constants.%Class.1] -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, @Class.%T.loc11 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %Class.loc17: type = class_type @Class, @Class(constants.%T) [symbolic = %Class.1 (constants.%Class.2)] // CHECK:STDOUT: %c.var: ref @F.%Class.1 (%Class.2) = var c // CHECK:STDOUT: %c: ref @F.%Class.1 (%Class.2) = bind_name c, %c.var @@ -144,7 +144,7 @@ class Class(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %MakeSelf.type => constants.%MakeSelf.type @@ -156,7 +156,7 @@ class Class(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@MakeSelf.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @MakeSelf(constants.%T) { @@ -165,21 +165,21 @@ class Class(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@MakeClass.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @MakeClass(constants.%T) { // CHECK:STDOUT: %T => constants.%T -// CHECK:STDOUT: %Class => constants.%Class.2 +// CHECK:STDOUT: %Class.1 => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(@F.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/generic_method.carbon b/toolchain/check/testdata/class/generic_method.carbon index b191aa19cae76..193179ea86d33 100644 --- a/toolchain/check/testdata/class/generic_method.carbon +++ b/toolchain/check/testdata/class/generic_method.carbon @@ -50,42 +50,42 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: %Class.type = class_decl @Class [template = constants.%Class.1] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @Class.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [symbolic = constants.%F] { -// CHECK:STDOUT: %T.loc16_10.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc16_10.2: type = bind_symbolic_name T 0, %T.loc16_10.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc16: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] // CHECK:STDOUT: %.loc16: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = constants.%Class.2] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc16 [symbolic = constants.%Class.2] -// CHECK:STDOUT: %self.loc16_22.1: %Class.2 = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %Class.2 = bind_name self, %self.loc16_22.1 -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc16_10.2 [symbolic = constants.%T] -// CHECK:STDOUT: %n.loc16_34.1: %T = param n, runtime_param1 -// CHECK:STDOUT: @F.%n: %T = bind_name n, %n.loc16_34.1 +// CHECK:STDOUT: %Self.ref.loc16: type = name_ref Self, %.loc16 [symbolic = constants.%Class.2] +// CHECK:STDOUT: %self.param.loc16: %Class.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc16: %Class.2 = bind_name self, %self.param.loc16 +// CHECK:STDOUT: %T.ref.loc16: type = name_ref T, %T.loc16 [symbolic = constants.%T] +// CHECK:STDOUT: %n.param.loc16: %T = param n, runtime_param1 +// CHECK:STDOUT: %n.loc16: %T = bind_name n, %n.param.loc16 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Class(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Class(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] -// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T (%T) [symbolic = %.1 (constants.%.2)] -// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %.1: type = unbound_element_type @Class.%Class (%Class.2), @Class.%T.1 (%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @Class(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @Class.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %T.ref.loc12: type = name_ref T, file.%T.loc11_13.2 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc12: @Class.%.1 (%.2) = field_decl a, element0 [template] -// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %.loc13: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = @F.%Class (constants.%Class.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc13 [symbolic = @F.%Class (constants.%Class.2)] -// CHECK:STDOUT: %self.loc13_8.1: @F.%Class (%Class.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_8.2: @F.%Class (%Class.2) = bind_name self, %self.loc13_8.1 -// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, file.%T.loc11_13.2 [symbolic = @F.%T (constants.%T)] -// CHECK:STDOUT: %n.loc13_20.1: @F.%T (%T) = param n, runtime_param1 -// CHECK:STDOUT: %n.loc13_20.2: @F.%T (%T) = bind_name n, %n.loc13_20.1 +// CHECK:STDOUT: %F.decl: @Class.%F.type (%F.type) = fn_decl @F [symbolic = @Class.%F (constants.%F)] { +// CHECK:STDOUT: %.loc13: type = specific_constant constants.%Class.2, @Class(constants.%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, %.loc13 [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: %self.param.loc13: @F.%Class (%Class.2) = param self, runtime_param0 +// CHECK:STDOUT: %self.loc13: @F.%Class (%Class.2) = bind_name self, %self.param.loc13 +// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, @Class.%T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %n.param.loc13: @F.%T.1 (%T) = param n, runtime_param1 +// CHECK:STDOUT: %n.loc13: @F.%T.1 (%T) = bind_name n, %n.param.loc13 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -95,20 +95,20 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T) [symbolic = %Class (constants.%Class.2)] +// CHECK:STDOUT: generic fn @F(@Class.%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %Class: type = class_type @Class, @Class(%T.1) [symbolic = %Class (constants.%Class.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn[%self: %Class.2](%n: %T) { +// CHECK:STDOUT: fn[%self.loc16: %Class.2](%n.loc16: %T) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Class(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Class => constants.%Class.2 @@ -117,16 +117,16 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: %F => constants.%F // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@F.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@F.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: %Class => constants.%Class.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Class(@Class.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Class(@Class.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 0ef5a758720cd..a4a188e6ddc34 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -118,16 +118,16 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDeclared { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] -// CHECK:STDOUT: %self.loc14_8.1: %ForwardDeclared = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_8.2: %ForwardDeclared = bind_name self, %self.loc14_8.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] +// CHECK:STDOUT: %self.param: %ForwardDeclared = param self, runtime_param0 +// CHECK:STDOUT: %self: %ForwardDeclared = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Self.ref.loc15: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] // CHECK:STDOUT: %.loc15_23: type = ptr_type %ForwardDeclared [template = constants.%.5] -// CHECK:STDOUT: %self.loc15_13.1: %.5 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc15_13.3: %.5 = bind_name self, %self.loc15_13.1 -// CHECK:STDOUT: %.loc15_8: %.5 = addr_pattern %self.loc15_13.3 +// CHECK:STDOUT: %self.param: %.5 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.5 = bind_name self, %self.param +// CHECK:STDOUT: %.loc15_8: %.5 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -140,9 +140,9 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[@ForwardDeclared.%self.loc14_8.2: %ForwardDeclared](); +// CHECK:STDOUT: fn @F[%self: %ForwardDeclared](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[addr @ForwardDeclared.%self.loc15_13.3: %.5](); +// CHECK:STDOUT: fn @G[addr %self: %.5](); // CHECK:STDOUT: // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/import_base.carbon b/toolchain/check/testdata/class/import_base.carbon index d532f9b33c0ae..bc693afbdaa61 100644 --- a/toolchain/check/testdata/class/import_base.carbon +++ b/toolchain/check/testdata/class/import_base.carbon @@ -83,14 +83,14 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: class @Base { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref.loc5: type = name_ref Self, constants.%Base [template = constants.%Base] -// CHECK:STDOUT: %self.loc5_8.1: %Base = param self, runtime_param0 -// CHECK:STDOUT: %self.loc5_8.2: %Base = bind_name self, %self.loc5_8.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] +// CHECK:STDOUT: %self.param: %Base = param self, runtime_param0 +// CHECK:STDOUT: %self: %Base = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %Unused.decl: %Unused.type = fn_decl @Unused [template = constants.%Unused] { -// CHECK:STDOUT: %Self.ref.loc6: type = name_ref Self, constants.%Base [template = constants.%Base] -// CHECK:STDOUT: %self.loc6_13.1: %Base = param self, runtime_param0 -// CHECK:STDOUT: %self.loc6_13.2: %Base = bind_name self, %self.loc6_13.1 +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] +// CHECK:STDOUT: %self.param: %Base = param self, runtime_param0 +// CHECK:STDOUT: %self: %Base = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc8: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_10.1: type = value_of_initializer %int.make_type_32.loc8 [template = i32] @@ -119,9 +119,9 @@ fn Run() { // CHECK:STDOUT: extend name_scope2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[@Base.%self.loc5_8.2: %Base](); +// CHECK:STDOUT: fn @F[%self: %Base](); // CHECK:STDOUT: -// CHECK:STDOUT: fn @Unused[@Base.%self.loc6_13.2: %Base](); +// CHECK:STDOUT: fn @Unused[%self: %Base](); // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/inheritance_access.carbon b/toolchain/check/testdata/class/inheritance_access.carbon index fd40435d811db..6769a0c5ef2ec 100644 --- a/toolchain/check/testdata/class/inheritance_access.carbon +++ b/toolchain/check/testdata/class/inheritance_access.carbon @@ -295,8 +295,8 @@ class B { // CHECK:STDOUT: %.loc10: %.5 = base_decl %Shape, element0 [template] // CHECK:STDOUT: %GetPosition.decl: %GetPosition.type = fn_decl @GetPosition [template = constants.%GetPosition] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Circle [template = constants.%Circle] -// CHECK:STDOUT: %self.loc12_18.1: %Circle = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_18.2: %Circle = bind_name self, %self.loc12_18.1 +// CHECK:STDOUT: %self.param: %Circle = param self, runtime_param0 +// CHECK:STDOUT: %self: %Circle = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32.loc12_36: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc12_41: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_44.1: %.6 = tuple_literal (%int.make_type_32.loc12_36, %int.make_type_32.loc12_41) @@ -305,7 +305,7 @@ class B { // CHECK:STDOUT: %.loc12_44.4: type = value_of_initializer %int.make_type_32.loc12_41 [template = i32] // CHECK:STDOUT: %.loc12_44.5: type = converted %int.make_type_32.loc12_41, %.loc12_44.4 [template = i32] // CHECK:STDOUT: %.loc12_44.6: type = converted %.loc12_44.1, constants.%.7 [template = constants.%.7] -// CHECK:STDOUT: %return.var: ref %.7 = var +// CHECK:STDOUT: %return: ref %.7 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -317,28 +317,28 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @GetPosition[@Circle.%self.loc12_18.2: %Circle]() -> @Circle.%return.var: %.7 { +// CHECK:STDOUT: fn @GetPosition[%self: %Circle]() -> %return: %.7 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref.loc13_13: %Circle = name_ref self, @Circle.%self.loc12_18.2 +// CHECK:STDOUT: %self.ref.loc13_13: %Circle = name_ref self, %self // CHECK:STDOUT: %x.ref: %.2 = name_ref x, @Shape.%.loc5_18 [template = @Shape.%.loc5_18] // CHECK:STDOUT: %.loc13_17.1: ref %Shape = class_element_access %self.ref.loc13_13, element0 // CHECK:STDOUT: %.loc13_17.2: ref %Shape = converted %self.ref.loc13_13, %.loc13_17.1 // CHECK:STDOUT: %.loc13_17.3: ref i32 = class_element_access %.loc13_17.2, element0 -// CHECK:STDOUT: %self.ref.loc13_21: %Circle = name_ref self, @Circle.%self.loc12_18.2 +// CHECK:STDOUT: %self.ref.loc13_21: %Circle = name_ref self, %self // CHECK:STDOUT: %y.ref: %.2 = name_ref y, @Shape.%.loc6_18 [template = @Shape.%.loc6_18] // CHECK:STDOUT: %.loc13_25.1: ref %Shape = class_element_access %self.ref.loc13_21, element0 // CHECK:STDOUT: %.loc13_25.2: ref %Shape = converted %self.ref.loc13_21, %.loc13_25.1 // CHECK:STDOUT: %.loc13_25.3: ref i32 = class_element_access %.loc13_25.2, element1 // CHECK:STDOUT: %.loc13_27.1: %.7 = tuple_literal (%.loc13_17.3, %.loc13_25.3) // CHECK:STDOUT: %.loc13_17.4: i32 = bind_value %.loc13_17.3 -// CHECK:STDOUT: %.loc13_27.2: ref i32 = tuple_access @Circle.%return.var, element0 +// CHECK:STDOUT: %.loc13_27.2: ref i32 = tuple_access %return, element0 // CHECK:STDOUT: %.loc13_27.3: init i32 = initialize_from %.loc13_17.4 to %.loc13_27.2 // CHECK:STDOUT: %.loc13_25.4: i32 = bind_value %.loc13_25.3 -// CHECK:STDOUT: %.loc13_27.4: ref i32 = tuple_access @Circle.%return.var, element1 +// CHECK:STDOUT: %.loc13_27.4: ref i32 = tuple_access %return, element1 // CHECK:STDOUT: %.loc13_27.5: init i32 = initialize_from %.loc13_25.4 to %.loc13_27.4 -// CHECK:STDOUT: %.loc13_27.6: init %.7 = tuple_init (%.loc13_27.3, %.loc13_27.5) to @Circle.%return.var +// CHECK:STDOUT: %.loc13_27.6: init %.7 = tuple_init (%.loc13_27.3, %.loc13_27.5) to %return // CHECK:STDOUT: %.loc13_28: init %.7 = converted %.loc13_27.1, %.loc13_27.6 -// CHECK:STDOUT: return %.loc13_28 to @Circle.%return.var +// CHECK:STDOUT: return %.loc13_28 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- shadowing_access.carbon @@ -412,7 +412,7 @@ class B { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_21.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc10_21.2: type = converted %int.make_type_32, %.loc10_21.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -427,11 +427,11 @@ class B { // CHECK:STDOUT: %.loc14: %.8 = base_decl %B, element0 [template] // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %self.loc15_8.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc15_8.2: %C = bind_name self, %self.loc15_8.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %.loc15_26.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_26.2: type = converted %.loc15_26.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %return.var: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -447,9 +447,9 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2() -> i32; // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[@C.%self.loc15_8.2: %C]() -> %.1 { +// CHECK:STDOUT: fn @G[%self: %C]() -> %.1 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %C = name_ref self, @C.%self.loc15_8.2 +// CHECK:STDOUT: %self.ref: %C = name_ref self, %self // CHECK:STDOUT: %F.ref: %F.type.1 = name_ref F, @A.%F.decl [template = constants.%F.1] // CHECK:STDOUT: %F.call: init %.1 = call %F.ref() // CHECK:STDOUT: %.loc15_43.1: ref %.1 = temporary_storage @@ -507,16 +507,16 @@ class B { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { -// CHECK:STDOUT: %int.make_type_32.loc5: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc5_32.1: type = value_of_initializer %int.make_type_32.loc5 [template = i32] -// CHECK:STDOUT: %.loc5_32.2: type = converted %int.make_type_32.loc5, %.loc5_32.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc5_32.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc5_32.2: type = converted %int.make_type_32, %.loc5_32.1 [template = i32] // CHECK:STDOUT: %.loc5_38: i32 = int_literal 5 [template = constants.%.2] // CHECK:STDOUT: %SOME_CONSTANT: i32 = bind_name SOME_CONSTANT, %.loc5_38 // CHECK:STDOUT: %SomeProtectedFunction.decl: %SomeProtectedFunction.type = fn_decl @SomeProtectedFunction [template = constants.%SomeProtectedFunction] { -// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_43.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] -// CHECK:STDOUT: %.loc6_43.2: type = converted %int.make_type_32.loc6, %.loc6_43.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_43.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc6_43.2: type = converted %int.make_type_32, %.loc6_43.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -529,16 +529,16 @@ class B { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc12: %.5 = base_decl %A, element0 [template] // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_13.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_13.2: type = converted %int.make_type_32.loc14, %.loc14_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc14: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_13.2: type = converted %int.make_type_32, %.loc14_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { -// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_13.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] -// CHECK:STDOUT: %.loc18_13.2: type = converted %int.make_type_32.loc18, %.loc18_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc18: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc18_13.2: type = converted %int.make_type_32, %.loc18_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -635,12 +635,12 @@ class B { // CHECK:STDOUT: %.loc9: %.5 = base_decl %Shape, element0 [template] // CHECK:STDOUT: %GetPosition.decl: %GetPosition.type = fn_decl @GetPosition [template = constants.%GetPosition] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Square [template = constants.%Square] -// CHECK:STDOUT: %self.loc11_18.1: %Square = param self, runtime_param0 -// CHECK:STDOUT: %self.loc11_18.2: %Square = bind_name self, %self.loc11_18.1 +// CHECK:STDOUT: %self.param: %Square = param self, runtime_param0 +// CHECK:STDOUT: %self: %Square = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_35.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_35.2: type = converted %int.make_type_32, %.loc11_35.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -652,9 +652,9 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @GetPosition[@Square.%self.loc11_18.2: %Square]() -> i32 { +// CHECK:STDOUT: fn @GetPosition[%self: %Square]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Square = name_ref self, @Square.%self.loc11_18.2 +// CHECK:STDOUT: %self.ref: %Square = name_ref self, %self // CHECK:STDOUT: %y.ref: = name_ref y, [template = ] // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -1008,19 +1008,19 @@ class B { // CHECK:STDOUT: %Internal.ref: type = name_ref Internal, file.%Internal.decl [template = constants.%Internal] // CHECK:STDOUT: %.loc14: %.5 = field_decl internal, element0 [template] // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32.loc16, %.loc16_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc16: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32, %.loc16_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %SomeFunc.decl: %SomeFunc.type = fn_decl @SomeFunc [template = constants.%SomeFunc] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [template = constants.%B] -// CHECK:STDOUT: %self.loc36_15.1: %B = param self, runtime_param0 -// CHECK:STDOUT: %self.loc36_15.2: %B = bind_name self, %self.loc36_15.1 -// CHECK:STDOUT: %int.make_type_32.loc36: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc36_32.1: type = value_of_initializer %int.make_type_32.loc36 [template = i32] -// CHECK:STDOUT: %.loc36_32.2: type = converted %int.make_type_32.loc36, %.loc36_32.1 [template = i32] -// CHECK:STDOUT: %return.var.loc36: ref i32 = var +// CHECK:STDOUT: %self.param: %B = param self, runtime_param0 +// CHECK:STDOUT: %self: %B = bind_name self, %self.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc36_32.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc36_32.2: type = converted %int.make_type_32, %.loc36_32.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -1041,9 +1041,9 @@ class B { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @SomeFunc[@B.%self.loc36_15.2: %B]() -> i32 { +// CHECK:STDOUT: fn @SomeFunc[%self: %B]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %B = name_ref self, @B.%self.loc36_15.2 +// CHECK:STDOUT: %self.ref: %B = name_ref self, %self // CHECK:STDOUT: %internal.ref: %.5 = name_ref internal, @B.%.loc14 [template = @B.%.loc14] // CHECK:STDOUT: %.loc44_16.1: ref %Internal = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc44_16.2: %Internal = bind_value %.loc44_16.1 @@ -1112,8 +1112,8 @@ class B { // CHECK:STDOUT: %.loc9: %.5 = base_decl %A, element0 [template] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [template = constants.%B] -// CHECK:STDOUT: %self.loc10_8.1: %B = param self, runtime_param0 -// CHECK:STDOUT: %self.loc10_8.2: %B = bind_name self, %self.loc10_8.1 +// CHECK:STDOUT: %self.param: %B = param self, runtime_param0 +// CHECK:STDOUT: %self: %B = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -1125,9 +1125,9 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[@B.%self.loc10_8.2: %B]() { +// CHECK:STDOUT: fn @F[%self: %B]() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %B = name_ref self, @B.%self.loc10_8.2 +// CHECK:STDOUT: %self.ref: %B = name_ref self, %self // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %x.ref: = name_ref x, [template = ] // CHECK:STDOUT: return @@ -1194,8 +1194,8 @@ class B { // CHECK:STDOUT: %.loc9: %.5 = base_decl %A, element0 [template] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [template = constants.%B] -// CHECK:STDOUT: %self.loc11_8.1: %B = param self, runtime_param0 -// CHECK:STDOUT: %self.loc11_8.2: %B = bind_name self, %self.loc11_8.1 +// CHECK:STDOUT: %self.param: %B = param self, runtime_param0 +// CHECK:STDOUT: %self: %B = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -1207,9 +1207,9 @@ class B { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[@B.%self.loc11_8.2: %B]() { +// CHECK:STDOUT: fn @F[%self: %B]() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %B = name_ref self, @B.%self.loc11_8.2 +// CHECK:STDOUT: %self.ref: %B = name_ref self, %self // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %x.ref: %.2 = name_ref x, @A.%.loc5_18 [template = @A.%.loc5_18] // CHECK:STDOUT: %.loc12_9.1: ref %A = class_element_access %self.ref, element0 diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index c953b3a5b3ecd..4d72e31c14417 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -65,30 +65,30 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_12.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_12.2: type = converted %int.make_type_32.loc16, %.loc16_12.1 [template = i32] -// CHECK:STDOUT: %n.loc16_9.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Make.%n: i32 = bind_name n, %n.loc16_9.1 -// CHECK:STDOUT: %Class.ref.loc16_23: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_12.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_12.2: type = converted %int.make_type_32, %.loc16_12.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param +// CHECK:STDOUT: %Class.ref.loc16_23: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc16_28: type = ptr_type %Class [template = constants.%.3] -// CHECK:STDOUT: %next.loc16_17.1: %.3 = param next, runtime_param1 -// CHECK:STDOUT: @Make.%next: %.3 = bind_name next, %next.loc16_17.1 -// CHECK:STDOUT: %Class.ref.loc16_34: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @Make.%return: ref %Class = var +// CHECK:STDOUT: %next.param: %.3 = param next, runtime_param1 +// CHECK:STDOUT: %next: %.3 = bind_name next, %next.param +// CHECK:STDOUT: %Class.ref.loc16_34: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %MakeReorder.decl: %MakeReorder.type = fn_decl @MakeReorder [template = constants.%MakeReorder] { -// CHECK:STDOUT: %int.make_type_32.loc20: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc20_19.1: type = value_of_initializer %int.make_type_32.loc20 [template = i32] -// CHECK:STDOUT: %.loc20_19.2: type = converted %int.make_type_32.loc20, %.loc20_19.1 [template = i32] -// CHECK:STDOUT: %n.loc20_16.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @MakeReorder.%n: i32 = bind_name n, %n.loc20_16.1 -// CHECK:STDOUT: %Class.ref.loc20_30: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc20_19.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc20_19.2: type = converted %int.make_type_32, %.loc20_19.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param +// CHECK:STDOUT: %Class.ref.loc20_30: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc20_35: type = ptr_type %Class [template = constants.%.3] -// CHECK:STDOUT: %next.loc20_24.1: %.3 = param next, runtime_param1 -// CHECK:STDOUT: @MakeReorder.%next: %.3 = bind_name next, %next.loc20_24.1 -// CHECK:STDOUT: %Class.ref.loc20_41: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @MakeReorder.%return: ref %Class = var +// CHECK:STDOUT: %next.param: %.3 = param next, runtime_param1 +// CHECK:STDOUT: %next: %.3 = bind_name next, %next.param +// CHECK:STDOUT: %Class.ref.loc20_41: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init_adapt.carbon b/toolchain/check/testdata/class/init_adapt.carbon index d42d8ae61e34c..5709cafdf315d 100644 --- a/toolchain/check/testdata/class/init_adapt.carbon +++ b/toolchain/check/testdata/class/init_adapt.carbon @@ -146,12 +146,12 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %AdaptC.ref.loc15: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] // CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %MakeC.decl: %MakeC.type = fn_decl @MakeC [template = constants.%MakeC] { -// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @MakeC.%return: ref %C = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %MakeAdaptC.decl: %MakeAdaptC.type = fn_decl @MakeAdaptC [template = constants.%MakeAdaptC] { -// CHECK:STDOUT: %AdaptC.ref.loc21: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] -// CHECK:STDOUT: @MakeAdaptC.%return: ref %AdaptC = var +// CHECK:STDOUT: %AdaptC.ref: type = name_ref AdaptC, file.%AdaptC.decl [template = constants.%AdaptC] +// CHECK:STDOUT: %return: ref %AdaptC = var // CHECK:STDOUT: } // CHECK:STDOUT: %AdaptC.ref.loc23: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] // CHECK:STDOUT: %d.var: ref %AdaptC = var d @@ -316,12 +316,12 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %AdaptC.ref.loc24: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] // CHECK:STDOUT: %C.ref.loc33: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %MakeC.decl: %MakeC.type = fn_decl @MakeC [template = constants.%MakeC] { -// CHECK:STDOUT: %C.ref.loc35: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @MakeC.%return: ref %C = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %MakeAdaptC.decl: %MakeAdaptC.type = fn_decl @MakeAdaptC [template = constants.%MakeAdaptC] { -// CHECK:STDOUT: %AdaptC.ref.loc37: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] -// CHECK:STDOUT: @MakeAdaptC.%return: ref %AdaptC = var +// CHECK:STDOUT: %AdaptC.ref: type = name_ref AdaptC, file.%AdaptC.decl [template = constants.%AdaptC] +// CHECK:STDOUT: %return: ref %AdaptC = var // CHECK:STDOUT: } // CHECK:STDOUT: %AdaptC.ref.loc46: type = name_ref AdaptC, %AdaptC.decl [template = constants.%AdaptC] // CHECK:STDOUT: %d.var: ref %AdaptC = var d diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index c39ac5daa9fcd..69f23e1dead1e 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -61,7 +61,7 @@ fn F() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc16_11.2: type = converted %int.make_type_32, %.loc16_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 8f182238657a2..b59f91aeeb740 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -72,13 +72,13 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Inner.decl: type = class_decl @Inner [template = constants.%Inner] {} // CHECK:STDOUT: %MakeInner.decl: %MakeInner.type = fn_decl @MakeInner [template = constants.%MakeInner] { -// CHECK:STDOUT: %Inner.ref: type = name_ref Inner, %Inner.decl [template = constants.%Inner] -// CHECK:STDOUT: @MakeInner.%return: ref %Inner = var +// CHECK:STDOUT: %Inner.ref: type = name_ref Inner, file.%Inner.decl [template = constants.%Inner] +// CHECK:STDOUT: %return: ref %Inner = var // CHECK:STDOUT: } // CHECK:STDOUT: %Outer.decl: type = class_decl @Outer [template = constants.%Outer] {} // CHECK:STDOUT: %MakeOuter.decl: %MakeOuter.type = fn_decl @MakeOuter [template = constants.%MakeOuter] { -// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer] -// CHECK:STDOUT: @MakeOuter.%return: ref %Outer = var +// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] +// CHECK:STDOUT: %return: ref %Outer = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index 89b01e88b6ee8..f62966fc4c465 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -127,108 +127,108 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc20_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %Class = bind_name self, %self.loc20_12.1 +// CHECK:STDOUT: %Self.ref.loc20: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %self.param.loc20: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc20: %Class = bind_name self, %self.param.loc20 // CHECK:STDOUT: %int.make_type_32.loc20: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc20_29.1: type = value_of_initializer %int.make_type_32.loc20 [template = i32] // CHECK:STDOUT: %.loc20_29.2: type = converted %int.make_type_32.loc20, %.loc20_29.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] { -// CHECK:STDOUT: %Class.ref.loc24: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc24_9.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @Call.%c: %Class = bind_name c, %c.loc24_9.1 -// CHECK:STDOUT: %int.make_type_32.loc24: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc24_22.1: type = value_of_initializer %int.make_type_32.loc24 [template = i32] -// CHECK:STDOUT: %.loc24_22.2: type = converted %int.make_type_32.loc24, %.loc24_22.1 [template = i32] -// CHECK:STDOUT: @Call.%return: ref i32 = var +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc24_22.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc24_22.2: type = converted %int.make_type_32, %.loc24_22.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallAlias.decl: %CallAlias.type = fn_decl @CallAlias [template = constants.%CallAlias] { -// CHECK:STDOUT: %Class.ref.loc30: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: %c.loc30_14.1: %Class = param c, runtime_param0 -// CHECK:STDOUT: @CallAlias.%c: %Class = bind_name c, %c.loc30_14.1 -// CHECK:STDOUT: %int.make_type_32.loc30: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc30_27.1: type = value_of_initializer %int.make_type_32.loc30 [template = i32] -// CHECK:STDOUT: %.loc30_27.2: type = converted %int.make_type_32.loc30, %.loc30_27.1 [template = i32] -// CHECK:STDOUT: @CallAlias.%return: ref i32 = var +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %c.param: %Class = param c, runtime_param0 +// CHECK:STDOUT: %c: %Class = bind_name c, %c.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc30_27.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc30_27.2: type = converted %int.make_type_32, %.loc30_27.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallOnConstBoundMethod.decl: %CallOnConstBoundMethod.type = fn_decl @CallOnConstBoundMethod [template = constants.%CallOnConstBoundMethod] { -// CHECK:STDOUT: %int.make_type_32.loc34: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc34_32.1: type = value_of_initializer %int.make_type_32.loc34 [template = i32] -// CHECK:STDOUT: %.loc34_32.2: type = converted %int.make_type_32.loc34, %.loc34_32.1 [template = i32] -// CHECK:STDOUT: @CallOnConstBoundMethod.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc34_32.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc34_32.2: type = converted %int.make_type_32, %.loc34_32.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallWithAddr.decl: %CallWithAddr.type = fn_decl @CallWithAddr [template = constants.%CallWithAddr] { -// CHECK:STDOUT: %int.make_type_32.loc38: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc38_22.1: type = value_of_initializer %int.make_type_32.loc38 [template = i32] -// CHECK:STDOUT: %.loc38_22.2: type = converted %int.make_type_32.loc38, %.loc38_22.1 [template = i32] -// CHECK:STDOUT: @CallWithAddr.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc38_22.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc38_22.2: type = converted %int.make_type_32, %.loc38_22.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallFThroughPointer.decl: %CallFThroughPointer.type = fn_decl @CallFThroughPointer [template = constants.%CallFThroughPointer] { -// CHECK:STDOUT: %Class.ref.loc43: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc43_32: type = ptr_type %Class [template = constants.%.2] -// CHECK:STDOUT: %p.loc43_24.1: %.2 = param p, runtime_param0 -// CHECK:STDOUT: @CallFThroughPointer.%p: %.2 = bind_name p, %p.loc43_24.1 -// CHECK:STDOUT: %int.make_type_32.loc43: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc43_38.1: type = value_of_initializer %int.make_type_32.loc43 [template = i32] -// CHECK:STDOUT: %.loc43_38.2: type = converted %int.make_type_32.loc43, %.loc43_38.1 [template = i32] -// CHECK:STDOUT: @CallFThroughPointer.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.2 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.2 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc43_38.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc43_38.2: type = converted %int.make_type_32, %.loc43_38.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGThroughPointer.decl: %CallGThroughPointer.type = fn_decl @CallGThroughPointer [template = constants.%CallGThroughPointer] { -// CHECK:STDOUT: %Class.ref.loc47: type = name_ref Class, %Class.decl [template = constants.%Class] +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc47_32: type = ptr_type %Class [template = constants.%.2] -// CHECK:STDOUT: %p.loc47_24.1: %.2 = param p, runtime_param0 -// CHECK:STDOUT: @CallGThroughPointer.%p: %.2 = bind_name p, %p.loc47_24.1 -// CHECK:STDOUT: %int.make_type_32.loc47: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc47_38.1: type = value_of_initializer %int.make_type_32.loc47 [template = i32] -// CHECK:STDOUT: %.loc47_38.2: type = converted %int.make_type_32.loc47, %.loc47_38.1 [template = i32] -// CHECK:STDOUT: @CallGThroughPointer.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.2 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.2 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc47_38.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc47_38.2: type = converted %int.make_type_32, %.loc47_38.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { -// CHECK:STDOUT: %Class.ref.loc51: type = name_ref Class, %Class.decl [template = constants.%Class] -// CHECK:STDOUT: @Make.%return: ref %Class = var +// CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallFOnInitializingExpr.decl: %CallFOnInitializingExpr.type = fn_decl @CallFOnInitializingExpr [template = constants.%CallFOnInitializingExpr] { -// CHECK:STDOUT: %int.make_type_32.loc53: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc53_33.1: type = value_of_initializer %int.make_type_32.loc53 [template = i32] -// CHECK:STDOUT: %.loc53_33.2: type = converted %int.make_type_32.loc53, %.loc53_33.1 [template = i32] -// CHECK:STDOUT: @CallFOnInitializingExpr.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc53_33.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc53_33.2: type = converted %int.make_type_32, %.loc53_33.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGOnInitializingExpr.decl: %CallGOnInitializingExpr.type = fn_decl @CallGOnInitializingExpr [template = constants.%CallGOnInitializingExpr] { -// CHECK:STDOUT: %int.make_type_32.loc57: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc57_33.1: type = value_of_initializer %int.make_type_32.loc57 [template = i32] -// CHECK:STDOUT: %.loc57_33.2: type = converted %int.make_type_32.loc57, %.loc57_33.1 [template = i32] -// CHECK:STDOUT: @CallGOnInitializingExpr.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc57_33.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc57_33.2: type = converted %int.make_type_32, %.loc57_33.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc12: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc12_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: %Class = bind_name self, %self.loc12_8.1 +// CHECK:STDOUT: %self.param.loc12: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc12: %Class = bind_name self, %self.param.loc12 // CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_25.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] // CHECK:STDOUT: %.loc12_25.2: type = converted %int.make_type_32.loc12, %.loc12_25.1 [template = i32] // CHECK:STDOUT: %return.var.loc12: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc13_23: type = ptr_type %Class [template = constants.%.2] -// CHECK:STDOUT: %self.loc13_13.1: %.2 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_13.3: %.2 = bind_name self, %self.loc13_13.1 -// CHECK:STDOUT: %.loc13_8: %.2 = addr_pattern %self.loc13_13.3 -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13, %.loc13_31.1 [template = i32] -// CHECK:STDOUT: %return.var.loc13: ref i32 = var +// CHECK:STDOUT: %self.param: %.2 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.2 = bind_name self, %self.param +// CHECK:STDOUT: %.loc13_8: %.2 = addr_pattern %self +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32, %.loc13_31.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.ref: %F.type = name_ref F, %F.decl [template = constants.%F] // CHECK:STDOUT: %A: %F.type = bind_alias A, %F.decl [template = constants.%F] -// CHECK:STDOUT: %int.make_type_32.loc17: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc17_10.1: type = value_of_initializer %int.make_type_32.loc17 [template = i32] -// CHECK:STDOUT: %.loc17_10.2: type = converted %int.make_type_32.loc17, %.loc17_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc17_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc17_10.2: type = converted %int.make_type_32, %.loc17_10.1 [template = i32] // CHECK:STDOUT: %.loc17_8: %.3 = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -241,16 +241,16 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[%self: %Class]() -> i32 { +// CHECK:STDOUT: fn @F[%self.loc20: %Class]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self +// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self.loc20 // CHECK:STDOUT: %k.ref: %.3 = name_ref k, @Class.%.loc17_8 [template = @Class.%.loc17_8] // CHECK:STDOUT: %.loc21_14.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc21_14.2: i32 = bind_value %.loc21_14.1 // CHECK:STDOUT: return %.loc21_14.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[addr @Class.%self.loc13_13.3: %.2]() -> i32; +// CHECK:STDOUT: fn @G[addr %self: %.2]() -> i32; // CHECK:STDOUT: // CHECK:STDOUT: fn @Call(%c: %Class) -> i32 { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 5d07c8698b1ce..500c0007b65d4 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -97,10 +97,10 @@ fn F(a: Outer*) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Outer.decl: type = class_decl @Outer [template = constants.%Outer] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer] +// CHECK:STDOUT: %Outer.ref.loc41: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %.loc41: type = ptr_type %Outer [template = constants.%.4] -// CHECK:STDOUT: %a.loc41_6.1: %.4 = param a, runtime_param0 -// CHECK:STDOUT: @F.2.%a: %.4 = bind_name a, %a.loc41_6.1 +// CHECK:STDOUT: %a.param: %.4 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.4 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -183,7 +183,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(%a: %.4) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] +// CHECK:STDOUT: %Outer.ref.loc42: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [template = constants.%Inner] // CHECK:STDOUT: %.loc42_21: type = ptr_type %Inner [template = constants.%.2] // CHECK:STDOUT: %a.ref.loc42: %.4 = name_ref a, %a diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 885938e7d528c..7157482d25b9b 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -66,19 +66,19 @@ fn G(o: Outer) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Outer.decl: type = class_decl @Outer [template = constants.%Outer] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Outer.ref.loc17: type = name_ref Outer, %Outer.decl [template = constants.%Outer] +// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [template = constants.%Inner] -// CHECK:STDOUT: %oi.loc17_6.1: %Inner = param oi, runtime_param0 -// CHECK:STDOUT: @F.%oi: %Inner = bind_name oi, %oi.loc17_6.1 +// CHECK:STDOUT: %oi.param: %Inner = param oi, runtime_param0 +// CHECK:STDOUT: %oi: %Inner = bind_name oi, %oi.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc17_26.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc17_26.2: type = converted %int.make_type_32, %.loc17_26.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Outer.ref.loc21: type = name_ref Outer, %Outer.decl [template = constants.%Outer] -// CHECK:STDOUT: %o.loc21_6.1: %Outer = param o, runtime_param0 -// CHECK:STDOUT: @G.%o: %Outer = bind_name o, %o.loc21_6.1 +// CHECK:STDOUT: %Outer.ref: type = name_ref Outer, file.%Outer.decl [template = constants.%Outer] +// CHECK:STDOUT: %o.param: %Outer = param o, runtime_param0 +// CHECK:STDOUT: %o: %Outer = bind_name o, %o.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/no_prelude/generic_vs_params.carbon b/toolchain/check/testdata/class/no_prelude/generic_vs_params.carbon index 60dce3ed76797..80ec500db4ed1 100644 --- a/toolchain/check/testdata/class/no_prelude/generic_vs_params.carbon +++ b/toolchain/check/testdata/class/no_prelude/generic_vs_params.carbon @@ -105,12 +105,12 @@ fn F(T:! type) { // CHECK:STDOUT: %NotGenericNoParams.decl: type = class_decl @NotGenericNoParams [template = constants.%NotGenericNoParams] {} // CHECK:STDOUT: %NotGenericButParams.decl: %NotGenericButParams.type = class_decl @NotGenericButParams [template = constants.%NotGenericButParams.1] {} // CHECK:STDOUT: %GenericAndParams.decl: %GenericAndParams.type.1 = class_decl @GenericAndParams.1 [template = constants.%GenericAndParams.1] { -// CHECK:STDOUT: %T.loc6_24.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc6_24.2: type = bind_symbolic_name T 0, %T.loc6_24.1 [symbolic = @GenericAndParams.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = class_decl @C [template = constants.%C.1] { -// CHECK:STDOUT: %T.loc8_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc8_9.2: type = bind_symbolic_name T 0, %T.loc8_9.1 [symbolic = @C.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: %NotGenericNoParams.ref: type = name_ref NotGenericNoParams, %NotGenericNoParams.decl [template = constants.%NotGenericNoParams] @@ -152,8 +152,8 @@ fn F(T:! type) { // CHECK:STDOUT: .Self = constants.%NotGenericButParams.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @GenericAndParams.1(file.%T.loc6_24.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @GenericAndParams.1(%T.loc6: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -163,18 +163,18 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%T.loc8_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C(%T.loc8: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %GenericAndParams.type: type = generic_class_type @GenericAndParams.2, @C(%T) [symbolic = %GenericAndParams.type (constants.%GenericAndParams.type.2)] +// CHECK:STDOUT: %GenericAndParams.type: type = generic_class_type @GenericAndParams.2, @C(%T.1) [symbolic = %GenericAndParams.type (constants.%GenericAndParams.type.2)] // CHECK:STDOUT: %GenericAndParams: @C.%GenericAndParams.type (%GenericAndParams.type.2) = struct_value () [symbolic = %GenericAndParams (constants.%GenericAndParams.3)] // CHECK:STDOUT: // CHECK:STDOUT: class { // CHECK:STDOUT: %GenericNoParams.decl: type = class_decl @GenericNoParams [template = constants.%GenericNoParams.1] {} -// CHECK:STDOUT: %GenericAndParams.decl: @C.%GenericAndParams.type (%GenericAndParams.type.2) = class_decl @GenericAndParams.2 [symbolic = %GenericAndParams (constants.%GenericAndParams.3)] { -// CHECK:STDOUT: %U.loc10_26.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc10_26.2: type = bind_symbolic_name U 1, %U.loc10_26.1 [symbolic = @GenericAndParams.2.%U (constants.%U)] +// CHECK:STDOUT: %GenericAndParams.decl: @C.%GenericAndParams.type (%GenericAndParams.type.2) = class_decl @GenericAndParams.2 [symbolic = @C.%GenericAndParams (constants.%GenericAndParams.3)] { +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc10: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -184,7 +184,7 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @GenericNoParams(file.%T.loc8_9.2: type) { +// CHECK:STDOUT: generic class @GenericNoParams(@C.%T.loc8: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: class { @@ -193,8 +193,8 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @GenericAndParams.2(file.%T.loc8_9.2: type, @C.%U.loc10_26.2: type) { -// CHECK:STDOUT: %U: type = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic class @GenericAndParams.2(@C.%T.loc8: type, %U.loc10: type) { +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -235,31 +235,31 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericNoParams(constants.%T) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.2(constants.%T, constants.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @C(@C.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @C(@C.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.1(constants.%X) { -// CHECK:STDOUT: %T => constants.%X +// CHECK:STDOUT: %T.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%X) { -// CHECK:STDOUT: %T => constants.%X +// CHECK:STDOUT: %T.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %GenericAndParams.type => constants.%GenericAndParams.type.3 @@ -267,7 +267,7 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.2(constants.%X, constants.%X) { -// CHECK:STDOUT: %U => constants.%X +// CHECK:STDOUT: %U.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: } @@ -287,8 +287,8 @@ fn F(T:! type) { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: %A.type = class_decl @A [template = constants.%A.1] { -// CHECK:STDOUT: %T.loc8_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc8_9.2: type = bind_name T, %T.loc8_9.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_name T, %T.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -316,12 +316,12 @@ fn F(T:! type) { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: %A.type = class_decl @A [template = constants.%A.1] { -// CHECK:STDOUT: %T.loc7_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc7_9.2: type = bind_name T, %T.loc7_9.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_name T, %T.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc10_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc10: type = bind_symbolic_name T 0, %T.loc10_6.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc10: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/no_prelude/import_access.carbon b/toolchain/check/testdata/class/no_prelude/import_access.carbon index b432566e05058..064972647516b 100644 --- a/toolchain/check/testdata/class/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/class/no_prelude/import_access.carbon @@ -404,8 +404,8 @@ private class Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Forward.ref: type = name_ref Forward, imports.%import_ref [template = constants.%Forward] // CHECK:STDOUT: %.loc4: type = ptr_type %Forward [template = constants.%.1] -// CHECK:STDOUT: %c.loc4_6.1: %.1 = param c, runtime_param0 -// CHECK:STDOUT: @F.%c: %.1 = bind_name c, %c.loc4_6.1 +// CHECK:STDOUT: %c.param: %.1 = param c, runtime_param0 +// CHECK:STDOUT: %c: %.1 = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: %Forward.decl: type = class_decl @Forward [template = constants.%Forward] {} // CHECK:STDOUT: } @@ -436,8 +436,8 @@ private class Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [template = ] // CHECK:STDOUT: %.loc10: type = ptr_type [template = ] -// CHECK:STDOUT: %c.loc10_6.1: = param c, runtime_param0 -// CHECK:STDOUT: @F.%c: = bind_name c, %c.loc10_6.1 +// CHECK:STDOUT: %c.param: = param c, runtime_param0 +// CHECK:STDOUT: %c: = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -470,8 +470,8 @@ private class Redecl {} // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [template = imports.%Test] // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [template = ] // CHECK:STDOUT: %.loc9: type = ptr_type [template = ] -// CHECK:STDOUT: %c.loc9_6.1: = param c, runtime_param0 -// CHECK:STDOUT: @F.%c: = bind_name c, %c.loc9_6.1 +// CHECK:STDOUT: %c.param: = param c, runtime_param0 +// CHECK:STDOUT: %c: = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon index a644a09c81671..7aaf5633b28b4 100644 --- a/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/class/no_prelude/syntactic_merge.carbon @@ -202,27 +202,27 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Bar = %Bar.decl.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc8: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc8_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc8_11.2: %C = bind_symbolic_name a 0, %a.loc8_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc8: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc8: %C = bind_symbolic_name a 0, %a.param.loc8 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc10: %Bar.type = class_decl @Bar [template = constants.%Bar.1] { -// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc10_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc10_11.2: %C = bind_symbolic_name a 0, %a.loc10_11.1 [symbolic = @Bar.%a (constants.%a)] +// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc10: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc10: %C = bind_symbolic_name a 0, %a.param.loc10 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc11: %Bar.type = class_decl @Bar [template = constants.%Bar.1] { -// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc11_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc11_11.2: %C = bind_symbolic_name a 0, %a.loc11_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc11: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc11: %C = bind_symbolic_name a 0, %a.param.loc11 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -231,8 +231,8 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc7_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -242,8 +242,8 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Bar(file.%a.loc10_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Bar(%a.loc10: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -254,11 +254,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- spacing.carbon @@ -280,14 +280,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_17.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_17.2: %C = bind_symbolic_name a 0, %a.loc6_17.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param.loc6 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_13.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_13.2: %C = bind_symbolic_name a 0, %a.loc7_13.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -296,8 +296,8 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc6_17.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -308,7 +308,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_parens.carbon @@ -333,14 +333,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_11.2: %C = bind_symbolic_name a 0, %a.loc6_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %C.ref.loc14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc14_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc14_11.2: %C = bind_symbolic_name a 0, %a.loc14_11.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc14: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -349,14 +349,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc6_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%a.loc14_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @.1(%a.loc14: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -367,11 +367,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- todo_fail_raw_identifier.carbon @@ -393,14 +393,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_11.2: %C = bind_symbolic_name a 0, %a.loc6_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param.loc6 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -409,8 +409,8 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc6_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -421,7 +421,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- two_file.carbon @@ -447,17 +447,17 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Bar = %Bar.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = class_decl @Bar [template = constants.%Bar.1] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc8_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc8_11.2: %C = bind_symbolic_name a 0, %a.loc8_11.1 [symbolic = @Bar.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc8: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -466,24 +466,24 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc7_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Bar(file.%a.loc8_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Bar(%a.loc8: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- two_file.impl.carbon @@ -520,13 +520,13 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] -// CHECK:STDOUT: %a.loc4_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc4_11.2: %C = bind_symbolic_name a 0, %a.loc4_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// 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.1] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.2 [template = constants.%C] -// CHECK:STDOUT: %a.loc5_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc5_11.2: %C = bind_symbolic_name a 0, %a.loc5_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc5: %C = bind_symbolic_name a 0, %a.param [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -536,7 +536,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Foo(constants.%a: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -547,7 +547,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Bar(constants.%a: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -558,11 +558,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_name_mismatch.carbon @@ -588,17 +588,17 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %b.loc15_11.1: %C = param b, runtime_param -// CHECK:STDOUT: %b.loc15_11.2: %C = bind_symbolic_name b 0, %b.loc15_11.1 [symbolic = @.1.%b (constants.%b)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param +// CHECK:STDOUT: %b.loc15: %C = bind_symbolic_name b 0, %b.param [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -607,14 +607,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc7_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%b.loc15_11.2: %C) { -// CHECK:STDOUT: %b: %C = bind_symbolic_name b 0 [symbolic = %b (constants.%b)] +// CHECK:STDOUT: generic class @.1(%b.loc15: %C) { +// CHECK:STDOUT: %b.1: %C = bind_symbolic_name b 0 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -625,11 +625,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_alias.carbon @@ -654,17 +654,17 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc15_11.2: %C = bind_symbolic_name a 0, %a.loc15_11.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc15: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -673,14 +673,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc7_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%a.loc15_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @.1(%a.loc15: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -691,11 +691,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_deduced_alias.carbon @@ -720,17 +720,17 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_11.2: %C = bind_symbolic_name a 0, %a.loc7_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc15_11.2: %C = bind_symbolic_name a 0, %a.loc15_11.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc15: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -739,14 +739,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc7_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%a.loc15_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @.1(%a.loc15: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -757,11 +757,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- alias_two_file.carbon @@ -783,9 +783,9 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_11.2: %C = bind_symbolic_name a 0, %a.loc6_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -794,14 +794,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc6_11.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- todo_fail_alias_two_file.impl.carbon @@ -833,9 +833,9 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc6_11.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_11.2: %C = bind_symbolic_name a 0, %a.loc6_11.1 [symbolic = constants.%a] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -845,7 +845,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic class @Foo(constants.%a: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -856,7 +856,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_repeat_const.carbon @@ -882,17 +882,17 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = class_decl @Foo [template = constants.%Foo.1] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc6: type = const_type %C [template = constants.%.2] -// CHECK:STDOUT: %a.loc6_11.1: %.2 = param a, runtime_param -// CHECK:STDOUT: %a.loc6_11.2: %.2 = bind_symbolic_name a 0, %a.loc6_11.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %.2 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %C.ref.loc18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc18_22: type = const_type %C [template = constants.%.2] // CHECK:STDOUT: %.loc18_15: type = const_type %.2 [template = constants.%.2] -// CHECK:STDOUT: %a.loc18_11.1: %.2 = param a, runtime_param -// CHECK:STDOUT: %a.loc18_11.2: %.2 = bind_symbolic_name a 0, %a.loc18_11.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param +// CHECK:STDOUT: %a.loc18: %.2 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -901,14 +901,14 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Foo(file.%a.loc6_11.2: %.2) { -// CHECK:STDOUT: %a: %.2 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @Foo(%a.loc6: %.2) { +// CHECK:STDOUT: %a.1: %.2 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%a.loc18_11.2: %.2) { -// CHECK:STDOUT: %a: %.2 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @.1(%a.loc18: %.2) { +// CHECK:STDOUT: %a.1: %.2 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -919,11 +919,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_self_type.carbon @@ -948,11 +948,11 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: } // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.5] { -// CHECK:STDOUT: %Base.ref: type = name_ref Base, %Base.decl [template = constants.%Base] +// CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc16_26: type = ptr_type %Base [template = constants.%.3] -// CHECK:STDOUT: %self.loc16_16.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: @.1.%self: %.3 = bind_name self, %self.loc16_16.1 -// CHECK:STDOUT: @.1.%.loc16: %.3 = addr_pattern @.1.%self +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc16_11: %.3 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -963,9 +963,9 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %.loc7_23: type = ptr_type %Base [template = constants.%.3] -// CHECK:STDOUT: %self.loc7_13.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_13.3: %.3 = bind_name self, %self.loc7_13.1 -// CHECK:STDOUT: %.loc7_8: %.3 = addr_pattern %self.loc7_13.3 +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc7_8: %.3 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -974,7 +974,7 @@ fn Base.F[addr self: Base*]() { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[addr @Base.%self.loc7_13.3: %.3](); +// CHECK:STDOUT: fn @F[addr %self: %.3](); // CHECK:STDOUT: // CHECK:STDOUT: fn @.1[addr %self: %.3]() { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index 1c7d8fd8de130..8d2916aca8770 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -67,24 +67,24 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc17_27: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %self.loc17_17.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: @F.%self.loc17_17: %.1 = bind_name self, %self.loc17_17.1 -// CHECK:STDOUT: @F.%.loc17: %.1 = addr_pattern @F.%self.loc17_17 +// CHECK:STDOUT: %self.param.loc17_17: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc17_17: %.1 = bind_name self, %self.param.loc17_17 +// CHECK:STDOUT: %.loc17_12: %.1 = addr_pattern %self.loc17_17 // CHECK:STDOUT: %int.make_type_32.loc17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc17_38.1: type = value_of_initializer %int.make_type_32.loc17 [template = i32] // CHECK:STDOUT: %.loc17_38.2: type = converted %int.make_type_32.loc17, %.loc17_38.1 [template = i32] -// CHECK:STDOUT: %self.loc17_30.1: i32 = param r#self, runtime_param1 -// CHECK:STDOUT: @F.%self.loc17_30: i32 = bind_name r#self, %self.loc17_30.1 +// CHECK:STDOUT: %self.param.loc17_30: i32 = param r#self, runtime_param1 +// CHECK:STDOUT: %self.loc17_30: i32 = bind_name r#self, %self.param.loc17_30 // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc21_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @G.%self.loc21_12: %Class = bind_name self, %self.loc21_12.1 +// CHECK:STDOUT: %self.param.loc21_12: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc21_12: %Class = bind_name self, %self.param.loc21_12 // CHECK:STDOUT: %int.make_type_32.loc21_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_32.1: type = value_of_initializer %int.make_type_32.loc21_32 [template = i32] // CHECK:STDOUT: %.loc21_32.2: type = converted %int.make_type_32.loc21_32, %.loc21_32.1 [template = i32] -// CHECK:STDOUT: %self.loc21_24.1: i32 = param r#self, runtime_param1 -// CHECK:STDOUT: @G.%self.loc21_24: i32 = bind_name r#self, %self.loc21_24.1 +// CHECK:STDOUT: %self.param.loc21_24: i32 = param r#self, runtime_param1 +// CHECK:STDOUT: %self.loc21_24: i32 = bind_name r#self, %self.param.loc21_24 // CHECK:STDOUT: %int.make_type_32.loc21_41: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc21_46: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_49.1: %.3 = tuple_literal (%int.make_type_32.loc21_41, %int.make_type_32.loc21_46) @@ -93,7 +93,7 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc21_49.4: type = value_of_initializer %int.make_type_32.loc21_46 [template = i32] // CHECK:STDOUT: %.loc21_49.5: type = converted %int.make_type_32.loc21_46, %.loc21_49.4 [template = i32] // CHECK:STDOUT: %.loc21_49.6: type = converted %.loc21_49.1, constants.%.4 [template = constants.%.4] -// CHECK:STDOUT: @G.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -101,24 +101,24 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc12: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc12_23: type = ptr_type %Class [template = constants.%.1] -// CHECK:STDOUT: %self.loc12_13.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_13.3: %.1 = bind_name self, %self.loc12_13.1 -// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self.loc12_13.3 +// CHECK:STDOUT: %self.param.loc12_13: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc12_13: %.1 = bind_name self, %self.param.loc12_13 +// CHECK:STDOUT: %.loc12_8: %.1 = addr_pattern %self.loc12_13 // CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_34.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] // CHECK:STDOUT: %.loc12_34.2: type = converted %int.make_type_32.loc12, %.loc12_34.1 [template = i32] -// CHECK:STDOUT: %self.loc12_26.1: i32 = param r#self, runtime_param1 -// CHECK:STDOUT: %self.loc12_26.2: i32 = bind_name r#self, %self.loc12_26.1 +// CHECK:STDOUT: %self.param.loc12_26: i32 = param r#self, runtime_param1 +// CHECK:STDOUT: %self.loc12_26: i32 = bind_name r#self, %self.param.loc12_26 // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc13_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_8.2: %Class = bind_name self, %self.loc13_8.1 +// CHECK:STDOUT: %self.param.loc13_8: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc13_8: %Class = bind_name self, %self.param.loc13_8 // CHECK:STDOUT: %int.make_type_32.loc13_28: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_28.1: type = value_of_initializer %int.make_type_32.loc13_28 [template = i32] // CHECK:STDOUT: %.loc13_28.2: type = converted %int.make_type_32.loc13_28, %.loc13_28.1 [template = i32] -// CHECK:STDOUT: %self.loc13_20.1: i32 = param r#self, runtime_param1 -// CHECK:STDOUT: %self.loc13_20.2: i32 = bind_name r#self, %self.loc13_20.1 +// CHECK:STDOUT: %self.param.loc13_20: i32 = param r#self, runtime_param1 +// CHECK:STDOUT: %self.loc13_20: i32 = bind_name r#self, %self.param.loc13_20 // CHECK:STDOUT: %int.make_type_32.loc13_37: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc13_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_45.1: %.3 = tuple_literal (%int.make_type_32.loc13_37, %int.make_type_32.loc13_42) @@ -127,11 +127,11 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc13_45.4: type = value_of_initializer %int.make_type_32.loc13_42 [template = i32] // CHECK:STDOUT: %.loc13_45.5: type = converted %int.make_type_32.loc13_42, %.loc13_45.4 [template = i32] // CHECK:STDOUT: %.loc13_45.6: type = converted %.loc13_45.1, constants.%.4 [template = constants.%.4] -// CHECK:STDOUT: %return.var: ref %.4 = var +// CHECK:STDOUT: %return.var.loc13: ref %.4 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_10.2: type = converted %int.make_type_32.loc14, %.loc14_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_10.2: type = converted %int.make_type_32, %.loc14_10.1 [template = i32] // CHECK:STDOUT: %.loc14_8: %.5 = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index 6ebe4923591bd..aae5e1898e1a2 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -63,11 +63,11 @@ fn MemberNamedSelf.F(x: Self, y: r#Self) {} // CHECK:STDOUT: %MemberNamedSelf.decl: type = class_decl @MemberNamedSelf [template = constants.%MemberNamedSelf] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %Self.ref.loc24_25: type = name_ref Self, constants.%MemberNamedSelf [template = constants.%MemberNamedSelf] -// CHECK:STDOUT: %x.loc24_22.1: %MemberNamedSelf = param x, runtime_param0 -// CHECK:STDOUT: @F.2.%x: %MemberNamedSelf = bind_name x, %x.loc24_22.1 +// CHECK:STDOUT: %x.param.loc24: %MemberNamedSelf = param x, runtime_param0 +// CHECK:STDOUT: %x.loc24: %MemberNamedSelf = bind_name x, %x.param.loc24 // CHECK:STDOUT: %Self.ref.loc24_34: type = name_ref r#Self, @MemberNamedSelf.%Self.decl [template = constants.%Self] -// CHECK:STDOUT: %y.loc24_31.1: %Self = param y, runtime_param1 -// CHECK:STDOUT: @F.2.%y: %Self = bind_name y, %y.loc24_31.1 +// CHECK:STDOUT: %y.param.loc24: %Self = param y, runtime_param1 +// CHECK:STDOUT: %y.loc24: %Self = bind_name y, %y.param.loc24 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -83,11 +83,11 @@ fn MemberNamedSelf.F(x: Self, y: r#Self) {} // CHECK:STDOUT: %Self.decl: type = class_decl @Self [template = constants.%Self] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %Self.ref.loc21_11: type = name_ref Self, constants.%MemberNamedSelf [template = constants.%MemberNamedSelf] -// CHECK:STDOUT: %x.loc21_8.1: %MemberNamedSelf = param x, runtime_param0 -// CHECK:STDOUT: %x.loc21_8.2: %MemberNamedSelf = bind_name x, %x.loc21_8.1 -// CHECK:STDOUT: %Self.ref.loc21_20: type = name_ref r#Self, %Self.decl [template = constants.%Self] -// CHECK:STDOUT: %y.loc21_17.1: %Self = param y, runtime_param1 -// CHECK:STDOUT: %y.loc21_17.2: %Self = bind_name y, %y.loc21_17.1 +// CHECK:STDOUT: %x.param.loc21: %MemberNamedSelf = param x, runtime_param0 +// CHECK:STDOUT: %x.loc21: %MemberNamedSelf = bind_name x, %x.param.loc21 +// CHECK:STDOUT: %Self.ref.loc21_20: type = name_ref r#Self, @MemberNamedSelf.%Self.decl [template = constants.%Self] +// CHECK:STDOUT: %y.param.loc21: %Self = param y, runtime_param1 +// CHECK:STDOUT: %y.loc21: %Self = bind_name y, %y.param.loc21 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -117,7 +117,7 @@ fn MemberNamedSelf.F(x: Self, y: r#Self) {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2(%x: %MemberNamedSelf, %y: %Self) { +// CHECK:STDOUT: fn @F.2(%x.loc24: %MemberNamedSelf, %y.loc24: %Self) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index 7d337161032ec..c57fe5623bff9 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -53,27 +53,27 @@ fn Class.F[self: Self](b: bool) {} // CHECK:STDOUT: %Class.decl.loc11: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %Class.decl.loc13: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc17_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %Class = bind_name self, %self.loc17_12.1 -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_27.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc17_27.2: type = converted %bool.make_type, %.loc17_27.1 [template = bool] -// CHECK:STDOUT: %b.loc17_24.1: bool = param b, runtime_param1 -// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc17_24.1 +// CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %self.param.loc17: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc17: %Class = bind_name self, %self.param.loc17 +// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_27.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] +// CHECK:STDOUT: %.loc17_27.2: type = converted %bool.make_type.loc17, %.loc17_27.1 [template = bool] +// CHECK:STDOUT: %b.param.loc17: bool = param b, runtime_param1 +// CHECK:STDOUT: %b.loc17: bool = bind_name b, %b.param.loc17 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc14_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_8.2: %Class = bind_name self, %self.loc14_8.1 -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_23.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc14_23.2: type = converted %bool.make_type, %.loc14_23.1 [template = bool] -// CHECK:STDOUT: %b.loc14_20.1: bool = param b, runtime_param1 -// CHECK:STDOUT: %b.loc14_20.2: bool = bind_name b, %b.loc14_20.1 +// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %self.param.loc14: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc14: %Class = bind_name self, %self.param.loc14 +// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_23.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] +// CHECK:STDOUT: %.loc14_23.2: type = converted %bool.make_type.loc14, %.loc14_23.1 [template = bool] +// CHECK:STDOUT: %b.param.loc14: bool = param b, runtime_param1 +// CHECK:STDOUT: %b.loc14: bool = bind_name b, %b.param.loc14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -83,7 +83,7 @@ fn Class.F[self: Self](b: bool) {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[%self: %Class](%b: bool) { +// CHECK:STDOUT: fn @F[%self.loc17: %Class](%b.loc17: bool) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index 2e49f2d8dd6d5..09a86304c5225 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -56,10 +56,10 @@ fn Class.F() -> i32 { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_17.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc16_17.2: type = converted %int.make_type_32, %.loc16_17.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_17.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] +// CHECK:STDOUT: %.loc16_17.2: type = converted %int.make_type_32.loc16, %.loc16_17.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -71,10 +71,10 @@ fn Class.F() -> i32 { // CHECK:STDOUT: %return.var.loc12: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32.loc13, %.loc13_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc13: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32, %.loc13_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/reorder.carbon b/toolchain/check/testdata/class/reorder.carbon index 6ec5ce3cdcd3f..6466d31b11008 100644 --- a/toolchain/check/testdata/class/reorder.carbon +++ b/toolchain/check/testdata/class/reorder.carbon @@ -60,16 +60,16 @@ class Class { // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32.loc12, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc12: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32.loc16, %.loc16_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc16: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32, %.loc16_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 515747629706d..01b673d2adf97 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -76,23 +76,23 @@ fn Run() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc21_11.2: type = converted %int.make_type_32, %.loc21_11.1 [template = i32] -// CHECK:STDOUT: @F.2.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32.loc12, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc12: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32.loc16, %.loc16_13.1 [template = i32] -// CHECK:STDOUT: %return.var.loc16: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32, %.loc16_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index d00fd3206a98a..bb8b7d435da5f 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -64,31 +64,31 @@ fn Class.G[addr self: Self*]() -> i32 { // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc18_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %Class = bind_name self, %self.loc18_12.1 +// CHECK:STDOUT: %self.param.loc18: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc18: %Class = bind_name self, %self.param.loc18 // CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_29.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] // CHECK:STDOUT: %.loc18_29.2: type = converted %int.make_type_32.loc18, %.loc18_29.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc22: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc22_27: type = ptr_type %Class [template = constants.%.2] -// CHECK:STDOUT: %self.loc22_17.1: %.2 = param self, runtime_param0 -// CHECK:STDOUT: @G.%self: %.2 = bind_name self, %self.loc22_17.1 -// CHECK:STDOUT: @G.%.loc22: %.2 = addr_pattern @G.%self +// CHECK:STDOUT: %self.param.loc22: %.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc22: %.2 = bind_name self, %self.param.loc22 +// CHECK:STDOUT: %.loc22_12: %.2 = addr_pattern %self.loc22 // CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_35.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] // CHECK:STDOUT: %.loc22_35.2: type = converted %int.make_type_32.loc22, %.loc22_35.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc12: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc12_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: %Class = bind_name self, %self.loc12_8.1 +// CHECK:STDOUT: %self.param.loc12: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc12: %Class = bind_name self, %self.param.loc12 // CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_25.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] // CHECK:STDOUT: %.loc12_25.2: type = converted %int.make_type_32.loc12, %.loc12_25.1 [template = i32] @@ -97,17 +97,17 @@ fn Class.G[addr self: Self*]() -> i32 { // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc13_23: type = ptr_type %Class [template = constants.%.2] -// CHECK:STDOUT: %self.loc13_13.1: %.2 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_13.3: %.2 = bind_name self, %self.loc13_13.1 -// CHECK:STDOUT: %.loc13_8: %.2 = addr_pattern %self.loc13_13.3 +// CHECK:STDOUT: %self.param.loc13: %.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc13: %.2 = bind_name self, %self.param.loc13 +// CHECK:STDOUT: %.loc13_8: %.2 = addr_pattern %self.loc13 // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_31.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_31.2: type = converted %int.make_type_32.loc13, %.loc13_31.1 [template = i32] // CHECK:STDOUT: %return.var.loc13: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_10.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_10.2: type = converted %int.make_type_32.loc15, %.loc15_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_10.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_10.2: type = converted %int.make_type_32, %.loc15_10.1 [template = i32] // CHECK:STDOUT: %.loc15_8: %.3 = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -119,18 +119,18 @@ fn Class.G[addr self: Self*]() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[%self: %Class]() -> i32 { +// CHECK:STDOUT: fn @F[%self.loc18: %Class]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self +// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self.loc18 // CHECK:STDOUT: %n.ref: %.3 = name_ref n, @Class.%.loc15_8 [template = @Class.%.loc15_8] // CHECK:STDOUT: %.loc19_14.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc19_14.2: i32 = bind_value %.loc19_14.1 // CHECK:STDOUT: return %.loc19_14.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[addr %self: %.2]() -> i32 { +// CHECK:STDOUT: fn @G[addr %self.loc22: %.2]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %.2 = name_ref self, %self +// CHECK:STDOUT: %self.ref: %.2 = name_ref self, %self.loc22 // CHECK:STDOUT: %.loc23_11: ref %Class = deref %self.ref // CHECK:STDOUT: %n.ref: %.3 = name_ref n, @Class.%.loc15_8 [template = @Class.%.loc15_8] // CHECK:STDOUT: %.loc23_17.1: ref i32 = class_element_access %.loc23_11, element0 diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index d79de6b1e8c0d..082209fc8f1a0 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -84,30 +84,30 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: %Base.decl: type = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Derived.decl: type = class_decl @Derived [template = constants.%Derived] {} // CHECK:STDOUT: %SelfBase.decl: %SelfBase.type = fn_decl @SelfBase [template = constants.%SelfBase] { -// CHECK:STDOUT: %Base.ref.loc22: type = name_ref Base, %Base.decl [template = constants.%Base] -// CHECK:STDOUT: %self.loc22_21.1: %Base = param self, runtime_param0 -// CHECK:STDOUT: @SelfBase.%self: %Base = bind_name self, %self.loc22_21.1 +// CHECK:STDOUT: %Base.ref.loc22: type = name_ref Base, file.%Base.decl [template = constants.%Base] +// CHECK:STDOUT: %self.param.loc22: %Base = param self, runtime_param0 +// CHECK:STDOUT: %self.loc22: %Base = bind_name self, %self.param.loc22 // CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_38.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] // CHECK:STDOUT: %.loc22_38.2: type = converted %int.make_type_32.loc22, %.loc22_38.1 [template = i32] -// CHECK:STDOUT: @SelfBase.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AddrSelfBase.decl: %AddrSelfBase.type = fn_decl @AddrSelfBase [template = constants.%AddrSelfBase] { -// CHECK:STDOUT: %Base.ref.loc26: type = name_ref Base, %Base.decl [template = constants.%Base] +// CHECK:STDOUT: %Base.ref.loc26: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc26_40: type = ptr_type %Base [template = constants.%.6] -// CHECK:STDOUT: %self.loc26_30.1: %.6 = param self, runtime_param0 -// CHECK:STDOUT: @AddrSelfBase.%self: %.6 = bind_name self, %self.loc26_30.1 -// CHECK:STDOUT: @AddrSelfBase.%.loc26: %.6 = addr_pattern @AddrSelfBase.%self +// CHECK:STDOUT: %self.param.loc26: %.6 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc26: %.6 = bind_name self, %self.param.loc26 +// CHECK:STDOUT: %.loc26_25: %.6 = addr_pattern %self.loc26 // CHECK:STDOUT: } // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] { -// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] +// CHECK:STDOUT: %Derived.ref: type = name_ref Derived, file.%Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc30_19: type = ptr_type %Derived [template = constants.%.9] -// CHECK:STDOUT: %p.loc30_9.1: %.9 = param p, runtime_param0 -// CHECK:STDOUT: @Call.%p: %.9 = bind_name p, %p.loc30_9.1 -// CHECK:STDOUT: %int.make_type_32.loc30: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc30_25.1: type = value_of_initializer %int.make_type_32.loc30 [template = i32] -// CHECK:STDOUT: %.loc30_25.2: type = converted %int.make_type_32.loc30, %.loc30_25.1 [template = i32] -// CHECK:STDOUT: @Call.%return: ref i32 = var +// CHECK:STDOUT: %p.param: %.9 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.9 = bind_name p, %p.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc30_25.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc30_25.2: type = converted %int.make_type_32, %.loc30_25.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -123,23 +123,23 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Derived { -// CHECK:STDOUT: %Base.ref.loc16: type = name_ref Base, file.%Base.decl [template = constants.%Base] +// CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc16: %.5 = base_decl %Base, element0 [template] // CHECK:STDOUT: %SelfBase.decl: %SelfBase.type = fn_decl @SelfBase [template = constants.%SelfBase] { // CHECK:STDOUT: %Base.ref.loc18: type = name_ref Base, file.%Base.decl [template = constants.%Base] -// CHECK:STDOUT: %self.loc18_15.1: %Base = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_15.2: %Base = bind_name self, %self.loc18_15.1 -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_32.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc18_32.2: type = converted %int.make_type_32, %.loc18_32.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %self.param.loc18: %Base = param self, runtime_param0 +// CHECK:STDOUT: %self.loc18: %Base = bind_name self, %self.param.loc18 +// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_32.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] +// CHECK:STDOUT: %.loc18_32.2: type = converted %int.make_type_32.loc18, %.loc18_32.1 [template = i32] +// CHECK:STDOUT: %return.var.loc18: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AddrSelfBase.decl: %AddrSelfBase.type = fn_decl @AddrSelfBase [template = constants.%AddrSelfBase] { // CHECK:STDOUT: %Base.ref.loc19: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc19_34: type = ptr_type %Base [template = constants.%.6] -// CHECK:STDOUT: %self.loc19_24.1: %.6 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc19_24.3: %.6 = bind_name self, %self.loc19_24.1 -// CHECK:STDOUT: %.loc19_19: %.6 = addr_pattern %self.loc19_24.3 +// CHECK:STDOUT: %self.param.loc19: %.6 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc19: %.6 = bind_name self, %self.param.loc19 +// CHECK:STDOUT: %.loc19_19: %.6 = addr_pattern %self.loc19 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -152,18 +152,18 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @SelfBase[%self: %Base]() -> i32 { +// CHECK:STDOUT: fn @SelfBase[%self.loc22: %Base]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Base = name_ref self, %self +// CHECK:STDOUT: %self.ref: %Base = name_ref self, %self.loc22 // CHECK:STDOUT: %a.ref: %.2 = name_ref a, @Base.%.loc12_8 [template = @Base.%.loc12_8] // CHECK:STDOUT: %.loc23_14.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc23_14.2: i32 = bind_value %.loc23_14.1 // CHECK:STDOUT: return %.loc23_14.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @AddrSelfBase[addr %self: %.6]() { +// CHECK:STDOUT: fn @AddrSelfBase[addr %self.loc26: %.6]() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %.6 = name_ref self, %self +// CHECK:STDOUT: %self.ref: %.6 = name_ref self, %self.loc26 // CHECK:STDOUT: %.loc27_4: ref %Base = deref %self.ref // CHECK:STDOUT: %a.ref: %.2 = name_ref a, @Base.%.loc12_8 [template = @Base.%.loc12_8] // CHECK:STDOUT: %.loc27_10: ref i32 = class_element_access %.loc27_4, element0 diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index 77801b288d445..def2dfc1e6381 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -62,31 +62,31 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Class.decl: type = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc21_12.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %Class = bind_name self, %self.loc21_12.1 -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc21_29.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc21_29.2: type = converted %int.make_type_32, %.loc21_29.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %Self.ref.loc21: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %self.param.loc21: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc21: %Class = bind_name self, %self.param.loc21 +// CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc21_29.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] +// CHECK:STDOUT: %.loc21_29.2: type = converted %int.make_type_32.loc21, %.loc21_29.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref.loc12: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %self.loc12_8.1: %Class = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: %Class = bind_name self, %self.loc12_8.1 -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_25.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_25.2: type = converted %int.make_type_32, %.loc12_25.1 [template = i32] +// CHECK:STDOUT: %self.param.loc12: %Class = param self, runtime_param0 +// CHECK:STDOUT: %self.loc12: %Class = bind_name self, %self.param.loc12 +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_25.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_25.2: type = converted %int.make_type_32.loc12, %.loc12_25.1 [template = i32] // CHECK:STDOUT: %return.var.loc12: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Make.decl: %Make.type = fn_decl @Make [template = constants.%Make] { // CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %return.var.loc13: ref %Class = var +// CHECK:STDOUT: %return: ref %Class = var // CHECK:STDOUT: } -// CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc18_14: type = ptr_type %Class [template = constants.%.2] // CHECK:STDOUT: %.loc18_8: %.3 = field_decl p, element0 [template] // CHECK:STDOUT: @@ -99,9 +99,9 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F[%self: %Class]() -> i32 { +// CHECK:STDOUT: fn @F[%self.loc21: %Class]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self +// CHECK:STDOUT: %self.ref: %Class = name_ref self, %self.loc21 // CHECK:STDOUT: %p.ref: %.3 = name_ref p, @Class.%.loc18_8 [template = @Class.%.loc18_8] // CHECK:STDOUT: %.loc22_16.1: ref %.2 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc22_16.2: %.2 = bind_value %.loc22_16.1 @@ -115,10 +115,10 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: return %.loc22_23.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Make() -> @Class.%return.var.loc13: %Class { +// CHECK:STDOUT: fn @Make() -> %return: %Class { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] -// CHECK:STDOUT: %s: ref %Class = bind_name s, @Class.%return.var.loc13 +// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%Class [template = constants.%Class] +// CHECK:STDOUT: %s: ref %Class = bind_name s, %return // CHECK:STDOUT: %s.ref.loc15_5: ref %Class = name_ref s, %s // CHECK:STDOUT: %s.ref.loc15_16: ref %Class = name_ref s, %s // CHECK:STDOUT: %.loc15_15: %.2 = addr_of %s.ref.loc15_16 @@ -128,6 +128,6 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: %.loc15_17.4: init %Class = class_init (%.loc15_17.3), %s.ref.loc15_5 // CHECK:STDOUT: %.loc15_7: init %Class = converted %.loc15_17.1, %.loc15_17.4 // CHECK:STDOUT: assign %s.ref.loc15_5, %.loc15_7 -// CHECK:STDOUT: return %s to @Class.%return.var.loc13 +// CHECK:STDOUT: return %s to %return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index b6a285753ffbc..69b9a178a1e2e 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -59,7 +59,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc15_13.2: type = converted %int.make_type_32, %.loc15_13.1 [template = i32] -// CHECK:STDOUT: @Run.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -68,7 +68,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc12_13.2: type = converted %int.make_type_32, %.loc12_13.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/syntactic_merge_literal.carbon b/toolchain/check/testdata/class/syntactic_merge_literal.carbon index 916657295225c..c37991d4a2a1f 100644 --- a/toolchain/check/testdata/class/syntactic_merge_literal.carbon +++ b/toolchain/check/testdata/class/syntactic_merge_literal.carbon @@ -73,27 +73,27 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc2_13.2: type = converted %int.make_type_32, %.loc2_13.1 [template = i32] -// CHECK:STDOUT: %a.loc2_9.1: i32 = param a, runtime_param -// CHECK:STDOUT: %a.loc2_9.2: i32 = bind_symbolic_name a 0, %a.loc2_9.1 [symbolic = @C.%a (constants.%a)] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param +// CHECK:STDOUT: %a.loc2: i32 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl.loc3: %D.type = class_decl @D [template = constants.%D.1] { -// CHECK:STDOUT: %C.ref.loc3: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref.loc3: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc3: i32 = int_literal 1000 [template = constants.%.3] // CHECK:STDOUT: %C.loc3: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] -// CHECK:STDOUT: %b.loc3_9.1: %C.3 = param b, runtime_param -// CHECK:STDOUT: %b.loc3_9.2: %C.3 = bind_symbolic_name b 0, %b.loc3_9.1 [symbolic = @D.%b (constants.%b)] +// CHECK:STDOUT: %b.param.loc3: %C.3 = param b, runtime_param +// CHECK:STDOUT: %b.loc3: %C.3 = bind_symbolic_name b 0, %b.param.loc3 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl.loc4: %D.type = class_decl @D [template = constants.%D.1] { -// CHECK:STDOUT: %C.ref.loc4: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref.loc4: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc4: i32 = int_literal 1000 [template = constants.%.3] // CHECK:STDOUT: %C.loc4: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] -// CHECK:STDOUT: %b.loc4_9.1: %C.3 = param b, runtime_param -// CHECK:STDOUT: %b.loc4_9.2: %C.3 = bind_symbolic_name b 0, %b.loc4_9.1 [symbolic = constants.%b] +// CHECK:STDOUT: %b.param.loc4: %C.3 = param b, runtime_param +// CHECK:STDOUT: %b.loc4: %C.3 = bind_symbolic_name b 0, %b.param.loc4 [symbolic = constants.%b] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%a.loc2_9.2: i32) { -// CHECK:STDOUT: %a: i32 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @C(%a.loc2: i32) { +// CHECK:STDOUT: %a.1: i32 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -103,8 +103,8 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @D(file.%b.loc3_9.2: %C.3) { -// CHECK:STDOUT: %b: %C.3 = bind_symbolic_name b 0 [symbolic = %b (constants.%b)] +// CHECK:STDOUT: generic class @D(%b.loc3: %C.3) { +// CHECK:STDOUT: %b.1: %C.3 = bind_symbolic_name b 0 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -117,15 +117,15 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%.3) { -// CHECK:STDOUT: %a => constants.%.3 +// CHECK:STDOUT: %a.1 => constants.%.3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @D(constants.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_int_mismatch.carbon @@ -176,27 +176,27 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc2_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc2_13.2: type = converted %int.make_type_32, %.loc2_13.1 [template = i32] -// CHECK:STDOUT: %a.loc2_9.1: i32 = param a, runtime_param -// CHECK:STDOUT: %a.loc2_9.2: i32 = bind_symbolic_name a 0, %a.loc2_9.1 [symbolic = @C.%a (constants.%a)] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param +// CHECK:STDOUT: %a.loc2: i32 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = class_decl @D [template = constants.%D.1] { -// CHECK:STDOUT: %C.ref.loc3: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc3: i32 = int_literal 1000 [template = constants.%.3] -// CHECK:STDOUT: %C.loc3: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] -// CHECK:STDOUT: %b.loc3_9.1: %C.3 = param b, runtime_param -// CHECK:STDOUT: %b.loc3_9.2: %C.3 = bind_symbolic_name b 0, %b.loc3_9.1 [symbolic = @D.%b (constants.%b)] +// CHECK:STDOUT: %C: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] +// CHECK:STDOUT: %b.param: %C.3 = param b, runtime_param +// CHECK:STDOUT: %b.loc3: %C.3 = bind_symbolic_name b 0, %b.param [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = class_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %C.ref.loc10: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc10: i32 = int_literal 1000 [template = constants.%.3] -// CHECK:STDOUT: %C.loc10: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] -// CHECK:STDOUT: %b.loc10_9.1: %C.3 = param b, runtime_param -// CHECK:STDOUT: %b.loc10_9.2: %C.3 = bind_symbolic_name b 0, %b.loc10_9.1 [symbolic = @.1.%b (constants.%b)] +// CHECK:STDOUT: %C: type = class_type @C, @C(constants.%.3) [template = constants.%C.3] +// CHECK:STDOUT: %b.param: %C.3 = param b, runtime_param +// CHECK:STDOUT: %b.loc10: %C.3 = bind_symbolic_name b 0, %b.param [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%a.loc2_9.2: i32) { -// CHECK:STDOUT: %a: i32 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic class @C(%a.loc2: i32) { +// CHECK:STDOUT: %a.1: i32 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -206,14 +206,14 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @D(file.%b.loc3_9.2: %C.3) { -// CHECK:STDOUT: %b: %C.3 = bind_symbolic_name b 0 [symbolic = %b (constants.%b)] +// CHECK:STDOUT: generic class @D(%b.loc3: %C.3) { +// CHECK:STDOUT: %b.1: %C.3 = bind_symbolic_name b 0 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @.1(file.%b.loc10_9.2: %C.3) { -// CHECK:STDOUT: %b: %C.3 = bind_symbolic_name b 0 [symbolic = %b (constants.%b)] +// CHECK:STDOUT: generic class @.1(%b.loc10: %C.3) { +// CHECK:STDOUT: %b.1: %C.3 = bind_symbolic_name b 0 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -226,18 +226,18 @@ class D(b:! C(1_000)) {} // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%.3) { -// CHECK:STDOUT: %a => constants.%.3 +// CHECK:STDOUT: %a.1 => constants.%.3 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @D(constants.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/basic.carbon b/toolchain/check/testdata/const/basic.carbon index 396fc8f054baf..87d42fe202989 100644 --- a/toolchain/check/testdata/const/basic.carbon +++ b/toolchain/check/testdata/const/basic.carbon @@ -62,15 +62,15 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: %.loc11_9.3: type = const_type i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_18: type = ptr_type %.2 [template = constants.%.3] // CHECK:STDOUT: %.loc11_19: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: %p.loc11_6.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @A.%p: %.4 = bind_name p, %p.loc11_6.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc11_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_25.1: type = value_of_initializer %int.make_type_32.loc11_31 [template = i32] // CHECK:STDOUT: %.loc11_25.2: type = converted %int.make_type_32.loc11_31, %.loc11_25.1 [template = i32] // CHECK:STDOUT: %.loc11_25.3: type = const_type i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_34: type = ptr_type %.2 [template = constants.%.3] // CHECK:STDOUT: %.loc11_35: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: @A.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { // CHECK:STDOUT: %int.make_type_32.loc15_16: init type = call constants.%Int32() [template = i32] @@ -78,14 +78,14 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: %.loc15_19.2: type = converted %int.make_type_32.loc15_16, %.loc15_19.1 [template = i32] // CHECK:STDOUT: %.loc15_19.3: type = ptr_type i32 [template = constants.%.5] // CHECK:STDOUT: %.loc15_9: type = const_type %.5 [template = constants.%.6] -// CHECK:STDOUT: %p.loc15_6.1: %.6 = param p, runtime_param0 -// CHECK:STDOUT: @B.%p: %.6 = bind_name p, %p.loc15_6.1 +// CHECK:STDOUT: %p.param: %.6 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.6 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc15_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_36.1: type = value_of_initializer %int.make_type_32.loc15_33 [template = i32] // CHECK:STDOUT: %.loc15_36.2: type = converted %int.make_type_32.loc15_33, %.loc15_36.1 [template = i32] // CHECK:STDOUT: %.loc15_36.3: type = ptr_type i32 [template = constants.%.5] // CHECK:STDOUT: %.loc15_26: type = const_type %.5 [template = constants.%.6] -// CHECK:STDOUT: @B.%return: ref %.6 = var +// CHECK:STDOUT: %return: ref %.6 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 40c48c50405b4..4b4a132eb766f 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -57,8 +57,8 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: %.loc15_9.3: type = const_type i32 [template = constants.%.2] // CHECK:STDOUT: %.loc15_18: type = ptr_type %.2 [template = constants.%.3] // CHECK:STDOUT: %.loc15_19: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: %p.loc15_6.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @F.%p: %.4 = bind_name p, %p.loc15_6.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc15_38: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_32.1: type = value_of_initializer %int.make_type_32.loc15_38 [template = i32] // CHECK:STDOUT: %.loc15_32.2: type = converted %int.make_type_32.loc15_38, %.loc15_32.1 [template = i32] @@ -66,7 +66,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: %.loc15_25: type = const_type %.2 [template = constants.%.2] // CHECK:STDOUT: %.loc15_42: type = ptr_type %.2 [template = constants.%.3] // CHECK:STDOUT: %.loc15_43: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: @F.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index b32d71502c0ee..3a4fd7215cf75 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -89,14 +89,14 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: %.loc15_9: type = const_type %.2 [template = constants.%.2] // CHECK:STDOUT: %.loc15_26: type = ptr_type %.2 [template = constants.%.3] // CHECK:STDOUT: %.loc15_27: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: %p.loc15_6.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @G.%p: %.4 = bind_name p, %p.loc15_6.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc15_33: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_36.1: type = value_of_initializer %int.make_type_32.loc15_33 [template = i32] // CHECK:STDOUT: %.loc15_36.2: type = converted %int.make_type_32.loc15_33, %.loc15_36.1 [template = i32] // CHECK:STDOUT: %.loc15_36.3: type = ptr_type i32 [template = constants.%.5] // CHECK:STDOUT: %.loc15_37: type = ptr_type %.5 [template = constants.%.6] -// CHECK:STDOUT: @G.%return: ref %.6 = var +// CHECK:STDOUT: %return: ref %.6 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index 4b515d5dea225..a40a03e160218 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -62,11 +62,11 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32.loc4, %.loc4_11.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_11.2: type = converted %int.make_type_32, %.loc4_11.1 [template = i32] // CHECK:STDOUT: %.loc4_11.3: type = const_type i32 [template = constants.%.2] -// CHECK:STDOUT: @F.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_12.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] diff --git a/toolchain/check/testdata/eval/fail_symbolic.carbon b/toolchain/check/testdata/eval/fail_symbolic.carbon index a2df9f5f1280b..a6752e5c72af6 100644 --- a/toolchain/check/testdata/eval/fail_symbolic.carbon +++ b/toolchain/check/testdata/eval/fail_symbolic.carbon @@ -49,11 +49,11 @@ fn G(N:! i32) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32, %.loc12_10.1 [template = i32] -// CHECK:STDOUT: %N.loc12_6.1: i32 = param N, runtime_param -// CHECK:STDOUT: @G.%N.loc12: i32 = bind_symbolic_name N 0, %N.loc12_6.1 [symbolic = @G.%N.1 (constants.%N)] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32.loc12, %.loc12_10.1 [template = i32] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc12: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -66,10 +66,10 @@ fn G(N:! i32) { // CHECK:STDOUT: // CHECK:STDOUT: fn(%N.loc12: i32) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %N.ref: i32 = name_ref N, %N.loc12 [symbolic = %N.1 (constants.%N)] -// CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc16_11.2: type = converted %int.make_type_32, %.loc16_11.1 [template = i32] +// CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] +// CHECK:STDOUT: %.loc16_11.2: type = converted %int.make_type_32.loc16, %.loc16_11.1 [template = i32] // CHECK:STDOUT: %.loc16_17: type = array_type %N.ref, i32 [template = ] // CHECK:STDOUT: %k.var: ref = var k // CHECK:STDOUT: %k: ref = bind_name k, %k.var diff --git a/toolchain/check/testdata/eval/symbolic.carbon b/toolchain/check/testdata/eval/symbolic.carbon index 5a2a2f2d356da..ebb9cccc0f64e 100644 --- a/toolchain/check/testdata/eval/symbolic.carbon +++ b/toolchain/check/testdata/eval/symbolic.carbon @@ -54,8 +54,8 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc12_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc12: type = bind_symbolic_name T 0, %T.loc12_6.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 b3f94eb3b7950..084fa12f783af 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -70,7 +70,7 @@ fn H() -> i32 { // CHECK:STDOUT: %.loc11_20.4: type = value_of_initializer %int.make_type_32.loc11_17 [template = i32] // CHECK:STDOUT: %.loc11_20.5: type = converted %int.make_type_32.loc11_17, %.loc11_20.4 [template = i32] // CHECK:STDOUT: %.loc11_20.6: type = converted %.loc11_20.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %int.make_type_32.loc13_12: init type = call constants.%Int32() [template = i32] @@ -81,13 +81,13 @@ fn H() -> i32 { // CHECK:STDOUT: %.loc13_20.4: type = value_of_initializer %int.make_type_32.loc13_17 [template = i32] // CHECK:STDOUT: %.loc13_20.5: type = converted %int.make_type_32.loc13_17, %.loc13_20.4 [template = i32] // CHECK:STDOUT: %.loc13_20.6: type = converted %.loc13_20.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @G.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { -// CHECK:STDOUT: %int.make_type_32.loc19: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc19_11.1: type = value_of_initializer %int.make_type_32.loc19 [template = i32] -// CHECK:STDOUT: %.loc19_11.2: type = converted %int.make_type_32.loc19, %.loc19_11.1 [template = i32] -// CHECK:STDOUT: @H.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc19_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc19_11.2: type = converted %int.make_type_32, %.loc19_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -117,8 +117,8 @@ fn H() -> i32 { // CHECK:STDOUT: %F.call.loc15: init %.3 = call %F.ref.loc15() to %.loc15 // CHECK:STDOUT: assign %v.ref, %F.call.loc15 // CHECK:STDOUT: %F.ref.loc16: %F.type = name_ref F, file.%F.decl [template = constants.%F] -// CHECK:STDOUT: %.loc13: ref %.3 = splice_block %return {} -// CHECK:STDOUT: %F.call.loc16: init %.3 = call %F.ref.loc16() to %.loc13 +// CHECK:STDOUT: %.loc13_8: ref %.3 = splice_block %return {} +// CHECK:STDOUT: %F.call.loc16: init %.3 = call %F.ref.loc16() to %.loc13_8 // CHECK:STDOUT: return %F.call.loc16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/builtin/call.carbon b/toolchain/check/testdata/function/builtin/call.carbon index b1ceed45d575c..7036b20035ae8 100644 --- a/toolchain/check/testdata/function/builtin/call.carbon +++ b/toolchain/check/testdata/function/builtin/call.carbon @@ -53,25 +53,25 @@ var arr: [i32; Add(1, 2)]; // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc11_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_27.1: type = value_of_initializer %int.make_type_32.loc11_27 [template = i32] // CHECK:STDOUT: %.loc11_27.2: type = converted %int.make_type_32.loc11_27, %.loc11_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, %Add.decl [template = constants.%Add] // CHECK:STDOUT: %.loc13_20: i32 = int_literal 1 [template = constants.%.2] // CHECK:STDOUT: %.loc13_23: i32 = int_literal 2 [template = constants.%.3] // CHECK:STDOUT: %int.sadd: init i32 = call %Add.ref(%.loc13_20, %.loc13_23) [template = constants.%.4] -// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32.loc13, %.loc13_11.1 [template = i32] +// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32, %.loc13_11.1 [template = i32] // CHECK:STDOUT: %.loc13_25: type = array_type %int.sadd, i32 [template = constants.%.5] // CHECK:STDOUT: %arr.var: ref %.5 = var arr // CHECK:STDOUT: %arr: ref %.5 = bind_name arr, %arr.var diff --git a/toolchain/check/testdata/function/builtin/definition.carbon b/toolchain/check/testdata/function/builtin/definition.carbon index 211afc44f6b7c..1dc3ed2d60081 100644 --- a/toolchain/check/testdata/function/builtin/definition.carbon +++ b/toolchain/check/testdata/function/builtin/definition.carbon @@ -45,17 +45,17 @@ fn Add(a: i32, b: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Add.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Add.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc11_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_27.1: type = value_of_initializer %int.make_type_32.loc11_27 [template = i32] // CHECK:STDOUT: %.loc11_27.2: type = converted %int.make_type_32.loc11_27, %.loc11_27.1 [template = i32] -// CHECK:STDOUT: @Add.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/builtin/fail_redefined.carbon b/toolchain/check/testdata/function/builtin/fail_redefined.carbon index 75a16c7408d3d..0b0bf519e99b9 100644 --- a/toolchain/check/testdata/function/builtin/fail_redefined.carbon +++ b/toolchain/check/testdata/function/builtin/fail_redefined.carbon @@ -78,13 +78,13 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %int.make_type_32.loc11_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32.loc11_9 [template = i32] // CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32.loc11_9, %.loc11_9.1 [template = i32] -// CHECK:STDOUT: %n.loc11_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: %n.loc11_6.2: i32 = bind_name n, %n.loc11_6.1 +// CHECK:STDOUT: %n.param.loc11: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc11: i32 = bind_name n, %n.param.loc11 // CHECK:STDOUT: %int.make_type_32.loc11_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_17.1: type = value_of_initializer %int.make_type_32.loc11_17 [template = i32] // CHECK:STDOUT: %.loc11_17.2: type = converted %int.make_type_32.loc11_17, %.loc11_17.1 [template = i32] -// CHECK:STDOUT: %m.loc11_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: %m.loc11_14.2: i32 = bind_name m, %m.loc11_14.1 +// CHECK:STDOUT: %m.param.loc11: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc11: i32 = bind_name m, %m.param.loc11 // CHECK:STDOUT: %int.make_type_32.loc11_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_25.1: type = value_of_initializer %int.make_type_32.loc11_25 [template = i32] // CHECK:STDOUT: %.loc11_25.2: type = converted %int.make_type_32.loc11_25, %.loc11_25.1 [template = i32] @@ -94,29 +94,29 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %int.make_type_32.loc19_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_9.1: type = value_of_initializer %int.make_type_32.loc19_9 [template = i32] // CHECK:STDOUT: %.loc19_9.2: type = converted %int.make_type_32.loc19_9, %.loc19_9.1 [template = i32] -// CHECK:STDOUT: %n.loc19_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @A.%n: i32 = bind_name n, %n.loc19_6.1 +// CHECK:STDOUT: %n.param.loc19: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc19: i32 = bind_name n, %n.param.loc19 // CHECK:STDOUT: %int.make_type_32.loc19_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_17.1: type = value_of_initializer %int.make_type_32.loc19_17 [template = i32] // CHECK:STDOUT: %.loc19_17.2: type = converted %int.make_type_32.loc19_17, %.loc19_17.1 [template = i32] -// CHECK:STDOUT: %m.loc19_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: @A.%m: i32 = bind_name m, %m.loc19_14.1 +// CHECK:STDOUT: %m.param.loc19: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc19: i32 = bind_name m, %m.param.loc19 // CHECK:STDOUT: %int.make_type_32.loc19_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_25.1: type = value_of_initializer %int.make_type_32.loc19_25 [template = i32] // CHECK:STDOUT: %.loc19_25.2: type = converted %int.make_type_32.loc19_25, %.loc19_25.1 [template = i32] -// CHECK:STDOUT: @A.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl.loc21: %B.type = fn_decl @B [template = constants.%B] { // CHECK:STDOUT: %int.make_type_32.loc21_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_9.1: type = value_of_initializer %int.make_type_32.loc21_9 [template = i32] // CHECK:STDOUT: %.loc21_9.2: type = converted %int.make_type_32.loc21_9, %.loc21_9.1 [template = i32] -// CHECK:STDOUT: %n.loc21_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: %n.loc21_6.2: i32 = bind_name n, %n.loc21_6.1 +// CHECK:STDOUT: %n.param.loc21: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc21: i32 = bind_name n, %n.param.loc21 // CHECK:STDOUT: %int.make_type_32.loc21_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_17.1: type = value_of_initializer %int.make_type_32.loc21_17 [template = i32] // CHECK:STDOUT: %.loc21_17.2: type = converted %int.make_type_32.loc21_17, %.loc21_17.1 [template = i32] -// CHECK:STDOUT: %m.loc21_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: %m.loc21_14.2: i32 = bind_name m, %m.loc21_14.1 +// CHECK:STDOUT: %m.param.loc21: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc21: i32 = bind_name m, %m.param.loc21 // CHECK:STDOUT: %int.make_type_32.loc21_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_25.1: type = value_of_initializer %int.make_type_32.loc21_25 [template = i32] // CHECK:STDOUT: %.loc21_25.2: type = converted %int.make_type_32.loc21_25, %.loc21_25.1 [template = i32] @@ -126,29 +126,29 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %int.make_type_32.loc29_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc29_9.1: type = value_of_initializer %int.make_type_32.loc29_9 [template = i32] // CHECK:STDOUT: %.loc29_9.2: type = converted %int.make_type_32.loc29_9, %.loc29_9.1 [template = i32] -// CHECK:STDOUT: %n.loc29_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @B.%n: i32 = bind_name n, %n.loc29_6.1 +// CHECK:STDOUT: %n.param.loc29: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc29: i32 = bind_name n, %n.param.loc29 // CHECK:STDOUT: %int.make_type_32.loc29_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc29_17.1: type = value_of_initializer %int.make_type_32.loc29_17 [template = i32] // CHECK:STDOUT: %.loc29_17.2: type = converted %int.make_type_32.loc29_17, %.loc29_17.1 [template = i32] -// CHECK:STDOUT: %m.loc29_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: @B.%m: i32 = bind_name m, %m.loc29_14.1 +// CHECK:STDOUT: %m.param.loc29: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc29: i32 = bind_name m, %m.param.loc29 // CHECK:STDOUT: %int.make_type_32.loc29_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc29_25.1: type = value_of_initializer %int.make_type_32.loc29_25 [template = i32] // CHECK:STDOUT: %.loc29_25.2: type = converted %int.make_type_32.loc29_25, %.loc29_25.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl.loc31: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc31_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_9.1: type = value_of_initializer %int.make_type_32.loc31_9 [template = i32] // CHECK:STDOUT: %.loc31_9.2: type = converted %int.make_type_32.loc31_9, %.loc31_9.1 [template = i32] -// CHECK:STDOUT: %n.loc31_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: %n.loc31_6.2: i32 = bind_name n, %n.loc31_6.1 +// CHECK:STDOUT: %n.param.loc31: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc31: i32 = bind_name n, %n.param.loc31 // CHECK:STDOUT: %int.make_type_32.loc31_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_17.1: type = value_of_initializer %int.make_type_32.loc31_17 [template = i32] // CHECK:STDOUT: %.loc31_17.2: type = converted %int.make_type_32.loc31_17, %.loc31_17.1 [template = i32] -// CHECK:STDOUT: %m.loc31_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: %m.loc31_14.2: i32 = bind_name m, %m.loc31_14.1 +// CHECK:STDOUT: %m.param.loc31: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc31: i32 = bind_name m, %m.param.loc31 // CHECK:STDOUT: %int.make_type_32.loc31_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_25.1: type = value_of_initializer %int.make_type_32.loc31_25 [template = i32] // CHECK:STDOUT: %.loc31_25.2: type = converted %int.make_type_32.loc31_25, %.loc31_25.1 [template = i32] @@ -158,33 +158,33 @@ fn C(n: i32, m: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: %int.make_type_32.loc38_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc38_9.1: type = value_of_initializer %int.make_type_32.loc38_9 [template = i32] // CHECK:STDOUT: %.loc38_9.2: type = converted %int.make_type_32.loc38_9, %.loc38_9.1 [template = i32] -// CHECK:STDOUT: %n.loc38_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @C.%n: i32 = bind_name n, %n.loc38_6.1 +// CHECK:STDOUT: %n.param.loc38: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc38: i32 = bind_name n, %n.param.loc38 // CHECK:STDOUT: %int.make_type_32.loc38_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc38_17.1: type = value_of_initializer %int.make_type_32.loc38_17 [template = i32] // CHECK:STDOUT: %.loc38_17.2: type = converted %int.make_type_32.loc38_17, %.loc38_17.1 [template = i32] -// CHECK:STDOUT: %m.loc38_14.1: i32 = param m, runtime_param1 -// CHECK:STDOUT: @C.%m: i32 = bind_name m, %m.loc38_14.1 +// CHECK:STDOUT: %m.param.loc38: i32 = param m, runtime_param1 +// CHECK:STDOUT: %m.loc38: i32 = bind_name m, %m.param.loc38 // CHECK:STDOUT: %int.make_type_32.loc38_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc38_25.1: type = value_of_initializer %int.make_type_32.loc38_25 [template = i32] // CHECK:STDOUT: %.loc38_25.2: type = converted %int.make_type_32.loc38_25, %.loc38_25.1 [template = i32] -// CHECK:STDOUT: @C.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @A(%n: i32, %m: i32) -> i32 = "int.sadd" { +// CHECK:STDOUT: fn @A(%n.loc19: i32, %m.loc19: i32) -> i32 = "int.sadd" { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n +// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n.loc19 // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @B(%n: i32, %m: i32) -> i32 = "int.sadd" { +// CHECK:STDOUT: fn @B(%n.loc29: i32, %m.loc29: i32) -> i32 = "int.sadd" { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.ref: i32 = name_ref n, file.%n.loc21_6.2 +// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n.loc21 // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @C(%n: i32, %m: i32) -> i32 = "int.sadd"; +// CHECK:STDOUT: fn @C(%n.loc38: i32, %m.loc38: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/builtin/method.carbon b/toolchain/check/testdata/function/builtin/method.carbon index b2529e62e2bd8..7efb4f01e4c23 100644 --- a/toolchain/check/testdata/function/builtin/method.carbon +++ b/toolchain/check/testdata/function/builtin/method.carbon @@ -65,21 +65,21 @@ var arr: [i32; 1.(I.F)(2)]; // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %I.decl: type = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32.loc15, %.loc15_6.1 [template = i32] -// CHECK:STDOUT: %I.ref.loc15: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32, %.loc15_6.1 [template = i32] +// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc19: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_16: i32 = int_literal 1 [template = constants.%.6] -// CHECK:STDOUT: %I.ref.loc19: type = name_ref I, %I.decl [template = constants.%.1] -// CHECK:STDOUT: %F.ref: %.3 = name_ref F, @I.%.loc12_40 [template = constants.%.4] -// CHECK:STDOUT: %.loc19_17.1: %F.type.1 = interface_witness_access @impl.%.loc15, element0 [template = constants.%F.2] +// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %F.ref: %.3 = name_ref F, @I.%.loc12 [template = constants.%.4] +// CHECK:STDOUT: %.loc19_17.1: %F.type.1 = interface_witness_access @impl.%.loc15_15, element0 [template = constants.%F.2] // CHECK:STDOUT: %.loc19_17.2: = bound_method %.loc19_16, %.loc19_17.1 [template = constants.%.7] // CHECK:STDOUT: %.loc19_24: i32 = int_literal 2 [template = constants.%.8] // CHECK:STDOUT: %int.sadd: init i32 = call %.loc19_17.2(%.loc19_16, %.loc19_24) [template = constants.%.9] -// CHECK:STDOUT: %.loc19_11.1: type = value_of_initializer %int.make_type_32.loc19 [template = i32] -// CHECK:STDOUT: %.loc19_11.2: type = converted %int.make_type_32.loc19, %.loc19_11.1 [template = i32] +// CHECK:STDOUT: %.loc19_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc19_11.2: type = converted %int.make_type_32, %.loc19_11.1 [template = i32] // CHECK:STDOUT: %.loc19_26: type = array_type %int.sadd, i32 [template = constants.%.10] // CHECK:STDOUT: %arr.var: ref %.10 = var arr // CHECK:STDOUT: %arr: ref %.10 = bind_name arr, %arr.var @@ -88,26 +88,26 @@ var arr: [i32; 1.(I.F)(2)]; // CHECK:STDOUT: interface @I { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { -// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc12_8.1: @F.1.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: @F.1.%Self (%Self) = bind_name self, %self.loc12_8.1 -// CHECK:STDOUT: %Self.ref.loc12_27: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_27.1: type = facet_type_access %Self.ref.loc12_27 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_27.2: type = converted %Self.ref.loc12_27, %.loc12_27.1 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %other.loc12_20.1: @F.1.%Self (%Self) = param other, runtime_param1 -// CHECK:STDOUT: %other.loc12_20.2: @F.1.%Self (%Self) = bind_name other, %other.loc12_20.1 -// CHECK:STDOUT: %Self.ref.loc12_36: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_36.1: type = facet_type_access %Self.ref.loc12_36 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_36.2: type = converted %Self.ref.loc12_36, %.loc12_36.1 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @F.1.%Self (%Self) = var +// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @F.1.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.1.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %Self.ref.loc12_27: %.1 = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_27.1: type = facet_type_access %Self.ref.loc12_27 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_27.2: type = converted %Self.ref.loc12_27, %.loc12_27.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %other.param: @F.1.%Self (%Self) = param other, runtime_param1 +// CHECK:STDOUT: %other: @F.1.%Self (%Self) = bind_name other, %other.param +// CHECK:STDOUT: %Self.ref.loc12_36: %.1 = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_36.1: type = facet_type_access %Self.ref.loc12_36 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_36.2: type = converted %Self.ref.loc12_36, %.loc12_36.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @F.1.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12_40: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc12_40 +// CHECK:STDOUT: .F = %.loc12 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -116,34 +116,34 @@ var arr: [i32; 1.(I.F)(2)]; // CHECK:STDOUT: %int.make_type_32.loc16_14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_14.1: type = value_of_initializer %int.make_type_32.loc16_14 [template = i32] // CHECK:STDOUT: %.loc16_14.2: type = converted %int.make_type_32.loc16_14, %.loc16_14.1 [template = i32] -// CHECK:STDOUT: %self.loc16_8.1: i32 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc16_8.2: i32 = bind_name self, %self.loc16_8.1 +// CHECK:STDOUT: %self.param: i32 = param self, runtime_param0 +// CHECK:STDOUT: %self: i32 = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32.loc16_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_26.1: type = value_of_initializer %int.make_type_32.loc16_26 [template = i32] // CHECK:STDOUT: %.loc16_26.2: type = converted %int.make_type_32.loc16_26, %.loc16_26.1 [template = i32] -// CHECK:STDOUT: %other.loc16_19.1: i32 = param other, runtime_param1 -// CHECK:STDOUT: %other.loc16_19.2: i32 = bind_name other, %other.loc16_19.1 +// CHECK:STDOUT: %other.param: i32 = param other, runtime_param1 +// CHECK:STDOUT: %other: i32 = bind_name other, %other.param // CHECK:STDOUT: %int.make_type_32.loc16_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_34.1: type = value_of_initializer %int.make_type_32.loc16_34 [template = i32] // CHECK:STDOUT: %.loc16_34.2: type = converted %int.make_type_32.loc16_34, %.loc16_34.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = interface_witness (%F.decl) [template = constants.%.5] +// CHECK:STDOUT: %.loc15_15: = interface_witness (%F.decl) [template = constants.%.5] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_15 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@I.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@I.%self.loc12_8.2: @F.1.%Self (%Self)](@I.%other.loc12_20.2: @F.1.%Self (%Self)) -> @F.1.%Self (%Self); +// CHECK:STDOUT: fn[%self: @F.1.%Self (%Self)](%other: @F.1.%Self (%Self)) -> @F.1.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[@impl.%self.loc16_8.2: i32](@impl.%other.loc16_19.2: i32) -> i32 = "int.sadd"; +// CHECK:STDOUT: fn @F.2[%self: i32](%other: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: // CHECK:STDOUT: specific @F.1(constants.%Self) { // CHECK:STDOUT: %Self => constants.%Self 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 adbb072fb2ba7..56555148879ec 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 @@ -50,7 +50,7 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: .Add = %Add.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { -// CHECK:STDOUT: @Int32.%return: ref type = var +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: %Add.decl: type = interface_decl @Add [template = constants.%.2] {} // CHECK:STDOUT: } @@ -58,26 +58,26 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: interface @Add { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %Op.decl: %Op.type = fn_decl @Op [template = constants.%Op] { -// CHECK:STDOUT: %Self.ref.loc7_15: %.2 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_15.1: type = facet_type_access %Self.ref.loc7_15 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_15.2: type = converted %Self.ref.loc7_15, %.loc7_15.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc7_9.1: @Op.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_9.2: @Op.%Self (%Self) = bind_name self, %self.loc7_9.1 -// CHECK:STDOUT: %Self.ref.loc7_28: %.2 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_28.1: type = facet_type_access %Self.ref.loc7_28 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_28.2: type = converted %Self.ref.loc7_28, %.loc7_28.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %other.loc7_21.1: @Op.%Self (%Self) = param other, runtime_param1 -// CHECK:STDOUT: %other.loc7_21.2: @Op.%Self (%Self) = bind_name other, %other.loc7_21.1 -// CHECK:STDOUT: %Self.ref.loc7_37: %.2 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_37.1: type = facet_type_access %Self.ref.loc7_37 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc7_37.2: type = converted %Self.ref.loc7_37, %.loc7_37.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @Op.%Self (%Self) = var +// CHECK:STDOUT: %Self.ref.loc7_15: %.2 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_15.1: type = facet_type_access %Self.ref.loc7_15 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_15.2: type = converted %Self.ref.loc7_15, %.loc7_15.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @Op.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @Op.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %Self.ref.loc7_28: %.2 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_28.1: type = facet_type_access %Self.ref.loc7_28 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_28.2: type = converted %Self.ref.loc7_28, %.loc7_28.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %other.param: @Op.%Self (%Self) = param other, runtime_param1 +// CHECK:STDOUT: %other: @Op.%Self (%Self) = bind_name other, %other.param +// CHECK:STDOUT: %Self.ref.loc7_37: %.2 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_37.1: type = facet_type_access %Self.ref.loc7_37 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc7_37.2: type = converted %Self.ref.loc7_37, %.loc7_37.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @Op.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc7_41: %.3 = assoc_entity element0, %Op.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc7: %.3 = assoc_entity element0, %Op.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .Op = %.loc7_41 +// CHECK:STDOUT: .Op = %.loc7 // CHECK:STDOUT: witness = (%Op.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -86,7 +86,7 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: generic fn @Op(@Add.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Add.%self.loc7_9.2: @Op.%Self (%Self)](@Add.%other.loc7_21.2: @Op.%Self (%Self)) -> @Op.%Self (%Self); +// CHECK:STDOUT: fn[%self: @Op.%Self (%Self)](%other: @Op.%Self (%Self)) -> @Op.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Op(constants.%Self) { @@ -143,21 +143,21 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_6.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] -// CHECK:STDOUT: %.loc6_6.2: type = converted %int.make_type_32.loc6, %.loc6_6.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc6_6.2: type = converted %int.make_type_32, %.loc6_6.1 [template = i32] // CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] // CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.2 [template = constants.%.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc10: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc10_16: i32 = int_literal 1 [template = constants.%.4] // CHECK:STDOUT: %.loc10_20: i32 = int_literal 2 [template = constants.%.5] // CHECK:STDOUT: %Op.ref: %.6 = name_ref Op, imports.%import_ref.4 [template = constants.%.7] -// CHECK:STDOUT: %.loc10_18.1: %Op.type.2 = interface_witness_access @impl.%.loc6, element0 [template = constants.%Op.1] +// CHECK:STDOUT: %.loc10_18.1: %Op.type.2 = interface_witness_access @impl.%.loc6_22, element0 [template = constants.%Op.1] // CHECK:STDOUT: %.loc10_18.2: = bound_method %.loc10_16, %.loc10_18.1 [template = constants.%.8] // CHECK:STDOUT: %int.sadd: init i32 = call %.loc10_18.2(%.loc10_16, %.loc10_20) [template = constants.%.9] -// CHECK:STDOUT: %.loc10_11.1: type = value_of_initializer %int.make_type_32.loc10 [template = i32] -// CHECK:STDOUT: %.loc10_11.2: type = converted %int.make_type_32.loc10, %.loc10_11.1 [template = i32] +// CHECK:STDOUT: %.loc10_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc10_11.2: type = converted %int.make_type_32, %.loc10_11.1 [template = i32] // CHECK:STDOUT: %.loc10_21: type = array_type %int.sadd, i32 [template = constants.%.10] // CHECK:STDOUT: %arr.var: ref %.10 = var arr // CHECK:STDOUT: %arr: ref %.10 = bind_name arr, %arr.var @@ -173,24 +173,24 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: impl @impl: i32 as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %Self.ref.loc7_15: type = name_ref Self, i32 [template = i32] -// CHECK:STDOUT: %self.loc7_9.1: i32 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_9.2: i32 = bind_name self, %self.loc7_9.1 +// CHECK:STDOUT: %self.param: i32 = param self, runtime_param0 +// CHECK:STDOUT: %self: i32 = bind_name self, %self.param // CHECK:STDOUT: %Self.ref.loc7_28: type = name_ref Self, i32 [template = i32] -// CHECK:STDOUT: %other.loc7_21.1: i32 = param other, runtime_param1 -// CHECK:STDOUT: %other.loc7_21.2: i32 = bind_name other, %other.loc7_21.1 +// CHECK:STDOUT: %other.param: i32 = param other, runtime_param1 +// CHECK:STDOUT: %other: i32 = bind_name other, %other.param // CHECK:STDOUT: %Self.ref.loc7_37: type = name_ref Self, i32 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc6: = interface_witness (%Op.decl) [template = constants.%.3] +// CHECK:STDOUT: %.loc6_22: = interface_witness (%Op.decl) [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Op = %Op.decl -// CHECK:STDOUT: witness = %.loc6 +// CHECK:STDOUT: witness = %.loc6_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.%self.loc7_9.2: i32](@impl.%other.loc7_21.2: i32) -> i32 = "int.sadd"; +// CHECK:STDOUT: fn @Op.1[%self: i32](%other: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] @@ -205,7 +205,7 @@ var arr: [i32; 1 + 2] = (3, 4, 3 + 4); // CHECK:STDOUT: %.loc10_32: i32 = int_literal 3 [template = constants.%.9] // CHECK:STDOUT: %.loc10_36: i32 = int_literal 4 [template = constants.%.12] // CHECK:STDOUT: %Op.ref: %.6 = name_ref Op, imports.%import_ref.4 [template = constants.%.7] -// CHECK:STDOUT: %.loc10_34.1: %Op.type.2 = interface_witness_access @impl.%.loc6, element0 [template = constants.%Op.1] +// CHECK:STDOUT: %.loc10_34.1: %Op.type.2 = interface_witness_access @impl.%.loc6_22, element0 [template = constants.%Op.1] // CHECK:STDOUT: %.loc10_34.2: = bound_method %.loc10_32, %.loc10_34.1 [template = constants.%.13] // CHECK:STDOUT: %int.sadd: init i32 = call %.loc10_34.2(%.loc10_32, %.loc10_36) [template = constants.%.14] // CHECK:STDOUT: %.loc10_37.1: %.15 = tuple_literal (%.loc10_26, %.loc10_29, %int.sadd) diff --git a/toolchain/check/testdata/function/builtin/no_prelude/import.carbon b/toolchain/check/testdata/function/builtin/no_prelude/import.carbon index 827dfd83ead61..0320251878b86 100644 --- a/toolchain/check/testdata/function/builtin/no_prelude/import.carbon +++ b/toolchain/check/testdata/function/builtin/no_prelude/import.carbon @@ -37,23 +37,23 @@ var arr: [i32; Core.TestAdd(1, 2)] = (1, 2, 3); // CHECK:STDOUT: .TestAdd = %TestAdd.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { -// CHECK:STDOUT: @Int32.%return: ref type = var +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAdd.decl: %TestAdd.type = fn_decl @TestAdd [template = constants.%TestAdd] { // CHECK:STDOUT: %int.make_type_32.loc5_15: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_15.1: type = value_of_initializer %int.make_type_32.loc5_15 [template = i32] // CHECK:STDOUT: %.loc5_15.2: type = converted %int.make_type_32.loc5_15, %.loc5_15.1 [template = i32] -// CHECK:STDOUT: %a.loc5_12.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @TestAdd.%a: i32 = bind_name a, %a.loc5_12.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc5_23: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_23.1: type = value_of_initializer %int.make_type_32.loc5_23 [template = i32] // CHECK:STDOUT: %.loc5_23.2: type = converted %int.make_type_32.loc5_23, %.loc5_23.1 [template = i32] -// CHECK:STDOUT: %b.loc5_20.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @TestAdd.%b: i32 = bind_name b, %b.loc5_20.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_31: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_31.1: type = value_of_initializer %int.make_type_32.loc5_31 [template = i32] // CHECK:STDOUT: %.loc5_31.2: type = converted %int.make_type_32.loc5_31, %.loc5_31.1 [template = i32] -// CHECK:STDOUT: @TestAdd.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 0e9110926b36f..98c5ec182d65f 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -108,23 +108,23 @@ fn Main() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Run0.decl: %Run0.type = fn_decl @Run0 [template = constants.%Run0] {} // CHECK:STDOUT: %Run1.decl: %Run1.type = fn_decl @Run1 [template = constants.%Run1] { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_12.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_12.2: type = converted %int.make_type_32.loc12, %.loc12_12.1 [template = i32] -// CHECK:STDOUT: %a.loc12_9.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Run1.%a: i32 = bind_name a, %a.loc12_9.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_12.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_12.2: type = converted %int.make_type_32, %.loc12_12.1 [template = i32] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Run2.decl: %Run2.type = fn_decl @Run2 [template = constants.%Run2] { // CHECK:STDOUT: %int.make_type_32.loc13_12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_12.1: type = value_of_initializer %int.make_type_32.loc13_12 [template = i32] // CHECK:STDOUT: %.loc13_12.2: type = converted %int.make_type_32.loc13_12, %.loc13_12.1 [template = i32] -// CHECK:STDOUT: %a.loc13_9.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Run2.%a: i32 = bind_name a, %a.loc13_9.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_20: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_20.1: type = value_of_initializer %int.make_type_32.loc13_20 [template = i32] // CHECK:STDOUT: %.loc13_20.2: type = converted %int.make_type_32.loc13_20, %.loc13_20.1 [template = i32] -// CHECK:STDOUT: %b.loc13_17.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Run2.%b: i32 = bind_name b, %b.loc13_17.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 aa4f5f21ba542..9585f2123712a 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -85,8 +85,8 @@ fn F() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32, %.loc11_9.1 [template = i32] -// CHECK:STDOUT: %a.loc11_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @G.%a: i32 = bind_name a, %a.loc11_6.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} // 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 2efef06a47afc..5553181690df8 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -88,7 +88,7 @@ fn Run() { // CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc11_13.1) [template = f64] // CHECK:STDOUT: %.loc11_13.2: type = value_of_initializer %float.make_type [template = f64] // CHECK:STDOUT: %.loc11_13.3: type = converted %float.make_type, %.loc11_13.2 [template = f64] -// CHECK:STDOUT: @Foo.%return: ref f64 = var +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] {} // CHECK:STDOUT: } @@ -116,8 +116,8 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() -> f64 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: f64 = float_literal 1 [template = constants.%.3] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_26: f64 = float_literal 1 [template = constants.%.3] +// CHECK:STDOUT: return %.loc11_26 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 6dccbd5c190a7..1e1487fbb954c 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -55,12 +55,12 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32.loc11_12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32.loc11_12 [template = i32] // CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32.loc11_12, %.loc11_12.1 [template = i32] -// CHECK:STDOUT: %a.loc11_9.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Echo.%a: i32 = bind_name a, %a.loc11_9.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_20: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_20.1: type = value_of_initializer %int.make_type_32.loc11_20 [template = i32] // CHECK:STDOUT: %.loc11_20.2: type = converted %int.make_type_32.loc11_20, %.loc11_20.1 [template = i32] -// CHECK:STDOUT: @Echo.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 2f6cf74db686e..a822a177c8b37 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -60,13 +60,13 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/no_prelude/alias.carbon b/toolchain/check/testdata/function/call/no_prelude/alias.carbon index 17513298f59f5..d0959b7387891 100644 --- a/toolchain/check/testdata/function/call/no_prelude/alias.carbon +++ b/toolchain/check/testdata/function/call/no_prelude/alias.carbon @@ -36,7 +36,7 @@ fn Main() { // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { // CHECK:STDOUT: %.loc11_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc11_12.2: type = converted %.loc11_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @A.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %A.ref: %A.type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %B: %A.type = bind_alias B, %A.decl [template = constants.%A] diff --git a/toolchain/check/testdata/function/call/no_prelude/empty_struct.carbon b/toolchain/check/testdata/function/call/no_prelude/empty_struct.carbon index c7f57e415bd1c..9a9489b925b30 100644 --- a/toolchain/check/testdata/function/call/no_prelude/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/no_prelude/empty_struct.carbon @@ -36,11 +36,11 @@ fn Main() { // CHECK:STDOUT: %Echo.decl: %Echo.type = fn_decl @Echo [template = constants.%Echo] { // CHECK:STDOUT: %.loc11_13.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc11_13.2: type = converted %.loc11_13.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %a.loc11_9.1: %.1 = param a, runtime_param0 -// CHECK:STDOUT: @Echo.%a: %.1 = bind_name a, %a.loc11_9.1 +// CHECK:STDOUT: %a.param: %.1 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.1 = bind_name a, %a.param // CHECK:STDOUT: %.loc11_20.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc11_20.2: type = converted %.loc11_20.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @Echo.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/no_prelude/empty_tuple.carbon b/toolchain/check/testdata/function/call/no_prelude/empty_tuple.carbon index 917ac926aa501..ade56063a31a0 100644 --- a/toolchain/check/testdata/function/call/no_prelude/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/no_prelude/empty_tuple.carbon @@ -35,11 +35,11 @@ fn Main() { // CHECK:STDOUT: %Echo.decl: %Echo.type = fn_decl @Echo [template = constants.%Echo] { // CHECK:STDOUT: %.loc11_13.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc11_13.2: type = converted %.loc11_13.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %a.loc11_9.1: %.1 = param a, runtime_param0 -// CHECK:STDOUT: @Echo.%a: %.1 = bind_name a, %a.loc11_9.1 +// CHECK:STDOUT: %a.param: %.1 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.1 = bind_name a, %a.param // CHECK:STDOUT: %.loc11_20.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc11_20.2: type = converted %.loc11_20.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @Echo.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index fd663b37adc00..32b48d7332d18 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -53,8 +53,8 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 5f5001b96aa65..f049d260847ff 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -54,8 +54,8 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index b0e68ad292341..aad55d751246e 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -54,13 +54,13 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 b949c498ba8fc..4d0f22ca7a892 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -55,13 +55,13 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 73d6b73ab7cab..cb5ba841c532f 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -48,13 +48,13 @@ fn F(n: i32, a: [i32; n]*); // CHECK:STDOUT: %int.make_type_32.loc14_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_9.1: type = value_of_initializer %int.make_type_32.loc14_9 [template = i32] // CHECK:STDOUT: %.loc14_9.2: type = converted %int.make_type_32.loc14_9, %.loc14_9.1 [template = i32] -// CHECK:STDOUT: %n.loc14_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @F.%n: i32 = bind_name n, %n.loc14_6.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc14_18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %n.ref: i32 = name_ref n, @F.%n +// CHECK:STDOUT: %n.ref: i32 = name_ref n, %n // CHECK:STDOUT: %.loc14_25: type = ptr_type [template = ] -// CHECK:STDOUT: %a.loc14_14.1: = param a, runtime_param1 -// CHECK:STDOUT: @F.%a: = bind_name a, %a.loc14_14.1 +// CHECK:STDOUT: %a.param: = param a, runtime_param1 +// CHECK:STDOUT: %a: = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 f1130a843d318..868ede84f66b9 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -51,13 +51,13 @@ fn F(n: i32, n: i32); // CHECK:STDOUT: %int.make_type_32.loc17_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc17_9.1: type = value_of_initializer %int.make_type_32.loc17_9 [template = i32] // CHECK:STDOUT: %.loc17_9.2: type = converted %int.make_type_32.loc17_9, %.loc17_9.1 [template = i32] -// CHECK:STDOUT: %n.loc17_6.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @F.%n.loc17_6: i32 = bind_name n, %n.loc17_6.1 +// CHECK:STDOUT: %n.param.loc17_6: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n.loc17_6: i32 = bind_name n, %n.param.loc17_6 // CHECK:STDOUT: %int.make_type_32.loc17_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc17_17.1: type = value_of_initializer %int.make_type_32.loc17_17 [template = i32] // CHECK:STDOUT: %.loc17_17.2: type = converted %int.make_type_32.loc17_17, %.loc17_17.1 [template = i32] -// CHECK:STDOUT: %n.loc17_14.1: i32 = param n, runtime_param1 -// CHECK:STDOUT: @F.%n.loc17_14: i32 = bind_name n, %n.loc17_14.1 +// CHECK:STDOUT: %n.param.loc17_14: i32 = param n, runtime_param1 +// CHECK:STDOUT: %n.loc17_14: i32 = bind_name n, %n.param.loc17_14 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 3a13afae5df02..de0b3c7716144 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -356,12 +356,12 @@ import library "extern_api"; // CHECK:STDOUT: %int.make_type_32.loc5_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_9.1: type = value_of_initializer %int.make_type_32.loc5_9 [template = i32] // CHECK:STDOUT: %.loc5_9.2: type = converted %int.make_type_32.loc5_9, %.loc5_9.1 [template = i32] -// CHECK:STDOUT: %b.loc5_6.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: @B.%b: i32 = bind_name b, %b.loc5_6.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_17.1: type = value_of_initializer %int.make_type_32.loc5_17 [template = i32] // CHECK:STDOUT: %.loc5_17.2: type = converted %int.make_type_32.loc5_17, %.loc5_17.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc6_10: init type = call constants.%Int32() [template = i32] @@ -369,13 +369,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc6_14.2: type = value_of_initializer %int.make_type_32.loc6_10 [template = i32] // CHECK:STDOUT: %.loc6_14.3: type = converted %int.make_type_32.loc6_10, %.loc6_14.2 [template = i32] // CHECK:STDOUT: %.loc6_14.4: type = converted %.loc6_14.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: %c.loc6_6.1: %.3 = param c, runtime_param0 -// CHECK:STDOUT: @C.%c: %.3 = bind_name c, %c.loc6_6.1 +// CHECK:STDOUT: %c.param: %.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc6_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_25.1: type = value_of_initializer %int.make_type_32.loc6_25 [template = i32] // CHECK:STDOUT: %.loc6_25.2: type = converted %int.make_type_32.loc6_25, %.loc6_25.1 [template = i32] // CHECK:STDOUT: %.loc6_28: type = struct_type {.c: i32} [template = constants.%.4] -// CHECK:STDOUT: @C.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: %NS: = namespace [template] { @@ -447,12 +447,12 @@ import library "extern_api"; // CHECK:STDOUT: %int.make_type_32.loc5_44: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_44.1: type = value_of_initializer %int.make_type_32.loc5_44 [template = i32] // CHECK:STDOUT: %.loc5_44.2: type = converted %int.make_type_32.loc5_44, %.loc5_44.1 [template = i32] -// CHECK:STDOUT: %b.loc5_41.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: @B.%b: i32 = bind_name b, %b.loc5_41.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_52: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_52.1: type = value_of_initializer %int.make_type_32.loc5_52 [template = i32] // CHECK:STDOUT: %.loc5_52.2: type = converted %int.make_type_32.loc5_52, %.loc5_52.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc6_45: init type = call constants.%Int32() [template = i32] @@ -460,13 +460,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc6_49.2: type = value_of_initializer %int.make_type_32.loc6_45 [template = i32] // CHECK:STDOUT: %.loc6_49.3: type = converted %int.make_type_32.loc6_45, %.loc6_49.2 [template = i32] // CHECK:STDOUT: %.loc6_49.4: type = converted %.loc6_49.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: %c.loc6_41.1: %.3 = param c, runtime_param0 -// CHECK:STDOUT: @C.%c: %.3 = bind_name c, %c.loc6_41.1 +// CHECK:STDOUT: %c.param: %.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc6_60: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_60.1: type = value_of_initializer %int.make_type_32.loc6_60 [template = i32] // CHECK:STDOUT: %.loc6_60.2: type = converted %int.make_type_32.loc6_60, %.loc6_60.1 [template = i32] // CHECK:STDOUT: %.loc6_63: type = struct_type {.c: i32} [template = constants.%.4] -// CHECK:STDOUT: @C.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: %NS: = namespace [template] { @@ -668,8 +668,8 @@ import library "extern_api"; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: .b = %b.loc63 -// CHECK:STDOUT: .c = %c.loc64 +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d // CHECK:STDOUT: .e = %e // CHECK:STDOUT: } @@ -680,12 +680,12 @@ import library "extern_api"; // CHECK:STDOUT: %int.make_type_32.loc27_16: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc27_16.1: type = value_of_initializer %int.make_type_32.loc27_16 [template = i32] // CHECK:STDOUT: %.loc27_16.2: type = converted %int.make_type_32.loc27_16, %.loc27_16.1 [template = i32] -// CHECK:STDOUT: %b.loc27_13.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: %b.loc27_13.2: i32 = bind_name b, %b.loc27_13.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b.loc27: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc27_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc27_24.1: type = value_of_initializer %int.make_type_32.loc27_24 [template = i32] // CHECK:STDOUT: %.loc27_24.2: type = converted %int.make_type_32.loc27_24, %.loc27_24.1 [template = i32] -// CHECK:STDOUT: %return.var.loc27: ref i32 = var +// CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc38_17: init type = call constants.%Int32() [template = i32] @@ -693,13 +693,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc38_21.2: type = value_of_initializer %int.make_type_32.loc38_17 [template = i32] // CHECK:STDOUT: %.loc38_21.3: type = converted %int.make_type_32.loc38_17, %.loc38_21.2 [template = i32] // CHECK:STDOUT: %.loc38_21.4: type = converted %.loc38_21.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: %c.loc38_13.1: %.3 = param c, runtime_param0 -// CHECK:STDOUT: %c.loc38_13.2: %.3 = bind_name c, %c.loc38_13.1 +// CHECK:STDOUT: %c.param: %.3 = param c, runtime_param0 +// CHECK:STDOUT: %c.loc38: %.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc38_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc38_32.1: type = value_of_initializer %int.make_type_32.loc38_32 [template = i32] // CHECK:STDOUT: %.loc38_32.2: type = converted %int.make_type_32.loc38_32, %.loc38_32.1 [template = i32] // CHECK:STDOUT: %.loc38_35: type = struct_type {.c: i32} [template = constants.%.4] -// CHECK:STDOUT: %return.var.loc38: ref %.4 = var +// CHECK:STDOUT: %return.var: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: %E.decl: %E.type = fn_decl @E [template = constants.%E] {} @@ -711,13 +711,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc63_8.1: type = value_of_initializer %int.make_type_32.loc63 [template = i32] // CHECK:STDOUT: %.loc63_8.2: type = converted %int.make_type_32.loc63, %.loc63_8.1 [template = i32] // CHECK:STDOUT: %b.var: ref i32 = var b -// CHECK:STDOUT: %b.loc63: ref i32 = bind_name b, %b.var +// CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %int.make_type_32.loc64: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc64_13.1: type = value_of_initializer %int.make_type_32.loc64 [template = i32] // CHECK:STDOUT: %.loc64_13.2: type = converted %int.make_type_32.loc64, %.loc64_13.1 [template = i32] // CHECK:STDOUT: %.loc64_16: type = struct_type {.c: i32} [template = constants.%.4] // CHECK:STDOUT: %c.var: ref %.4 = var c -// CHECK:STDOUT: %c.loc64: ref %.4 = bind_name c, %c.var +// CHECK:STDOUT: %c: ref %.4 = bind_name c, %c.var // CHECK:STDOUT: %.loc65_9.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc65_9.2: type = converted %.loc65_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %d.var: ref %.1 = var d @@ -732,9 +732,9 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @B(%b: i32) -> i32; +// CHECK:STDOUT: fn @B(%b.1: i32) -> i32; // CHECK:STDOUT: -// CHECK:STDOUT: fn @C(%c: %.3) -> %.4; +// CHECK:STDOUT: fn @C(%c.1: %.3) -> %.4; // CHECK:STDOUT: // CHECK:STDOUT: extern fn @D(); // CHECK:STDOUT: @@ -822,8 +822,8 @@ import library "extern_api"; // CHECK:STDOUT: .NS = imports.%NS // CHECK:STDOUT: .Core = imports.%Core // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: .b = %b.loc13 -// CHECK:STDOUT: .c = %c.loc14 +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d // CHECK:STDOUT: .e = %e // CHECK:STDOUT: } @@ -834,12 +834,12 @@ import library "extern_api"; // CHECK:STDOUT: %int.make_type_32.loc7_16: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_16.1: type = value_of_initializer %int.make_type_32.loc7_16 [template = i32] // CHECK:STDOUT: %.loc7_16.2: type = converted %int.make_type_32.loc7_16, %.loc7_16.1 [template = i32] -// CHECK:STDOUT: %b.loc7_13.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: %b.loc7_13.2: i32 = bind_name b, %b.loc7_13.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b.loc7: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc7_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc7_24.1: type = value_of_initializer %int.make_type_32.loc7_24 [template = i32] // CHECK:STDOUT: %.loc7_24.2: type = converted %int.make_type_32.loc7_24, %.loc7_24.1 [template = i32] -// CHECK:STDOUT: %return.var.loc7: ref i32 = var +// CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc8_17: init type = call constants.%Int32() [template = i32] @@ -847,13 +847,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc8_21.2: type = value_of_initializer %int.make_type_32.loc8_17 [template = i32] // CHECK:STDOUT: %.loc8_21.3: type = converted %int.make_type_32.loc8_17, %.loc8_21.2 [template = i32] // CHECK:STDOUT: %.loc8_21.4: type = converted %.loc8_21.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: %c.loc8_13.1: %.3 = param c, runtime_param0 -// CHECK:STDOUT: %c.loc8_13.2: %.3 = bind_name c, %c.loc8_13.1 +// CHECK:STDOUT: %c.param: %.3 = param c, runtime_param0 +// CHECK:STDOUT: %c.loc8: %.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc8_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc8_32.1: type = value_of_initializer %int.make_type_32.loc8_32 [template = i32] // CHECK:STDOUT: %.loc8_32.2: type = converted %int.make_type_32.loc8_32, %.loc8_32.1 [template = i32] // CHECK:STDOUT: %.loc8_35: type = struct_type {.c: i32} [template = constants.%.4] -// CHECK:STDOUT: %return.var.loc8: ref %.4 = var +// CHECK:STDOUT: %return.var: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: %E.decl: %E.type = fn_decl @E [template = constants.%E] {} @@ -865,13 +865,13 @@ import library "extern_api"; // CHECK:STDOUT: %.loc13_8.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_8.2: type = converted %int.make_type_32.loc13, %.loc13_8.1 [template = i32] // CHECK:STDOUT: %b.var: ref i32 = var b -// CHECK:STDOUT: %b.loc13: ref i32 = bind_name b, %b.var +// CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_13.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] // CHECK:STDOUT: %.loc14_13.2: type = converted %int.make_type_32.loc14, %.loc14_13.1 [template = i32] // CHECK:STDOUT: %.loc14_16: type = struct_type {.c: i32} [template = constants.%.4] // CHECK:STDOUT: %c.var: ref %.4 = var c -// CHECK:STDOUT: %c.loc14: ref %.4 = bind_name c, %c.var +// CHECK:STDOUT: %c: ref %.4 = bind_name c, %c.var // CHECK:STDOUT: %.loc15_9.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc15_9.2: type = converted %.loc15_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %d.var: ref %.1 = var d @@ -886,9 +886,9 @@ import library "extern_api"; // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: extern fn @B(%b: i32) -> i32; +// CHECK:STDOUT: extern fn @B(%b.1: i32) -> i32; // CHECK:STDOUT: -// CHECK:STDOUT: extern fn @C(%c: %.3) -> %.4; +// CHECK:STDOUT: extern fn @C(%c.1: %.3) -> %.4; // CHECK:STDOUT: // CHECK:STDOUT: extern fn @D(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon b/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon index 9a95b88289831..d760ba3529efd 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/extern.carbon @@ -174,8 +174,8 @@ class C { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %self.loc13_15.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_15.2: %C = bind_name self, %self.loc13_15.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -186,5 +186,5 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G[@C.%self.loc13_15.2: %C](); +// CHECK:STDOUT: fn @G[%self: %C](); // 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 536848dd469ca..73d0103432936 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 @@ -123,20 +123,20 @@ fn CallFAndGIncomplete() { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %D.decl.loc5: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: %ReturnCUnused.decl: %ReturnCUnused.type = fn_decl @ReturnCUnused [template = constants.%ReturnCUnused] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @ReturnCUnused.%return: ref %C = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %ReturnCUsed.decl: %ReturnCUsed.type = fn_decl @ReturnCUsed [template = constants.%ReturnCUsed] { -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @ReturnCUsed.%return: ref %C = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %ReturnDUnused.decl: %ReturnDUnused.type = fn_decl @ReturnDUnused [template = constants.%ReturnDUnused] { -// CHECK:STDOUT: %D.ref.loc9: type = name_ref D, %D.decl.loc5 [template = constants.%D] -// CHECK:STDOUT: @ReturnDUnused.%return: ref %D = var +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl.loc5 [template = constants.%D] +// CHECK:STDOUT: %return: ref %D = var // CHECK:STDOUT: } // CHECK:STDOUT: %ReturnDUsed.decl: %ReturnDUsed.type = fn_decl @ReturnDUsed [template = constants.%ReturnDUsed] { -// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, %D.decl.loc5 [template = constants.%D] -// CHECK:STDOUT: @ReturnDUsed.%return: ref %D = var +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl.loc5 [template = constants.%D] +// CHECK:STDOUT: %return: ref %D = var // CHECK:STDOUT: } // CHECK:STDOUT: %Call.decl: %Call.type = fn_decl @Call [template = constants.%Call] {} // CHECK:STDOUT: %D.decl.loc37: type = class_decl @D [template = constants.%D] {} diff --git a/toolchain/check/testdata/function/declaration/no_prelude/fail_redecl.carbon b/toolchain/check/testdata/function/declaration/no_prelude/fail_redecl.carbon index 9d43a458fd5f9..6116a2e381685 100644 --- a/toolchain/check/testdata/function/declaration/no_prelude/fail_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/no_prelude/fail_redecl.carbon @@ -88,21 +88,21 @@ fn E() {} // CHECK:STDOUT: %B.decl.loc21: %B.type = fn_decl @B [template = constants.%B] { // CHECK:STDOUT: %.loc21_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc21_10.2: type = converted %.loc21_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc21_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @B.%x: %.1 = bind_name x, %x.loc21_6.1 +// CHECK:STDOUT: %x.param.loc21: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x.loc21: %.1 = bind_name x, %x.param.loc21 // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl.loc29: %B.type = fn_decl @B [template = constants.%B] { // CHECK:STDOUT: %.loc29_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc29_10.2: type = converted %.loc29_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc29_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: %x.loc29_6.2: %.1 = bind_name x, %x.loc29_6.1 +// CHECK:STDOUT: %x.param.loc29: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x.loc29: %.1 = bind_name x, %x.param.loc29 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] {} // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.2] { // CHECK:STDOUT: %.loc39_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc39_10.2: type = converted %.loc39_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc39_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @.1.%x: %.1 = bind_name x, %x.loc39_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl.loc41: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: %D.decl.loc49: %D.type = fn_decl @D [template = constants.%D] {} @@ -112,7 +112,7 @@ fn E() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); // CHECK:STDOUT: -// CHECK:STDOUT: fn @B(%x: %.1); +// CHECK:STDOUT: fn @B(%x.loc21: %.1); // CHECK:STDOUT: // CHECK:STDOUT: fn @C(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/param_same_name.carbon b/toolchain/check/testdata/function/declaration/param_same_name.carbon index 01931ce90b516..ce0ab33a2ebe9 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -47,18 +47,18 @@ fn G(a: i32); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32.loc11, %.loc11_9.1 [template = i32] -// CHECK:STDOUT: %a.loc11_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc11_6.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32, %.loc11_9.1 [template = i32] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_9.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_9.2: type = converted %int.make_type_32.loc13, %.loc13_9.1 [template = i32] -// CHECK:STDOUT: %a.loc13_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @G.%a: i32 = bind_name a, %a.loc13_6.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_9.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_9.2: type = converted %int.make_type_32, %.loc13_9.1 [template = i32] +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index 93034c3712ca4..a68f2d3cf3535 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -168,12 +168,12 @@ fn D() {} // CHECK:STDOUT: %int.make_type_32.loc5_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_9.1: type = value_of_initializer %int.make_type_32.loc5_9 [template = i32] // CHECK:STDOUT: %.loc5_9.2: type = converted %int.make_type_32.loc5_9, %.loc5_9.1 [template = i32] -// CHECK:STDOUT: %b.loc5_6.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: @B.%b: i32 = bind_name b, %b.loc5_6.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc5_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc5_17.1: type = value_of_initializer %int.make_type_32.loc5_17 [template = i32] // CHECK:STDOUT: %.loc5_17.2: type = converted %int.make_type_32.loc5_17, %.loc5_17.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { // CHECK:STDOUT: %int.make_type_32.loc6_10: init type = call constants.%Int32() [template = i32] @@ -181,13 +181,13 @@ fn D() {} // CHECK:STDOUT: %.loc6_14.2: type = value_of_initializer %int.make_type_32.loc6_10 [template = i32] // CHECK:STDOUT: %.loc6_14.3: type = converted %int.make_type_32.loc6_10, %.loc6_14.2 [template = i32] // CHECK:STDOUT: %.loc6_14.4: type = converted %.loc6_14.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: %c.loc6_6.1: %.3 = param c, runtime_param0 -// CHECK:STDOUT: @C.%c: %.3 = bind_name c, %c.loc6_6.1 +// CHECK:STDOUT: %c.param: %.3 = param c, runtime_param0 +// CHECK:STDOUT: %c: %.3 = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32.loc6_25: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_25.1: type = value_of_initializer %int.make_type_32.loc6_25 [template = i32] // CHECK:STDOUT: %.loc6_25.2: type = converted %int.make_type_32.loc6_25, %.loc6_25.1 [template = i32] // CHECK:STDOUT: %.loc6_28: type = struct_type {.c: i32} [template = constants.%.4] -// CHECK:STDOUT: @C.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] {} // CHECK:STDOUT: } @@ -390,8 +390,8 @@ fn D() {} // CHECK:STDOUT: %int.make_type_32.loc27_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc27_9.1: type = value_of_initializer %int.make_type_32.loc27_9 [template = i32] // CHECK:STDOUT: %.loc27_9.2: type = converted %int.make_type_32.loc27_9, %.loc27_9.1 [template = i32] -// CHECK:STDOUT: %b.loc27_6.1: i32 = param b, runtime_param0 -// CHECK:STDOUT: %b.loc27_6.2: i32 = bind_name b, %b.loc27_6.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param0 +// CHECK:STDOUT: %b.loc27: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc27_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc27_17.1: type = value_of_initializer %int.make_type_32.loc27_17 [template = i32] // CHECK:STDOUT: %.loc27_17.2: type = converted %int.make_type_32.loc27_17, %.loc27_17.1 [template = i32] @@ -406,7 +406,7 @@ fn D() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @B(%b: i32) -> i32; +// CHECK:STDOUT: fn @B(%b.1: i32) -> i32; // CHECK:STDOUT: // CHECK:STDOUT: --- fail_redecl_then_def.carbon // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/no_prelude/fail_decl_param_mismatch.carbon b/toolchain/check/testdata/function/definition/no_prelude/fail_decl_param_mismatch.carbon index d5006930eb403..587891194fd7d 100644 --- a/toolchain/check/testdata/function/definition/no_prelude/fail_decl_param_mismatch.carbon +++ b/toolchain/check/testdata/function/definition/no_prelude/fail_decl_param_mismatch.carbon @@ -110,47 +110,47 @@ fn K() -> {} { return {}; } // CHECK:STDOUT: %.decl.loc19: %.type.1 = fn_decl @.1 [template = constants.%.2] { // CHECK:STDOUT: %.loc19_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc19_10.2: type = converted %.loc19_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc19_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @.1.%x: %.1 = bind_name x, %x.loc19_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %.loc21_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc21_10.2: type = converted %.loc21_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc21_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @G.%x: %.1 = bind_name x, %x.loc21_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc29: %.type.2 = fn_decl @.2 [template = constants.%.3] {} // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { // CHECK:STDOUT: %.loc31_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc31_10.2: type = converted %.loc31_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc31_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @H.%x: %.1 = bind_name x, %x.loc31_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc36: %.type.3 = fn_decl @.3 [template = constants.%.4] { -// CHECK:STDOUT: %x.loc36_6.1: = param x, runtime_param0 -// CHECK:STDOUT: @.3.%x: = bind_name x, %x.loc36_6.1 +// CHECK:STDOUT: %x.param: = param x, runtime_param0 +// CHECK:STDOUT: %x: = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %I.decl: %I.type = fn_decl @I [template = constants.%I] {} // CHECK:STDOUT: %.decl.loc46: %.type.4 = fn_decl @.4 [template = constants.%.5] { // CHECK:STDOUT: %.loc46_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc46_12.2: type = converted %.loc46_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @.4.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %J.decl: %J.type = fn_decl @J [template = constants.%J] { // CHECK:STDOUT: %.loc48_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc48_12.2: type = converted %.loc48_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @J.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc56: %.type.5 = fn_decl @.5 [template = constants.%.6] {} // CHECK:STDOUT: %K.decl: %K.type = fn_decl @K [template = constants.%K] { // CHECK:STDOUT: %.loc58_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc58_12.2: type = converted %.loc58_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @K.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc65: %.type.6 = fn_decl @.6 [template = constants.%.8] { // CHECK:STDOUT: %.loc65_12.1: %.7 = struct_literal () // CHECK:STDOUT: %.loc65_12.2: type = converted %.loc65_12.1, constants.%.7 [template = constants.%.7] -// CHECK:STDOUT: @.6.%return: ref %.7 = var +// CHECK:STDOUT: %return: ref %.7 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: 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 59c7859848eee..7b369f696e499 100644 --- a/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/function/definition/no_prelude/syntactic_merge.carbon @@ -189,27 +189,27 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Bar = %Bar.decl.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: %a.loc7_8.2: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc7: %C = bind_name a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc8: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc8_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc8_8.1 +// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc8: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc8: %C = bind_name a, %a.param.loc8 // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc10: %Bar.type = fn_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc10_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: %a.loc10_8.2: %C = bind_name a, %a.loc10_8.1 +// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc10: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc10: %C = bind_name a, %a.param.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc11: %Bar.type = fn_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc11_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Bar.%a: %C = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc11: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc11: %C = bind_name a, %a.param.loc11 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -218,12 +218,12 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Foo(%a: %C) { +// CHECK:STDOUT: fn @Foo(%a.loc8: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Bar(%a: %C) { +// CHECK:STDOUT: fn @Bar(%a.loc11: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -246,14 +246,14 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_14.1: %C = param a, runtime_param0 -// CHECK:STDOUT: %a.loc6_14.2: %C = bind_name a, %a.loc6_14.1 +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc6: %C = bind_name a, %a.param.loc6 // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_10.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_10.1 +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc7: %C = bind_name a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -262,7 +262,7 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Foo[](%a: %C) { +// CHECK:STDOUT: fn @Foo[](%a.loc7: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -287,14 +287,14 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc6_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %C.ref.loc14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc14_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @.1.%a: %C = bind_name a, %a.loc14_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -328,14 +328,14 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: %a.loc6_8.2: %C = bind_name a, %a.loc6_8.1 +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc6: %C = bind_name a, %a.param.loc6 // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param0 +// CHECK:STDOUT: %a.loc7: %C = bind_name a, %a.param.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -344,7 +344,7 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Foo(%a: %C) { +// CHECK:STDOUT: fn @Foo(%a.loc7: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -369,17 +369,17 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Bar = %Bar.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc8_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Bar.%a: %C = bind_name a, %a.loc8_8.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -424,13 +424,13 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] -// CHECK:STDOUT: %a.loc4_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc4_8.1 +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [template = constants.%Bar] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.2 [template = constants.%C] -// CHECK:STDOUT: %a.loc5_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Bar.%a: %C = bind_name a, %a.loc5_8.1 +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -469,17 +469,17 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %b.loc15_8.1: %C = param b, runtime_param0 -// CHECK:STDOUT: @.1.%b: %C = bind_name b, %b.loc15_8.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param0 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -515,17 +515,17 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @.1.%a: %C = bind_name a, %a.loc15_8.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -561,17 +561,17 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc7_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @.1.%a: %C = bind_name a, %a.loc15_8.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -606,15 +606,15 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl.loc7 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %return.var.loc7: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc8: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: @Foo.%return: ref %C = var +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -648,9 +648,9 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc6_8.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -689,9 +689,9 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc6_8.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %C = bind_name a, %a.loc6_8.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -726,17 +726,17 @@ fn Foo(a: const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc6: type = const_type %C [template = constants.%.2] -// CHECK:STDOUT: %a.loc6_8.1: %.2 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: %.2 = bind_name a, %a.loc6_8.1 +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.2 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc17_18: type = const_type %C [template = constants.%.2] // CHECK:STDOUT: %.loc17_11: type = const_type %.2 [template = constants.%.2] -// CHECK:STDOUT: %a.loc17_8.1: %.2 = param a, runtime_param0 -// CHECK:STDOUT: @.1.%a: %.2 = bind_name a, %a.loc17_8.1 +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.2 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 665f1baf31933..5fb65456db008 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -45,8 +45,8 @@ fn Foo(a: i32) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 8f939fb28d454..f86dbcccc9561 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -45,8 +45,8 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index a9b95adbbe56e..7cd7fd65bdc95 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -45,13 +45,13 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 c08512b92e4e5..3e1bc3d71e8b9 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -45,13 +45,13 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: %int.make_type_32.loc11_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11_11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: %a.loc11_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc11_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11_19 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11_19, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: %b.loc11_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc11_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/deduce.carbon b/toolchain/check/testdata/function/generic/deduce.carbon index b1eb1e616ea4e..7da927d57b79d 100644 --- a/toolchain/check/testdata/function/generic/deduce.carbon +++ b/toolchain/check/testdata/function/generic/deduce.carbon @@ -160,26 +160,26 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ExplicitGenericParam.decl: %ExplicitGenericParam.type = fn_decl @ExplicitGenericParam [template = constants.%ExplicitGenericParam] { -// CHECK:STDOUT: %T.loc4_25.1: type = param T, runtime_param -// CHECK:STDOUT: @ExplicitGenericParam.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_25.1 [symbolic = @ExplicitGenericParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, @ExplicitGenericParam.%T.loc4 [symbolic = @ExplicitGenericParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = @ExplicitGenericParam.%.1 (constants.%.1)] -// CHECK:STDOUT: @ExplicitGenericParam.%return: ref @ExplicitGenericParam.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @ExplicitGenericParam.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallExplicitGenericParam.decl: %CallExplicitGenericParam.type = fn_decl @CallExplicitGenericParam [template = constants.%CallExplicitGenericParam] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_37.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc6_37.2: type = converted %int.make_type_32, %.loc6_37.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_37.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] +// CHECK:STDOUT: %.loc6_37.2: type = converted %int.make_type_32.loc6, %.loc6_37.1 [template = i32] // CHECK:STDOUT: %.loc6_37.3: type = ptr_type i32 [template = constants.%.3] -// CHECK:STDOUT: @CallExplicitGenericParam.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallExplicitGenericParamWithGenericArg.decl: %CallExplicitGenericParamWithGenericArg.type = fn_decl @CallExplicitGenericParamWithGenericArg [template = constants.%CallExplicitGenericParamWithGenericArg] { -// CHECK:STDOUT: %T.loc10_43.1: type = param T, runtime_param -// CHECK:STDOUT: @CallExplicitGenericParamWithGenericArg.%T.loc10: type = bind_symbolic_name T 0, %T.loc10_43.1 [symbolic = @CallExplicitGenericParamWithGenericArg.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc10: type = name_ref T, @CallExplicitGenericParamWithGenericArg.%T.loc10 [symbolic = @CallExplicitGenericParamWithGenericArg.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc10_62: type = struct_type {.a: %T} [symbolic = @CallExplicitGenericParamWithGenericArg.%.1 (constants.%.4)] -// CHECK:STDOUT: %.loc10_63: type = ptr_type %.4 [symbolic = @CallExplicitGenericParamWithGenericArg.%.2 (constants.%.5)] -// CHECK:STDOUT: @CallExplicitGenericParamWithGenericArg.%return: ref @CallExplicitGenericParamWithGenericArg.%.2 (%.5) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc10: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc10: type = name_ref T, %T.loc10 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc10_62: type = struct_type {.a: %T} [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.loc10_63: type = ptr_type %.4 [symbolic = %.2 (constants.%.5)] +// CHECK:STDOUT: %return: ref @CallExplicitGenericParamWithGenericArg.%.2 (%.5) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -195,9 +195,9 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: fn @CallExplicitGenericParam() -> %.3 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %ExplicitGenericParam.ref: %ExplicitGenericParam.type = name_ref ExplicitGenericParam, file.%ExplicitGenericParam.decl [template = constants.%ExplicitGenericParam] -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc7_30.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc7_30.2: type = converted %int.make_type_32, %.loc7_30.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc7: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc7_30.1: type = value_of_initializer %int.make_type_32.loc7 [template = i32] +// CHECK:STDOUT: %.loc7_30.2: type = converted %int.make_type_32.loc7, %.loc7_30.1 [template = i32] // CHECK:STDOUT: %ExplicitGenericParam.call: init %.3 = call %ExplicitGenericParam.ref() // CHECK:STDOUT: %.loc7_35.1: %.3 = value_of_initializer %ExplicitGenericParam.call // CHECK:STDOUT: %.loc7_35.2: %.3 = converted %ExplicitGenericParam.call, %.loc7_35.1 @@ -214,7 +214,7 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: fn(%T.loc10: type) -> @CallExplicitGenericParamWithGenericArg.%.2 (%.5) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %ExplicitGenericParam.ref: %ExplicitGenericParam.type = name_ref ExplicitGenericParam, file.%ExplicitGenericParam.decl [template = constants.%ExplicitGenericParam] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc10 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc11: type = name_ref T, %T.loc10 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc11_37: type = struct_type {.a: %T} [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %ExplicitGenericParam.call: init @CallExplicitGenericParamWithGenericArg.%.2 (%.5) = call %ExplicitGenericParam.ref() // CHECK:STDOUT: %.loc11_39.1: @CallExplicitGenericParamWithGenericArg.%.2 (%.5) = value_of_initializer %ExplicitGenericParam.call @@ -286,26 +286,26 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %ExplicitAndAlsoDeduced.decl: %ExplicitAndAlsoDeduced.type = fn_decl @ExplicitAndAlsoDeduced [template = constants.%ExplicitAndAlsoDeduced] { -// CHECK:STDOUT: %T.loc6_27.1: type = param T, runtime_param -// CHECK:STDOUT: @ExplicitAndAlsoDeduced.%T.loc6: type = bind_symbolic_name T 0, %T.loc6_27.1 [symbolic = @ExplicitAndAlsoDeduced.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc6_40: type = name_ref T, @ExplicitAndAlsoDeduced.%T.loc6 [symbolic = @ExplicitAndAlsoDeduced.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc6_37.1: @ExplicitAndAlsoDeduced.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @ExplicitAndAlsoDeduced.%x: @ExplicitAndAlsoDeduced.%T.1 (%T) = bind_name x, %x.loc6_37.1 -// CHECK:STDOUT: %T.ref.loc6_46: type = name_ref T, @ExplicitAndAlsoDeduced.%T.loc6 [symbolic = @ExplicitAndAlsoDeduced.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc6: type = ptr_type %T [symbolic = @ExplicitAndAlsoDeduced.%.1 (constants.%.2)] -// CHECK:STDOUT: @ExplicitAndAlsoDeduced.%return: ref @ExplicitAndAlsoDeduced.%.1 (%.2) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc6_40: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @ExplicitAndAlsoDeduced.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @ExplicitAndAlsoDeduced.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc6_46: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc6: type = ptr_type %T [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %return: ref @ExplicitAndAlsoDeduced.%.1 (%.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallExplicitAndAlsoDeduced.decl: %CallExplicitAndAlsoDeduced.type = fn_decl @CallExplicitAndAlsoDeduced [template = constants.%CallExplicitAndAlsoDeduced] { // CHECK:STDOUT: %int.make_type_32.loc9_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_34.1: type = value_of_initializer %int.make_type_32.loc9_34 [template = i32] // CHECK:STDOUT: %.loc9_34.2: type = converted %int.make_type_32.loc9_34, %.loc9_34.1 [template = i32] -// CHECK:STDOUT: %n.loc9_31.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @CallExplicitAndAlsoDeduced.%n: i32 = bind_name n, %n.loc9_31.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc9_42: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc9_45.1: type = value_of_initializer %int.make_type_32.loc9_42 [template = i32] // CHECK:STDOUT: %.loc9_45.2: type = converted %int.make_type_32.loc9_42, %.loc9_45.1 [template = i32] // CHECK:STDOUT: %.loc9_45.3: type = ptr_type i32 [template = constants.%.4] -// CHECK:STDOUT: @CallExplicitAndAlsoDeduced.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -374,26 +374,26 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ImplicitGenericParam.decl: %ImplicitGenericParam.type = fn_decl @ImplicitGenericParam [template = constants.%ImplicitGenericParam] { -// CHECK:STDOUT: %T.loc4_25.1: type = param T, runtime_param -// CHECK:STDOUT: @ImplicitGenericParam.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_25.1 [symbolic = @ImplicitGenericParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, @ImplicitGenericParam.%T.loc4 [symbolic = @ImplicitGenericParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc4_35.1: @ImplicitGenericParam.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @ImplicitGenericParam.%x: @ImplicitGenericParam.%T.1 (%T) = bind_name x, %x.loc4_35.1 -// CHECK:STDOUT: %T.ref.loc4_44: type = name_ref T, @ImplicitGenericParam.%T.loc4 [symbolic = @ImplicitGenericParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = @ImplicitGenericParam.%.1 (constants.%.1)] -// CHECK:STDOUT: @ImplicitGenericParam.%return: ref @ImplicitGenericParam.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @ImplicitGenericParam.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @ImplicitGenericParam.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc4_44: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @ImplicitGenericParam.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallImplicitGenericParam.decl: %CallImplicitGenericParam.type = fn_decl @CallImplicitGenericParam [template = constants.%CallImplicitGenericParam] { // CHECK:STDOUT: %int.make_type_32.loc6_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_32.1: type = value_of_initializer %int.make_type_32.loc6_32 [template = i32] // CHECK:STDOUT: %.loc6_32.2: type = converted %int.make_type_32.loc6_32, %.loc6_32.1 [template = i32] -// CHECK:STDOUT: %n.loc6_29.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @CallImplicitGenericParam.%n: i32 = bind_name n, %n.loc6_29.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc6_40: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc6_43.1: type = value_of_initializer %int.make_type_32.loc6_40 [template = i32] // CHECK:STDOUT: %.loc6_43.2: type = converted %int.make_type_32.loc6_40, %.loc6_43.1 [template = i32] // CHECK:STDOUT: %.loc6_43.3: type = ptr_type i32 [template = constants.%.3] -// CHECK:STDOUT: @CallImplicitGenericParam.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -475,28 +475,28 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %TupleParam.decl: %TupleParam.type = fn_decl @TupleParam [template = constants.%TupleParam] { -// CHECK:STDOUT: %T.loc4_15.1: type = param T, runtime_param -// CHECK:STDOUT: @TupleParam.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_15.1 [symbolic = @TupleParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, @TupleParam.%T.loc4 [symbolic = @TupleParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_35.1: %.2 = tuple_literal (%T.ref.loc4, %int.make_type_32.loc4) -// CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_35.3: type = converted %int.make_type_32.loc4, %.loc4_35.2 [template = i32] -// CHECK:STDOUT: %.loc4_35.4: type = converted %.loc4_35.1, constants.%.3 [symbolic = @TupleParam.%.1 (constants.%.3)] -// CHECK:STDOUT: %x.loc4_25.1: @TupleParam.%.1 (%.3) = param x, runtime_param0 -// CHECK:STDOUT: @TupleParam.%x: @TupleParam.%.1 (%.3) = bind_name x, %x.loc4_25.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_35.1: %.2 = tuple_literal (%T.ref, %int.make_type_32) +// CHECK:STDOUT: %.loc4_35.2: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_35.3: type = converted %int.make_type_32, %.loc4_35.2 [template = i32] +// CHECK:STDOUT: %.loc4_35.4: type = converted %.loc4_35.1, constants.%.3 [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %x.param: @TupleParam.%.1 (%.3) = param x, runtime_param0 +// CHECK:STDOUT: %x: @TupleParam.%.1 (%.3) = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallTupleParam.decl: %CallTupleParam.type = fn_decl @CallTupleParam [template = constants.%CallTupleParam] {} // CHECK:STDOUT: %StructParam.decl: %StructParam.type = fn_decl @StructParam [template = constants.%StructParam] { -// CHECK:STDOUT: %T.loc17_16.1: type = param T, runtime_param -// CHECK:STDOUT: @StructParam.%T.loc17: type = bind_symbolic_name T 0, %T.loc17_16.1 [symbolic = @StructParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc17: type = name_ref T, @StructParam.%T.loc17 [symbolic = @StructParam.%T.1 (constants.%T)] -// CHECK:STDOUT: %int.make_type_32.loc17: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc17_41.1: type = value_of_initializer %int.make_type_32.loc17 [template = i32] -// CHECK:STDOUT: %.loc17_41.2: type = converted %int.make_type_32.loc17, %.loc17_41.1 [template = i32] -// CHECK:STDOUT: %.loc17_44: type = struct_type {.a: %T, .b: i32} [symbolic = @StructParam.%.1 (constants.%.7)] -// CHECK:STDOUT: %x.loc17_26.1: @StructParam.%.1 (%.7) = param x, runtime_param0 -// CHECK:STDOUT: @StructParam.%x: @StructParam.%.1 (%.7) = bind_name x, %x.loc17_26.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc17: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc17 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc17_41.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc17_41.2: type = converted %int.make_type_32, %.loc17_41.1 [template = i32] +// CHECK:STDOUT: %.loc17_44: type = struct_type {.a: %T, .b: i32} [symbolic = %.1 (constants.%.7)] +// CHECK:STDOUT: %x.param: @StructParam.%.1 (%.7) = param x, runtime_param0 +// CHECK:STDOUT: %x: @StructParam.%.1 (%.7) = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %CallStructParam.decl: %CallStructParam.type = fn_decl @CallStructParam [template = constants.%CallStructParam] {} // CHECK:STDOUT: } @@ -579,15 +579,15 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ImplicitNotDeducible.decl: %ImplicitNotDeducible.type = fn_decl @ImplicitNotDeducible [template = constants.%ImplicitNotDeducible] { -// CHECK:STDOUT: %T.loc6_25.1: type = param T, runtime_param -// CHECK:STDOUT: @ImplicitNotDeducible.%T.loc6: type = bind_symbolic_name T 0, %T.loc6_25.1 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: %U.loc6_35.1: type = param U, runtime_param -// CHECK:STDOUT: @ImplicitNotDeducible.%U.loc6: type = bind_symbolic_name U 1, %U.loc6_35.1 [symbolic = @ImplicitNotDeducible.%U.1 (constants.%U)] -// CHECK:STDOUT: %T.ref: type = name_ref T, @ImplicitNotDeducible.%T.loc6 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc6_45.1: @ImplicitNotDeducible.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @ImplicitNotDeducible.%x: @ImplicitNotDeducible.%T.1 (%T) = bind_name x, %x.loc6_45.1 -// CHECK:STDOUT: %U.ref: type = name_ref U, @ImplicitNotDeducible.%U.loc6 [symbolic = @ImplicitNotDeducible.%U.1 (constants.%U)] -// CHECK:STDOUT: @ImplicitNotDeducible.%return: ref @ImplicitNotDeducible.%U.1 (%U) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc6: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @ImplicitNotDeducible.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc6 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %return: ref @ImplicitNotDeducible.%U.1 (%U) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallImplicitNotDeducible.decl: %CallImplicitNotDeducible.type = fn_decl @CallImplicitNotDeducible [template = constants.%CallImplicitNotDeducible] {} // CHECK:STDOUT: } @@ -646,16 +646,16 @@ fn CallImplicitNotDeducible() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ImplicitNotDeducible.decl: %ImplicitNotDeducible.type = fn_decl @ImplicitNotDeducible [template = constants.%ImplicitNotDeducible] { -// CHECK:STDOUT: %T.loc4_25.1: type = param T, runtime_param -// CHECK:STDOUT: @ImplicitNotDeducible.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_25.1 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, @ImplicitNotDeducible.%T.loc4 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc4_35.1: @ImplicitNotDeducible.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @ImplicitNotDeducible.%x: @ImplicitNotDeducible.%T.1 (%T) = bind_name x, %x.loc4_35.1 -// CHECK:STDOUT: %T.ref.loc4_44: type = name_ref T, @ImplicitNotDeducible.%T.loc4 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: %y.loc4_41.1: @ImplicitNotDeducible.%T.1 (%T) = param y, runtime_param1 -// CHECK:STDOUT: @ImplicitNotDeducible.%y: @ImplicitNotDeducible.%T.1 (%T) = bind_name y, %y.loc4_41.1 -// CHECK:STDOUT: %T.ref.loc4_50: type = name_ref T, @ImplicitNotDeducible.%T.loc4 [symbolic = @ImplicitNotDeducible.%T.1 (constants.%T)] -// CHECK:STDOUT: @ImplicitNotDeducible.%return: ref @ImplicitNotDeducible.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc4_38: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @ImplicitNotDeducible.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @ImplicitNotDeducible.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc4_44: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %y.param: @ImplicitNotDeducible.%T.1 (%T) = param y, runtime_param1 +// CHECK:STDOUT: %y: @ImplicitNotDeducible.%T.1 (%T) = bind_name y, %y.param +// CHECK:STDOUT: %T.ref.loc4_50: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @ImplicitNotDeducible.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallImplicitNotDeducible.decl: %CallImplicitNotDeducible.type = fn_decl @CallImplicitNotDeducible [template = constants.%CallImplicitNotDeducible] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon b/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon index 9b6b270b82c8c..3b6ab9bf2ec33 100644 --- a/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon +++ b/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon @@ -49,16 +49,16 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: %int.make_type_32.loc14_10: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %int.make_type_32.loc14_10 [template = i32] // CHECK:STDOUT: %.loc14_10.2: type = converted %int.make_type_32.loc14_10, %.loc14_10.1 [template = i32] -// CHECK:STDOUT: %N.loc14_6.1: i32 = param N, runtime_param -// CHECK:STDOUT: @F.%N.loc14: i32 = bind_symbolic_name N 0, %N.loc14_6.1 [symbolic = @F.%N.1 (constants.%N)] +// CHECK:STDOUT: %N.param: i32 = param N, runtime_param +// CHECK:STDOUT: %N.loc14: i32 = bind_symbolic_name N 0, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: %int.make_type_32.loc14_19: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %N.ref: i32 = name_ref N, @F.%N.loc14 [symbolic = @F.%N.1 (constants.%N)] +// CHECK:STDOUT: %N.ref: i32 = name_ref N, %N.loc14 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: %.loc14_19.1: type = value_of_initializer %int.make_type_32.loc14_19 [template = i32] // CHECK:STDOUT: %.loc14_19.2: type = converted %int.make_type_32.loc14_19, %.loc14_19.1 [template = i32] // CHECK:STDOUT: %.loc14_25: type = array_type %N.ref, i32 [template = ] // CHECK:STDOUT: %.loc14_26: type = ptr_type [template = ] -// CHECK:STDOUT: %a.loc14_15.1: = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: = bind_name a, %a.loc14_15.1 +// CHECK:STDOUT: %a.param: = param a, runtime_param0 +// CHECK:STDOUT: %a: = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/call.carbon b/toolchain/check/testdata/function/generic/no_prelude/call.carbon index fb75b685fb5af..91fc6fc5a4a4e 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/call.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/call.carbon @@ -80,41 +80,41 @@ fn CallSpecific(x: C) -> C { // CHECK:STDOUT: .CallSpecific = %CallSpecific.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Function.decl: %Function.type = fn_decl @Function [template = constants.%Function] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: @Function.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4_26: type = name_ref T, @Function.%T.loc4 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc4_23.1: @Function.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @Function.%x: @Function.%T.1 (%T) = bind_name x, %x.loc4_23.1 -// CHECK:STDOUT: %T.ref.loc4_32: type = name_ref T, @Function.%T.loc4 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: @Function.%return: ref @Function.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc4_26: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @Function.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @Function.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc4_32: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @Function.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGeneric.decl: %CallGeneric.type = fn_decl @CallGeneric [template = constants.%CallGeneric] { -// CHECK:STDOUT: %T.loc8_16.1: type = param T, runtime_param -// CHECK:STDOUT: @CallGeneric.%T.loc8: type = bind_symbolic_name T 0, %T.loc8_16.1 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc8_29: type = name_ref T, @CallGeneric.%T.loc8 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc8_26.1: @CallGeneric.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @CallGeneric.%x: @CallGeneric.%T.1 (%T) = bind_name x, %x.loc8_26.1 -// CHECK:STDOUT: %T.ref.loc8_35: type = name_ref T, @CallGeneric.%T.loc8 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: @CallGeneric.%return: ref @CallGeneric.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc8_29: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @CallGeneric.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @CallGeneric.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc8_35: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @CallGeneric.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGenericPtr.decl: %CallGenericPtr.type = fn_decl @CallGenericPtr [template = constants.%CallGenericPtr] { -// CHECK:STDOUT: %T.loc12_19.1: type = param T, runtime_param -// CHECK:STDOUT: @CallGenericPtr.%T.loc12: type = bind_symbolic_name T 0, %T.loc12_19.1 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc12_32: type = name_ref T, @CallGenericPtr.%T.loc12 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc12_33: type = ptr_type %T [symbolic = @CallGenericPtr.%.1 (constants.%.2)] -// CHECK:STDOUT: %x.loc12_29.1: @CallGenericPtr.%.1 (%.2) = param x, runtime_param0 -// CHECK:STDOUT: @CallGenericPtr.%x: @CallGenericPtr.%.1 (%.2) = bind_name x, %x.loc12_29.1 -// CHECK:STDOUT: %T.ref.loc12_39: type = name_ref T, @CallGenericPtr.%T.loc12 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc12_40: type = ptr_type %T [symbolic = @CallGenericPtr.%.1 (constants.%.2)] -// CHECK:STDOUT: @CallGenericPtr.%return: ref @CallGenericPtr.%.1 (%.2) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc12_32: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc12_33: type = ptr_type %T [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %x.param: @CallGenericPtr.%.1 (%.2) = param x, runtime_param0 +// CHECK:STDOUT: %x: @CallGenericPtr.%.1 (%.2) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc12_39: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc12_40: type = ptr_type %T [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %return: ref @CallGenericPtr.%.1 (%.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %CallSpecific.decl: %CallSpecific.type = fn_decl @CallSpecific [template = constants.%CallSpecific] { -// CHECK:STDOUT: %C.ref.loc18_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %x.loc18_17.1: %C = param x, runtime_param0 -// CHECK:STDOUT: @CallSpecific.%x: %C = bind_name x, %x.loc18_17.1 -// CHECK:STDOUT: %C.ref.loc18_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @CallSpecific.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc18_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %x.param: %C = param x, runtime_param0 +// CHECK:STDOUT: %x: %C = bind_name x, %x.param +// CHECK:STDOUT: %C.ref.loc18_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -143,7 +143,7 @@ fn CallSpecific(x: C) -> C { // CHECK:STDOUT: fn(%T.loc8: type, %x: @CallGeneric.%T.1 (%T)) -> @CallGeneric.%T.1 (%T) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Function.ref: %Function.type = name_ref Function, file.%Function.decl [template = constants.%Function] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc9: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %x.ref: @CallGeneric.%T.1 (%T) = name_ref x, %x // CHECK:STDOUT: %Function.call: init @CallGeneric.%T.1 (%T) = call %Function.ref(%x.ref) // CHECK:STDOUT: %.loc9_24.1: @CallGeneric.%T.1 (%T) = value_of_initializer %Function.call @@ -161,7 +161,7 @@ fn CallSpecific(x: C) -> C { // CHECK:STDOUT: fn(%T.loc12: type, %x: @CallGenericPtr.%.1 (%.2)) -> @CallGenericPtr.%.1 (%.2) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Function.ref: %Function.type = name_ref Function, file.%Function.decl [template = constants.%Function] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.loc13_20: type = ptr_type %T [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %x.ref: @CallGenericPtr.%.1 (%.2) = name_ref x, %x // CHECK:STDOUT: %Function.call: init @CallGenericPtr.%.1 (%.2) = call %Function.ref(%x.ref) @@ -174,7 +174,7 @@ fn CallSpecific(x: C) -> C { // CHECK:STDOUT: fn @CallSpecific(%x: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Function.ref: %Function.type = name_ref Function, file.%Function.decl [template = constants.%Function] -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %x.ref: %C = name_ref x, %x // CHECK:STDOUT: %.loc18: ref %C = splice_block %return {} // CHECK:STDOUT: %Function.call: init %C = call %Function.ref(%x.ref) to %.loc18 @@ -230,41 +230,41 @@ fn CallSpecific(x: C) -> C { // CHECK:STDOUT: .CallSpecific = %CallSpecific.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Function.decl: %Function.type = fn_decl @Function [template = constants.%Function] { -// CHECK:STDOUT: %T.loc4_13.1: type = param T, runtime_param -// CHECK:STDOUT: @Function.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_13.1 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4_26: type = name_ref T, @Function.%T.loc4 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc4_23.1: @Function.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @Function.%x: @Function.%T.1 (%T) = bind_name x, %x.loc4_23.1 -// CHECK:STDOUT: %T.ref.loc4_32: type = name_ref T, @Function.%T.loc4 [symbolic = @Function.%T.1 (constants.%T)] -// CHECK:STDOUT: @Function.%return: ref @Function.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc4_26: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @Function.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @Function.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc4_32: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @Function.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGeneric.decl: %CallGeneric.type = fn_decl @CallGeneric [template = constants.%CallGeneric] { -// CHECK:STDOUT: %T.loc8_16.1: type = param T, runtime_param -// CHECK:STDOUT: @CallGeneric.%T.loc8: type = bind_symbolic_name T 0, %T.loc8_16.1 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc8_29: type = name_ref T, @CallGeneric.%T.loc8 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc8_26.1: @CallGeneric.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @CallGeneric.%x: @CallGeneric.%T.1 (%T) = bind_name x, %x.loc8_26.1 -// CHECK:STDOUT: %T.ref.loc8_35: type = name_ref T, @CallGeneric.%T.loc8 [symbolic = @CallGeneric.%T.1 (constants.%T)] -// CHECK:STDOUT: @CallGeneric.%return: ref @CallGeneric.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc8_29: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @CallGeneric.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @CallGeneric.%T.1 (%T) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc8_35: type = name_ref T, %T.loc8 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @CallGeneric.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %CallGenericPtr.decl: %CallGenericPtr.type = fn_decl @CallGenericPtr [template = constants.%CallGenericPtr] { -// CHECK:STDOUT: %T.loc12_19.1: type = param T, runtime_param -// CHECK:STDOUT: @CallGenericPtr.%T.loc12: type = bind_symbolic_name T 0, %T.loc12_19.1 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc12_32: type = name_ref T, @CallGenericPtr.%T.loc12 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc12_33: type = ptr_type %T [symbolic = @CallGenericPtr.%.1 (constants.%.2)] -// CHECK:STDOUT: %x.loc12_29.1: @CallGenericPtr.%.1 (%.2) = param x, runtime_param0 -// CHECK:STDOUT: @CallGenericPtr.%x: @CallGenericPtr.%.1 (%.2) = bind_name x, %x.loc12_29.1 -// CHECK:STDOUT: %T.ref.loc12_39: type = name_ref T, @CallGenericPtr.%T.loc12 [symbolic = @CallGenericPtr.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc12_40: type = ptr_type %T [symbolic = @CallGenericPtr.%.1 (constants.%.2)] -// CHECK:STDOUT: @CallGenericPtr.%return: ref @CallGenericPtr.%.1 (%.2) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc12_32: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc12_33: type = ptr_type %T [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %x.param: @CallGenericPtr.%.1 (%.2) = param x, runtime_param0 +// CHECK:STDOUT: %x: @CallGenericPtr.%.1 (%.2) = bind_name x, %x.param +// CHECK:STDOUT: %T.ref.loc12_39: type = name_ref T, %T.loc12 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc12_40: type = ptr_type %T [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %return: ref @CallGenericPtr.%.1 (%.2) = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %CallSpecific.decl: %CallSpecific.type = fn_decl @CallSpecific [template = constants.%CallSpecific] { -// CHECK:STDOUT: %C.ref.loc18_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %x.loc18_17.1: %C = param x, runtime_param0 -// CHECK:STDOUT: @CallSpecific.%x: %C = bind_name x, %x.loc18_17.1 -// CHECK:STDOUT: %C.ref.loc18_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @CallSpecific.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc18_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %x.param: %C = param x, runtime_param0 +// CHECK:STDOUT: %x: %C = bind_name x, %x.param +// CHECK:STDOUT: %C.ref.loc18_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/fail_type_param_mismatch.carbon b/toolchain/check/testdata/function/generic/no_prelude/fail_type_param_mismatch.carbon index 33cc17d7a9282..68e5b14ee0c65 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/fail_type_param_mismatch.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/fail_type_param_mismatch.carbon @@ -32,10 +32,10 @@ fn F(T:! type, U:! type) { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %U.loc11_16.1: type = param U, runtime_param -// CHECK:STDOUT: @F.%U.loc11: type = bind_symbolic_name U 1, %U.loc11_16.1 [symbolic = @F.%U.1 (constants.%U)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc11: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/forward_decl.carbon b/toolchain/check/testdata/function/generic/no_prelude/forward_decl.carbon index bb24f7b0155cb..957d1ff0bf2c5 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/forward_decl.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/forward_decl.carbon @@ -24,8 +24,8 @@ fn F(T:! type); // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/indirect_generic_type.carbon b/toolchain/check/testdata/function/generic/no_prelude/indirect_generic_type.carbon index 9219af68f8a80..3298a4f0d14bf 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/indirect_generic_type.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/indirect_generic_type.carbon @@ -28,16 +28,16 @@ fn F(T:! type, p: T**) -> T* { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc11_19: type = name_ref T, @F.%T.loc11 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc11_20: type = ptr_type %T [symbolic = @F.%.1 (constants.%.1)] -// CHECK:STDOUT: %.loc11_21: type = ptr_type %.1 [symbolic = @F.%.2 (constants.%.2)] -// CHECK:STDOUT: %p.loc11_16.1: @F.%.2 (%.2) = param p, runtime_param0 -// CHECK:STDOUT: @F.%p: @F.%.2 (%.2) = bind_name p, %p.loc11_16.1 -// CHECK:STDOUT: %T.ref.loc11_27: type = name_ref T, @F.%T.loc11 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc11_28: type = ptr_type %T [symbolic = @F.%.1 (constants.%.1)] -// CHECK:STDOUT: @F.%return: ref @F.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc11_19: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc11_20: type = ptr_type %T [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %.loc11_21: type = ptr_type %.1 [symbolic = %.2 (constants.%.2)] +// CHECK:STDOUT: %p.param: @F.%.2 (%.2) = param p, runtime_param0 +// CHECK:STDOUT: %p: @F.%.2 (%.2) = bind_name p, %p.param +// CHECK:STDOUT: %T.ref.loc11_27: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc11_28: type = ptr_type %T [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @F.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/type_param.carbon b/toolchain/check/testdata/function/generic/no_prelude/type_param.carbon index e8ff1b7c1c002..edee6ab4eaada 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/type_param.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/type_param.carbon @@ -28,8 +28,8 @@ fn F(T:! type) { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/no_prelude/type_param_scope.carbon b/toolchain/check/testdata/function/generic/no_prelude/type_param_scope.carbon index bd42cf1bb25c3..73ce16efb0738 100644 --- a/toolchain/check/testdata/function/generic/no_prelude/type_param_scope.carbon +++ b/toolchain/check/testdata/function/generic/no_prelude/type_param_scope.carbon @@ -27,13 +27,13 @@ fn F(T:! type, n: T) -> T { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc11_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc11: type = bind_symbolic_name T 0, %T.loc11_6.1 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc11_19: type = name_ref T, @F.%T.loc11 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %n.loc11_16.1: @F.%T.1 (%T) = param n, runtime_param0 -// CHECK:STDOUT: @F.%n: @F.%T.1 (%T) = bind_name n, %n.loc11_16.1 -// CHECK:STDOUT: %T.ref.loc11_25: type = name_ref T, @F.%T.loc11 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: @F.%return: ref @F.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc11_19: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %n.param: @F.%T.1 (%T) = param n, runtime_param0 +// CHECK:STDOUT: %n: @F.%T.1 (%T) = bind_name n, %n.param +// CHECK:STDOUT: %T.ref.loc11_25: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @F.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -44,7 +44,7 @@ fn F(T:! type, n: T) -> T { // CHECK:STDOUT: // CHECK:STDOUT: fn(%T.loc11: type, %n: @F.%T.1 (%T)) -> @F.%T.1 (%T) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc12: type = name_ref T, %T.loc11 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %n.ref: @F.%T.1 (%T) = name_ref n, %n // CHECK:STDOUT: %m: @F.%T.1 (%T) = bind_name m, %n.ref // CHECK:STDOUT: %m.ref: @F.%T.1 (%T) = name_ref m, %m diff --git a/toolchain/check/testdata/function/generic/redeclare.carbon b/toolchain/check/testdata/function/generic/redeclare.carbon index bdea341e87339..1fbb31bf6c03e 100644 --- a/toolchain/check/testdata/function/generic/redeclare.carbon +++ b/toolchain/check/testdata/function/generic/redeclare.carbon @@ -119,22 +119,22 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl.loc4: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc4_6.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_6.2: type = bind_symbolic_name T 0, %T.loc4_6.1 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, %T.loc4_6.2 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = @F.%.1 (constants.%.1)] +// CHECK:STDOUT: %T.param.loc4: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = %.1 (constants.%.1)] // CHECK:STDOUT: %return.var.loc4: ref @F.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl.loc6: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc6_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc6: type = bind_symbolic_name T 0, %T.loc6_6.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref.loc6: type = name_ref T, @F.%T.loc6 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param.loc6: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param.loc6 [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref.loc6: type = name_ref T, %T.loc6 [symbolic = constants.%T] // CHECK:STDOUT: %.loc6: type = ptr_type %T [symbolic = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_6.2: type) { +// CHECK:STDOUT: generic fn @F(%T.loc4: type) { // CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %.1: type = ptr_type @F.%T.1 (%T) [symbolic = %.1 (constants.%.1)] // CHECK:STDOUT: @@ -143,7 +143,7 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: fn(%T.loc6: type) -> %.1 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl.loc4 [template = constants.%F] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref.loc7: type = name_ref T, %T.loc6 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: %F.call: init @F.%.1 (%.1) = call %F.ref() // CHECK:STDOUT: %.loc7_14.1: @F.%.1 (%.1) = value_of_initializer %F.call // CHECK:STDOUT: %.loc7_14.2: @F.%.1 (%.1) = converted %F.call, %.loc7_14.1 @@ -190,22 +190,22 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc4_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_6.1 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %U.loc4_16.1: type = param U, runtime_param -// CHECK:STDOUT: @F.%U.loc4: type = bind_symbolic_name U 1, %U.loc4_16.1 [symbolic = @F.%U.1 (constants.%U)] -// CHECK:STDOUT: %T.ref: type = name_ref T, @F.%T.loc4 [symbolic = @F.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = @F.%.1 (constants.%.1)] -// CHECK:STDOUT: @F.%return: ref @F.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc4: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @F.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %T.loc13_6.1: type = param T, runtime_param -// CHECK:STDOUT: @.1.%T.loc13: type = bind_symbolic_name T 0, %T.loc13_6.1 [symbolic = @.1.%T.1 (constants.%T)] -// CHECK:STDOUT: %U.loc13_16.1: type = param U, runtime_param -// CHECK:STDOUT: @.1.%U.loc13: type = bind_symbolic_name U 1, %U.loc13_16.1 [symbolic = @.1.%U.1 (constants.%U)] -// CHECK:STDOUT: %U.ref: type = name_ref U, @.1.%U.loc13 [symbolic = @.1.%U.1 (constants.%U)] -// CHECK:STDOUT: %.loc13: type = ptr_type %U [symbolic = @.1.%.1 (constants.%.3)] -// CHECK:STDOUT: @.1.%return: ref @.1.%.1 (%.3) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc13: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc13: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc13 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %.loc13: type = ptr_type %U [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %return: ref @.1.%.1 (%.3) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -280,22 +280,22 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc4_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_6.1 [symbolic = @F.%T.1 (constants.%T.1)] -// CHECK:STDOUT: %U.loc4_16.1: type = param U, runtime_param -// CHECK:STDOUT: @F.%U.loc4: type = bind_symbolic_name U 1, %U.loc4_16.1 [symbolic = @F.%U.1 (constants.%U.1)] -// CHECK:STDOUT: %T.ref.loc4: type = name_ref T, @F.%T.loc4 [symbolic = @F.%T.1 (constants.%T.1)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T.1 [symbolic = @F.%.1 (constants.%.1)] -// CHECK:STDOUT: @F.%return: ref @F.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc4: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U.1)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T.1 [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @F.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %U.loc13_6.1: type = param U, runtime_param -// CHECK:STDOUT: @.1.%U.loc13: type = bind_symbolic_name U 0, %U.loc13_6.1 [symbolic = @.1.%U.1 (constants.%U.2)] -// CHECK:STDOUT: %T.loc13_16.1: type = param T, runtime_param -// CHECK:STDOUT: @.1.%T.loc13: type = bind_symbolic_name T 1, %T.loc13_16.1 [symbolic = @.1.%T.1 (constants.%T.2)] -// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, @.1.%T.loc13 [symbolic = @.1.%T.1 (constants.%T.2)] -// CHECK:STDOUT: %.loc13: type = ptr_type %T.2 [symbolic = @.1.%.1 (constants.%.3)] -// CHECK:STDOUT: @.1.%return: ref @.1.%.1 (%.3) = var +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc13: type = bind_symbolic_name U 0, %U.param [symbolic = %U.1 (constants.%U.2)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc13: type = bind_symbolic_name T 1, %T.param [symbolic = %T.1 (constants.%T.2)] +// CHECK:STDOUT: %T.ref.loc13: type = name_ref T, %T.loc13 [symbolic = %T.1 (constants.%T.2)] +// CHECK:STDOUT: %.loc13: type = ptr_type %T.2 [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %return: ref @.1.%.1 (%.3) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -317,7 +317,7 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: fn(%U.loc13: type, %T.loc13: type) -> @.1.%.1 (%.3) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [template = constants.%F] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc13 [symbolic = %T.1 (constants.%T.2)] +// CHECK:STDOUT: %T.ref.loc21: type = name_ref T, %T.loc13 [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -370,22 +370,22 @@ fn F(U:! type, T:! type) -> U* { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc4_6.1: type = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc4: type = bind_symbolic_name T 0, %T.loc4_6.1 [symbolic = @F.%T.1 (constants.%T.1)] -// CHECK:STDOUT: %U.loc4_16.1: type = param U, runtime_param -// CHECK:STDOUT: @F.%U.loc4: type = bind_symbolic_name U 1, %U.loc4_16.1 [symbolic = @F.%U.1 (constants.%U.1)] -// CHECK:STDOUT: %T.ref: type = name_ref T, @F.%T.loc4 [symbolic = @F.%T.1 (constants.%T.1)] -// CHECK:STDOUT: %.loc4: type = ptr_type %T.1 [symbolic = @F.%.1 (constants.%.1)] -// CHECK:STDOUT: @F.%return: ref @F.%.1 (%.1) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc4: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U.1)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc4 [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %.loc4: type = ptr_type %T.1 [symbolic = %.1 (constants.%.1)] +// CHECK:STDOUT: %return: ref @F.%.1 (%.1) = var // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %U.loc13_6.1: type = param U, runtime_param -// CHECK:STDOUT: @.1.%U.loc13: type = bind_symbolic_name U 0, %U.loc13_6.1 [symbolic = @.1.%U.1 (constants.%U.2)] -// CHECK:STDOUT: %T.loc13_16.1: type = param T, runtime_param -// CHECK:STDOUT: @.1.%T.loc13: type = bind_symbolic_name T 1, %T.loc13_16.1 [symbolic = @.1.%T.1 (constants.%T.2)] -// CHECK:STDOUT: %U.ref: type = name_ref U, @.1.%U.loc13 [symbolic = @.1.%U.1 (constants.%U.2)] -// CHECK:STDOUT: %.loc13: type = ptr_type %U.2 [symbolic = @.1.%.1 (constants.%.3)] -// CHECK:STDOUT: @.1.%return: ref @.1.%.1 (%.3) = var +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc13: type = bind_symbolic_name U 0, %U.param [symbolic = %U.1 (constants.%U.2)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc13: type = bind_symbolic_name T 1, %T.param [symbolic = %T.1 (constants.%T.2)] +// CHECK:STDOUT: %U.ref: type = name_ref U, %U.loc13 [symbolic = %U.1 (constants.%U.2)] +// CHECK:STDOUT: %.loc13: type = ptr_type %U.2 [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %return: ref @.1.%.1 (%.3) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index 9812224df91e3..2fb05f0b087c4 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -79,24 +79,24 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Wrap.decl: %Wrap.type = class_decl @Wrap [template = constants.%Wrap.1] { -// CHECK:STDOUT: %T.loc11_12.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_12.2: type = bind_symbolic_name T 0, %T.loc11_12.1 [symbolic = @Wrap.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @Wrap(file.%T.loc11_12.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @Wrap(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %Make.type: type = fn_type @Make, @Wrap(%T) [symbolic = %Make.type (constants.%Make.type.1)] +// CHECK:STDOUT: %Make.type: type = fn_type @Make, @Wrap(%T.1) [symbolic = %Make.type (constants.%Make.type.1)] // CHECK:STDOUT: %Make: @Wrap.%Make.type (%Make.type.1) = struct_value () [symbolic = %Make (constants.%Make.1)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %Make.decl: @Wrap.%Make.type (%Make.type.1) = fn_decl @Make [symbolic = %Make (constants.%Make.1)] { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc11_12.2 [symbolic = @Make.%T (constants.%T)] -// CHECK:STDOUT: %return.var: ref @Make.%T (%T) = var +// CHECK:STDOUT: %Make.decl: @Wrap.%Make.type (%Make.type.1) = fn_decl @Make [symbolic = @Wrap.%Make (constants.%Make.1)] { +// CHECK:STDOUT: %T.ref: type = name_ref T, @Wrap.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @Make.%T (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -118,7 +118,7 @@ fn G() { // CHECK:STDOUT: .arr = %.loc15_18 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Make(file.%T.loc11_12.2: type) { +// CHECK:STDOUT: generic fn @Make(@Wrap.%T.loc11: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: fn() -> @Make.%T (%T); @@ -169,19 +169,19 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Wrap(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Make(constants.%T) { // CHECK:STDOUT: %T => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Wrap(@Wrap.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Wrap(@Wrap.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Wrap(i32) { -// CHECK:STDOUT: %T => i32 +// CHECK:STDOUT: %T.1 => i32 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Make.type => constants.%Make.type.2 @@ -193,7 +193,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Wrap(constants.%.1) { -// CHECK:STDOUT: %T => constants.%.1 +// CHECK:STDOUT: %T.1 => constants.%.1 // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Make.type => constants.%Make.type.3 @@ -205,7 +205,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Wrap(constants.%C) { -// CHECK:STDOUT: %T => constants.%C +// CHECK:STDOUT: %T.1 => constants.%C // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %Make.type => constants.%Make.type.4 diff --git a/toolchain/check/testdata/global/class_with_fun.carbon b/toolchain/check/testdata/global/class_with_fun.carbon index 22f4918de2f77..d2bdfcd1fb717 100644 --- a/toolchain/check/testdata/global/class_with_fun.carbon +++ b/toolchain/check/testdata/global/class_with_fun.carbon @@ -50,10 +50,10 @@ var a: A = {}; // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %ret_a.decl: %ret_a.type = fn_decl @ret_a [template = constants.%ret_a] { -// CHECK:STDOUT: %A.ref.loc12: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: @ret_a.%return: ref %A = var +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %return: ref %A = var // CHECK:STDOUT: } -// CHECK:STDOUT: %A.ref.loc16: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %a.var: ref %A = var a // CHECK:STDOUT: %a: ref %A = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/simple_with_fun.carbon b/toolchain/check/testdata/global/simple_with_fun.carbon index 9e837fc033f56..c0267063007d1 100644 --- a/toolchain/check/testdata/global/simple_with_fun.carbon +++ b/toolchain/check/testdata/global/simple_with_fun.carbon @@ -48,14 +48,14 @@ var a: i32 = test_a(); // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %test_a.decl: %test_a.type = fn_decl @test_a [template = constants.%test_a] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_16.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_16.2: type = converted %int.make_type_32.loc11, %.loc11_16.1 [template = i32] -// CHECK:STDOUT: @test_a.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_16.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_16.2: type = converted %int.make_type_32, %.loc11_16.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_8.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_8.2: type = converted %int.make_type_32.loc15, %.loc15_8.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_8.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_8.2: type = converted %int.make_type_32, %.loc15_8.1 [template = i32] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 3b1e05d49efb1..aff8ff97513e2 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -68,8 +68,8 @@ fn If(b: bool) { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc15_10.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc15_10.2: type = converted %bool.make_type, %.loc15_10.1 [template = bool] -// CHECK:STDOUT: %b.loc15_7.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc15_7.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index c26de406fc7a2..bbae27cde9dac 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -83,37 +83,37 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %If1.decl: %If1.type = fn_decl @If1 [template = constants.%If1] { -// CHECK:STDOUT: %bool.make_type.loc11: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type.loc11 [template = bool] -// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type.loc11, %.loc11_11.1 [template = bool] -// CHECK:STDOUT: %b.loc11_8.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If1.%b: bool = bind_name b, %b.loc11_8.1 -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_20.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_20.2: type = converted %int.make_type_32.loc11, %.loc11_20.1 [template = i32] -// CHECK:STDOUT: @If1.%return: ref i32 = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type, %.loc11_11.1 [template = bool] +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_20.2: type = converted %int.make_type_32, %.loc11_20.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %If2.decl: %If2.type = fn_decl @If2 [template = constants.%If2] { -// CHECK:STDOUT: %bool.make_type.loc22: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc22_11.1: type = value_of_initializer %bool.make_type.loc22 [template = bool] -// CHECK:STDOUT: %.loc22_11.2: type = converted %bool.make_type.loc22, %.loc22_11.1 [template = bool] -// CHECK:STDOUT: %b.loc22_8.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If2.%b: bool = bind_name b, %b.loc22_8.1 -// CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc22_20.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] -// CHECK:STDOUT: %.loc22_20.2: type = converted %int.make_type_32.loc22, %.loc22_20.1 [template = i32] -// CHECK:STDOUT: @If2.%return: ref i32 = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc22_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc22_11.2: type = converted %bool.make_type, %.loc22_11.1 [template = bool] +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc22_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc22_20.2: type = converted %int.make_type_32, %.loc22_20.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %If3.decl: %If3.type = fn_decl @If3 [template = constants.%If3] { -// CHECK:STDOUT: %bool.make_type.loc33: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc33_11.1: type = value_of_initializer %bool.make_type.loc33 [template = bool] -// CHECK:STDOUT: %.loc33_11.2: type = converted %bool.make_type.loc33, %.loc33_11.1 [template = bool] -// CHECK:STDOUT: %b.loc33_8.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If3.%b: bool = bind_name b, %b.loc33_8.1 -// CHECK:STDOUT: %int.make_type_32.loc33: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc33_20.1: type = value_of_initializer %int.make_type_32.loc33 [template = i32] -// CHECK:STDOUT: %.loc33_20.2: type = converted %int.make_type_32.loc33, %.loc33_20.1 [template = i32] -// CHECK:STDOUT: @If3.%return: ref i32 = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc33_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc33_11.2: type = converted %bool.make_type, %.loc33_11.1 [template = bool] +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc33_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc33_20.2: type = converted %int.make_type_32, %.loc33_20.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 8e38708fb2a70..d027291cdb59e 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -59,12 +59,12 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_16.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_16.2: type = converted %bool.make_type, %.loc11_16.1 [template = bool] -// CHECK:STDOUT: %b.loc11_13.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @VarScope.%b: bool = bind_name b, %b.loc11_13.1 -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_25.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_25.2: type = converted %int.make_type_32, %.loc11_25.1 [template = i32] -// CHECK:STDOUT: @VarScope.%return: ref i32 = var +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_25.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_25.2: type = converted %int.make_type_32.loc11, %.loc11_25.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -78,9 +78,9 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: if %b.ref br !if.then else br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.then: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_12.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc13_12.2: type = converted %int.make_type_32, %.loc13_12.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_12.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] +// CHECK:STDOUT: %.loc13_12.2: type = converted %int.make_type_32.loc13, %.loc13_12.1 [template = i32] // CHECK:STDOUT: %n.var: ref i32 = var n // CHECK:STDOUT: %n: ref i32 = bind_name n, %n.var // CHECK:STDOUT: %.loc13_18: i32 = int_literal 2 [template = constants.%.2] diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 947e9d8e9b6c5..23e62094857cc 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -61,8 +61,8 @@ fn If(b: bool) { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc14_10.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc14_10.2: type = converted %bool.make_type, %.loc14_10.1 [template = bool] -// CHECK:STDOUT: %b.loc14_7.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc14_7.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index d533ae62c88b5..f31b883eaee7e 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -58,12 +58,12 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_10.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_10.2: type = converted %bool.make_type, %.loc11_10.1 [template = bool] -// CHECK:STDOUT: %b.loc11_7.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc11_7.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: @If.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 8fca5de0bc759..05908f5c20688 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -58,22 +58,22 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_9.2: type = converted %bool.make_type, %.loc11_9.1 [template = bool] -// CHECK:STDOUT: %b.loc11_6.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc11_6.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc11_18: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_18.1: type = value_of_initializer %int.make_type_32.loc11_18 [template = i32] // CHECK:STDOUT: %.loc11_18.2: type = converted %int.make_type_32.loc11_18, %.loc11_18.1 [template = i32] -// CHECK:STDOUT: %n.loc11_15.1: i32 = param n, runtime_param1 -// CHECK:STDOUT: @F.%n: i32 = bind_name n, %n.loc11_15.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param1 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %int.make_type_32.loc11_26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_26.1: type = value_of_initializer %int.make_type_32.loc11_26 [template = i32] // CHECK:STDOUT: %.loc11_26.2: type = converted %int.make_type_32.loc11_26, %.loc11_26.1 [template = i32] -// CHECK:STDOUT: %m.loc11_23.1: i32 = param m, runtime_param2 -// CHECK:STDOUT: @F.%m: i32 = bind_name m, %m.loc11_23.1 +// CHECK:STDOUT: %m.param: i32 = param m, runtime_param2 +// CHECK:STDOUT: %m: i32 = bind_name m, %m.param // CHECK:STDOUT: %int.make_type_32.loc11_34: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_34.1: type = value_of_initializer %int.make_type_32.loc11_34 [template = i32] // CHECK:STDOUT: %.loc11_34.2: type = converted %int.make_type_32.loc11_34, %.loc11_34.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -83,10 +83,10 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%b: bool, %n: i32, %m: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_16: i32 = int_literal 1 [template = constants.%.2] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32, %.loc12_11.1 [template = i32] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32.loc12, %.loc12_11.1 [template = i32] // CHECK:STDOUT: %.loc12_17: type = array_type %.loc12_16, i32 [template = constants.%.3] // CHECK:STDOUT: %x.var: ref %.3 = var x // CHECK:STDOUT: %x: ref %.3 = bind_name x, %x.var diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index c1850229ecd0d..c5b0410977826 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -83,42 +83,42 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @A.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32.loc12, %.loc12_11.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32, %.loc12_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_11.2: type = converted %int.make_type_32.loc14, %.loc14_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_11.2: type = converted %int.make_type_32, %.loc14_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_11.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] -// CHECK:STDOUT: %.loc18_11.2: type = converted %int.make_type_32.loc18, %.loc18_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc18_11.2: type = converted %int.make_type_32, %.loc18_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Constant.decl: %Constant.type = fn_decl @Constant [template = constants.%Constant] { // CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_18.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] // CHECK:STDOUT: %.loc22_18.2: type = converted %int.make_type_32.loc22, %.loc22_18.1 [template = i32] -// CHECK:STDOUT: @Constant.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %PartiallyConstant.decl: %PartiallyConstant.type = fn_decl @PartiallyConstant [template = constants.%PartiallyConstant] { -// CHECK:STDOUT: %t.loc28_22.1: type = param t, runtime_param0 -// CHECK:STDOUT: @PartiallyConstant.%t: type = bind_name t, %t.loc28_22.1 +// CHECK:STDOUT: %t.param: type = param t, runtime_param0 +// CHECK:STDOUT: %t: type = bind_name t, %t.param // CHECK:STDOUT: %int.make_type_32.loc28: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc28_34.1: type = value_of_initializer %int.make_type_32.loc28 [template = i32] // CHECK:STDOUT: %.loc28_34.2: type = converted %int.make_type_32.loc28, %.loc28_34.1 [template = i32] -// CHECK:STDOUT: @PartiallyConstant.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -126,14 +126,14 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: i32 = int_literal 1 [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_24: i32 = int_literal 1 [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc12: i32 = int_literal 2 [template = constants.%.3] -// CHECK:STDOUT: return %.loc12 +// CHECK:STDOUT: %.loc12_24: i32 = int_literal 2 [template = constants.%.3] +// CHECK:STDOUT: return %.loc12_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index e3bc9244c5190..ebfddf6d9eede 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -59,27 +59,27 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @A.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { -// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] -// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32.loc12, %.loc12_11.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc12_11.2: type = converted %int.make_type_32, %.loc12_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc14_9.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc14_9.2: type = converted %bool.make_type, %.loc14_9.1 [template = bool] -// CHECK:STDOUT: %b.loc14_6.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc14_6.1 -// CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc14_18.1: type = value_of_initializer %int.make_type_32.loc14 [template = i32] -// CHECK:STDOUT: %.loc14_18.2: type = converted %int.make_type_32.loc14, %.loc14_18.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc14_18.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc14_18.2: type = converted %int.make_type_32, %.loc14_18.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -87,14 +87,14 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: i32 = int_literal 1 [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_24: i32 = int_literal 1 [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc12: i32 = int_literal 2 [template = constants.%.3] -// CHECK:STDOUT: return %.loc12 +// CHECK:STDOUT: %.loc12_24: i32 = int_literal 2 [template = constants.%.3] +// CHECK:STDOUT: return %.loc12_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; diff --git a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon index 7f6033a4a4402..012e71743ea73 100644 --- a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon +++ b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon @@ -79,8 +79,8 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc4_30.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc4_30.2: type = converted %bool.make_type, %.loc4_30.1 [template = bool] -// CHECK:STDOUT: %b.loc4_27.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @ConditionIsNonConstant.%b: bool = bind_name b, %b.loc4_27.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -149,8 +149,8 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ChosenBranchIsNonConstant.decl: %ChosenBranchIsNonConstant.type = fn_decl @ChosenBranchIsNonConstant [template = constants.%ChosenBranchIsNonConstant] { -// CHECK:STDOUT: %t.loc4_30.1: type = param t, runtime_param0 -// CHECK:STDOUT: @ChosenBranchIsNonConstant.%t: type = bind_name t, %t.loc4_30.1 +// CHECK:STDOUT: %t.param: type = param t, runtime_param0 +// CHECK:STDOUT: %t: type = bind_name t, %t.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index ae082feb01102..df046b0a95454 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -55,22 +55,22 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: %bool.make_type.loc11_9: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %bool.make_type.loc11_9 [template = bool] // CHECK:STDOUT: %.loc11_9.2: type = converted %bool.make_type.loc11_9, %.loc11_9.1 [template = bool] -// CHECK:STDOUT: %a.loc11_6.1: bool = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: bool = bind_name a, %a.loc11_6.1 +// CHECK:STDOUT: %a.param: bool = param a, runtime_param0 +// CHECK:STDOUT: %a: bool = bind_name a, %a.param // CHECK:STDOUT: %bool.make_type.loc11_18: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_18.1: type = value_of_initializer %bool.make_type.loc11_18 [template = bool] // CHECK:STDOUT: %.loc11_18.2: type = converted %bool.make_type.loc11_18, %.loc11_18.1 [template = bool] -// CHECK:STDOUT: %b.loc11_15.1: bool = param b, runtime_param1 -// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc11_15.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param1 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc11_27: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_27.1: type = value_of_initializer %bool.make_type.loc11_27 [template = bool] // CHECK:STDOUT: %.loc11_27.2: type = converted %bool.make_type.loc11_27, %.loc11_27.1 [template = bool] -// CHECK:STDOUT: %c.loc11_24.1: bool = param c, runtime_param2 -// CHECK:STDOUT: @F.%c: bool = bind_name c, %c.loc11_24.1 +// CHECK:STDOUT: %c.param: bool = param c, runtime_param2 +// CHECK:STDOUT: %c: bool = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_36.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_36.2: type = converted %int.make_type_32, %.loc11_36.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 63091dbe81f5e..0057f03d17597 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -66,15 +66,15 @@ fn F(cond: bool) { // CHECK:STDOUT: %.loc11_23.1: type = value_of_initializer %int.make_type_32.loc11_23 [template = i32] // CHECK:STDOUT: %.loc11_23.2: type = converted %int.make_type_32.loc11_23, %.loc11_23.1 [template = i32] // CHECK:STDOUT: %.loc11_26: type = struct_type {.a: i32, .b: i32} [template = constants.%.2] -// CHECK:STDOUT: %s.loc11_6.1: %.2 = param s, runtime_param0 -// CHECK:STDOUT: @G.%s: %.2 = bind_name s, %s.loc11_6.1 +// CHECK:STDOUT: %s.param: %.2 = param s, runtime_param0 +// CHECK:STDOUT: %s: %.2 = bind_name s, %s.param // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc13_12.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc13_12.2: type = converted %bool.make_type, %.loc13_12.1 [template = bool] -// CHECK:STDOUT: %cond.loc13_6.1: bool = param cond, runtime_param0 -// CHECK:STDOUT: @F.%cond: bool = bind_name cond, %cond.loc13_6.1 +// CHECK:STDOUT: %cond.param: bool = param cond, runtime_param0 +// CHECK:STDOUT: %cond: bool = bind_name cond, %cond.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/compound.carbon b/toolchain/check/testdata/impl/compound.carbon index 47095c05bc326..99cdec75089cb 100644 --- a/toolchain/check/testdata/impl/compound.carbon +++ b/toolchain/check/testdata/impl/compound.carbon @@ -93,40 +93,40 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_6.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] -// CHECK:STDOUT: %.loc16_6.2: type = converted %int.make_type_32.loc16, %.loc16_6.1 [template = i32] -// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc16_6.2: type = converted %int.make_type_32, %.loc16_6.1 [template = i32] +// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: %NonInstanceCall.decl: %NonInstanceCall.type = fn_decl @NonInstanceCall [template = constants.%NonInstanceCall] { -// CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc21_23.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] -// CHECK:STDOUT: %.loc21_23.2: type = converted %int.make_type_32.loc21, %.loc21_23.1 [template = i32] -// CHECK:STDOUT: %n.loc21_20.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @NonInstanceCall.%n: i32 = bind_name n, %n.loc21_20.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc21_23.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc21_23.2: type = converted %int.make_type_32, %.loc21_23.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %InstanceCall.decl: %InstanceCall.type = fn_decl @InstanceCall [template = constants.%InstanceCall] { -// CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc25_20.1: type = value_of_initializer %int.make_type_32.loc25 [template = i32] -// CHECK:STDOUT: %.loc25_20.2: type = converted %int.make_type_32.loc25, %.loc25_20.1 [template = i32] -// CHECK:STDOUT: %n.loc25_17.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @InstanceCall.%n: i32 = bind_name n, %n.loc25_17.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc25_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc25_20.2: type = converted %int.make_type_32, %.loc25_20.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %NonInstanceCallIndirect.decl: %NonInstanceCallIndirect.type = fn_decl @NonInstanceCallIndirect [template = constants.%NonInstanceCallIndirect] { -// CHECK:STDOUT: %int.make_type_32.loc29: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc29_34.1: type = value_of_initializer %int.make_type_32.loc29 [template = i32] -// CHECK:STDOUT: %.loc29_34.2: type = converted %int.make_type_32.loc29, %.loc29_34.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc29_34.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc29_34.2: type = converted %int.make_type_32, %.loc29_34.1 [template = i32] // CHECK:STDOUT: %.loc29_34.3: type = ptr_type i32 [template = constants.%.8] -// CHECK:STDOUT: %p.loc29_28.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @NonInstanceCallIndirect.%p: %.8 = bind_name p, %p.loc29_28.1 +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: %InstanceCallIndirect.decl: %InstanceCallIndirect.type = fn_decl @InstanceCallIndirect [template = constants.%InstanceCallIndirect] { -// CHECK:STDOUT: %int.make_type_32.loc33: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc33_31.1: type = value_of_initializer %int.make_type_32.loc33 [template = i32] -// CHECK:STDOUT: %.loc33_31.2: type = converted %int.make_type_32.loc33, %.loc33_31.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc33_31.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc33_31.2: type = converted %int.make_type_32, %.loc33_31.1 [template = i32] // CHECK:STDOUT: %.loc33_31.3: type = ptr_type i32 [template = constants.%.8] -// CHECK:STDOUT: %p.loc33_25.1: %.8 = param p, runtime_param0 -// CHECK:STDOUT: @InstanceCallIndirect.%p: %.8 = bind_name p, %p.loc33_25.1 +// CHECK:STDOUT: %p.param: %.8 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.8 = bind_name p, %p.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -135,18 +135,18 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] {} // CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: %G.decl: %G.type.1 = fn_decl @G.1 [template = constants.%G.1] { -// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, %Self [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_14.1: type = facet_type_access %Self.ref [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_14.2: type = converted %Self.ref, %.loc13_14.1 [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc13_8.1: @G.1.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_8.2: @G.1.%Self (%Self) = bind_name self, %self.loc13_8.1 +// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, @Simple.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_14.1: type = facet_type_access %Self.ref [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_14.2: type = converted %Self.ref, %.loc13_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @G.1.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @G.1.%Self (%Self) = bind_name self, %self.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc13_21: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] +// CHECK:STDOUT: %.loc13: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %.loc12 -// CHECK:STDOUT: .G = %.loc13_21 +// CHECK:STDOUT: .G = %.loc13 // CHECK:STDOUT: witness = (%F.decl, %G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -156,15 +156,15 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc18_14.2: type = converted %int.make_type_32, %.loc18_14.1 [template = i32] -// CHECK:STDOUT: %self.loc18_8.1: i32 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_8.2: i32 = bind_name self, %self.loc18_8.1 +// CHECK:STDOUT: %self.param: i32 = param self, runtime_param0 +// CHECK:STDOUT: %self: i32 = bind_name self, %self.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc16: = interface_witness (%F.decl, %G.decl) [template = constants.%.7] +// CHECK:STDOUT: %.loc16_20: = interface_witness (%F.decl, %G.decl) [template = constants.%.7] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: .G = %G.decl -// CHECK:STDOUT: witness = %.loc16 +// CHECK:STDOUT: witness = %.loc16_20 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.1(@Simple.%Self: %.1) { @@ -175,21 +175,21 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: generic fn @G.1(@Simple.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Simple.%self.loc13_8.2: @G.1.%Self (%Self)](); +// CHECK:STDOUT: fn[%self: @G.1.%Self (%Self)](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(); // CHECK:STDOUT: -// CHECK:STDOUT: fn @G.2[@impl.%self.loc18_8.2: i32](); +// CHECK:STDOUT: fn @G.2[%self: i32](); // CHECK:STDOUT: // CHECK:STDOUT: fn @NonInstanceCall(%n: i32) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %n.ref: i32 = name_ref n, %n // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: %F.ref: %.3 = name_ref F, @Simple.%.loc12 [template = constants.%.4] -// CHECK:STDOUT: %.loc22: %F.type.1 = interface_witness_access @impl.%.loc16, element0 [template = constants.%F.2] +// CHECK:STDOUT: %.loc22: %F.type.1 = interface_witness_access @impl.%.loc16_20, element0 [template = constants.%F.2] // CHECK:STDOUT: %F.call: init %.2 = call %.loc22() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -198,8 +198,8 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %n.ref: i32 = name_ref n, %n // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] -// CHECK:STDOUT: %G.ref: %.5 = name_ref G, @Simple.%.loc13_21 [template = constants.%.6] -// CHECK:STDOUT: %.loc26_4.1: %G.type.1 = interface_witness_access @impl.%.loc16, element1 [template = constants.%G.2] +// CHECK:STDOUT: %G.ref: %.5 = name_ref G, @Simple.%.loc13 [template = constants.%.6] +// CHECK:STDOUT: %.loc26_4.1: %G.type.1 = interface_witness_access @impl.%.loc16_20, element1 [template = constants.%G.2] // CHECK:STDOUT: %.loc26_4.2: = bound_method %n.ref, %.loc26_4.1 // CHECK:STDOUT: %G.call: init %.2 = call %.loc26_4.2(%n.ref) // CHECK:STDOUT: return @@ -211,7 +211,7 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: %F.ref: %.3 = name_ref F, @Simple.%.loc12 [template = constants.%.4] // CHECK:STDOUT: %.loc30_4.1: ref i32 = deref %p.ref -// CHECK:STDOUT: %.loc30_4.2: %F.type.1 = interface_witness_access @impl.%.loc16, element0 [template = constants.%F.2] +// CHECK:STDOUT: %.loc30_4.2: %F.type.1 = interface_witness_access @impl.%.loc16_20, element0 [template = constants.%F.2] // CHECK:STDOUT: %F.call: init %.2 = call %.loc30_4.2() // CHECK:STDOUT: return // CHECK:STDOUT: } @@ -220,9 +220,9 @@ fn InstanceCallIndirect(p: i32*) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %p.ref: %.8 = name_ref p, %p // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] -// CHECK:STDOUT: %G.ref: %.5 = name_ref G, @Simple.%.loc13_21 [template = constants.%.6] +// CHECK:STDOUT: %G.ref: %.5 = name_ref G, @Simple.%.loc13 [template = constants.%.6] // CHECK:STDOUT: %.loc34_4.1: ref i32 = deref %p.ref -// CHECK:STDOUT: %.loc34_4.2: %G.type.1 = interface_witness_access @impl.%.loc16, element1 [template = constants.%G.2] +// CHECK:STDOUT: %.loc34_4.2: %G.type.1 = interface_witness_access @impl.%.loc16_20, element1 [template = constants.%G.2] // CHECK:STDOUT: %.loc34_4.3: = bound_method %.loc34_4.1, %.loc34_4.2 // CHECK:STDOUT: %.loc34_4.4: i32 = bind_value %.loc34_4.1 // CHECK:STDOUT: %G.call: init %.2 = call %.loc34_4.3(%.loc34_4.4) diff --git a/toolchain/check/testdata/impl/declaration.carbon b/toolchain/check/testdata/impl/declaration.carbon index 154e6f3ff4281..26e307467948f 100644 --- a/toolchain/check/testdata/impl/declaration.carbon +++ b/toolchain/check/testdata/impl/declaration.carbon @@ -48,7 +48,7 @@ impl i32 as I; // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_6.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc13_6.2: type = converted %int.make_type_32, %.loc13_6.1 [template = i32] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/empty.carbon b/toolchain/check/testdata/impl/empty.carbon index 4093e7ddc059c..cafcc05a1a0bd 100644 --- a/toolchain/check/testdata/impl/empty.carbon +++ b/toolchain/check/testdata/impl/empty.carbon @@ -51,7 +51,7 @@ impl i32 as Empty { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_6.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc14_6.2: type = converted %int.make_type_32, %.loc14_6.1 [template = i32] -// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] +// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, file.%Empty.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -64,10 +64,10 @@ impl i32 as Empty { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as %.1 { -// CHECK:STDOUT: %.loc14: = interface_witness () [template = constants.%.3] +// CHECK:STDOUT: %.loc14_19: = interface_witness () [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc14 +// CHECK:STDOUT: witness = %.loc14_19 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; diff --git a/toolchain/check/testdata/impl/extend_impl.carbon b/toolchain/check/testdata/impl/extend_impl.carbon index d178cc9fa832b..1b88d29c2dfe0 100644 --- a/toolchain/check/testdata/impl/extend_impl.carbon +++ b/toolchain/check/testdata/impl/extend_impl.carbon @@ -67,9 +67,9 @@ fn G(c: C) { // CHECK:STDOUT: %HasF.decl: type = interface_decl @HasF [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %c.loc21_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: %C = bind_name c, %c.loc21_6.1 +// CHECK:STDOUT: %C.ref.loc21: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -115,7 +115,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%c: %C) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %F.ref.loc22: %.3 = name_ref F, @HasF.%.loc12 [template = constants.%.4] // CHECK:STDOUT: %.loc22: %F.type.1 = interface_witness_access @impl.%.loc16, element0 [template = constants.%F.2] // CHECK:STDOUT: %F.call.loc22: init %.2 = call %.loc22() diff --git a/toolchain/check/testdata/impl/fail_call_invalid.carbon b/toolchain/check/testdata/impl/fail_call_invalid.carbon index afd292f6d83ef..70446ceca672f 100644 --- a/toolchain/check/testdata/impl/fail_call_invalid.carbon +++ b/toolchain/check/testdata/impl/fail_call_invalid.carbon @@ -65,66 +65,66 @@ fn InstanceCall(n: i32) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32.loc15, %.loc15_6.1 [template = i32] -// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32, %.loc15_6.1 [template = i32] +// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: %InstanceCall.decl: %InstanceCall.type = fn_decl @InstanceCall [template = constants.%InstanceCall] { -// CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc22_20.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] -// CHECK:STDOUT: %.loc22_20.2: type = converted %int.make_type_32.loc22, %.loc22_20.1 [template = i32] -// CHECK:STDOUT: %n.loc22_17.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @InstanceCall.%n: i32 = bind_name n, %n.loc22_17.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc22_20.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc22_20.2: type = converted %int.make_type_32, %.loc22_20.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Simple { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %G.decl: %G.type.1 = fn_decl @G.1 [template = constants.%G.1] { -// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, %Self [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref, %.loc12_14.1 [symbolic = @G.1.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc12_8.1: @G.1.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: @G.1.%Self (%Self) = bind_name self, %self.loc12_8.1 +// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, @Simple.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref, %.loc12_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @G.1.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @G.1.%Self (%Self) = bind_name self, %self.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12_21: %.3 = assoc_entity element0, %G.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %G.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .G = %.loc12_21 +// CHECK:STDOUT: .G = %.loc12 // CHECK:STDOUT: witness = (%G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as %.1 { // CHECK:STDOUT: %G.decl: %G.type.2 = fn_decl @G.2 [template = constants.%G.2] { // CHECK:STDOUT: %Undeclared.ref: = name_ref Undeclared, [template = ] -// CHECK:STDOUT: %self.loc19_8.1: = param self, runtime_param0 -// CHECK:STDOUT: %self.loc19_8.2: = bind_name self, %self.loc19_8.1 +// CHECK:STDOUT: %self.param: = param self, runtime_param0 +// CHECK:STDOUT: %self: = bind_name self, %self.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = interface_witness () [template = ] +// CHECK:STDOUT: %.loc15_20: = interface_witness () [template = ] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .G = %G.decl -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_20 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G.1(@Simple.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Simple.%self.loc12_8.2: @G.1.%Self (%Self)](); +// CHECK:STDOUT: fn[%self: @G.1.%Self (%Self)](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @G.2[@impl.%self.loc19_8.2: ](); +// CHECK:STDOUT: fn @G.2[%self: ](); // CHECK:STDOUT: // CHECK:STDOUT: fn @InstanceCall(%n: i32) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %n.ref: i32 = name_ref n, %n // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] -// CHECK:STDOUT: %G.ref: %.3 = name_ref G, @Simple.%.loc12_21 [template = constants.%.4] -// CHECK:STDOUT: %.loc23_4.1: %G.type.1 = interface_witness_access @impl.%.loc15, element0 [template = ] +// CHECK:STDOUT: %G.ref: %.3 = name_ref G, @Simple.%.loc12 [template = constants.%.4] +// CHECK:STDOUT: %.loc23_4.1: %G.type.1 = interface_witness_access @impl.%.loc15_20, element0 [template = ] // CHECK:STDOUT: %.loc23_4.2: = bound_method %n.ref, %.loc23_4.1 // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon index 02c5b6d3ebc80..f11e4c0cbf536 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -62,29 +62,29 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %GenericInterface.decl: %GenericInterface.type = interface_decl @GenericInterface [template = constants.%GenericInterface] { -// CHECK:STDOUT: %T.loc11_28.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_28.2: type = bind_symbolic_name T 0, %T.loc11_28.1 [symbolic = @GenericInterface.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @GenericInterface(file.%T.loc11_28.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @GenericInterface(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @GenericInterface, @GenericInterface(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @GenericInterface, @GenericInterface(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.type: type = fn_type @F.1, @GenericInterface(%T) [symbolic = %F.type (constants.%F.type.1)] +// CHECK:STDOUT: %F.type: type = fn_type @F.1, @GenericInterface(%T.1) [symbolic = %F.type (constants.%F.type.1)] // CHECK:STDOUT: %F: @GenericInterface.%F.type (%F.type.1) = struct_value () [symbolic = %F (constants.%F.1)] // CHECK:STDOUT: %.2: type = assoc_entity_type @GenericInterface.%.1 (%.2), @GenericInterface.%F.type (%F.type.1) [symbolic = %.2 (constants.%.3)] // CHECK:STDOUT: %.3: @GenericInterface.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @GenericInterface.%.1 (%.2) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.decl: @GenericInterface.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = %F (constants.%F.1)] { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc11_28.2 [symbolic = @F.1.%T (constants.%T)] -// CHECK:STDOUT: %x.loc12_8.1: @F.1.%T (%T) = param x, runtime_param0 -// CHECK:STDOUT: %x.loc12_8.2: @F.1.%T (%T) = bind_name x, %x.loc12_8.1 +// CHECK:STDOUT: %F.decl: @GenericInterface.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = @GenericInterface.%F (constants.%F.1)] { +// CHECK:STDOUT: %T.ref: type = name_ref T, @GenericInterface.%T.loc11 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %x.param: @F.1.%T (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @F.1.%T (%T) = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc12: @GenericInterface.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: @@ -97,24 +97,24 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %T.ref: type = name_ref T, @C.%T.loc19_23.2 [symbolic = @F.2.%T (constants.%T)] -// CHECK:STDOUT: %x.loc20_10.1: @F.2.%T (%T) = param x, runtime_param0 -// CHECK:STDOUT: %x.loc20_10.2: @F.2.%T (%T) = bind_name x, %x.loc20_10.1 +// CHECK:STDOUT: %T.ref: type = name_ref T, @impl.%T [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %x.param: @F.2.%T (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @F.2.%T (%T) = bind_name x, %x.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc19: = interface_witness (%F.decl) [template = constants.%.5] +// CHECK:STDOUT: %.loc19_56: = interface_witness (%F.decl) [template = constants.%.5] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl -// CHECK:STDOUT: witness = %.loc19 +// CHECK:STDOUT: witness = %.loc19_56 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %T.loc19_23.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc19_23.2: type = bind_symbolic_name T 0, %T.loc19_23.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] // CHECK:STDOUT: %GenericInterface.ref: %GenericInterface.type = name_ref GenericInterface, file.%GenericInterface.decl [template = constants.%GenericInterface] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc19_23.2 [symbolic = constants.%T] -// CHECK:STDOUT: %.loc19: type = interface_type @GenericInterface, @GenericInterface(constants.%T) [symbolic = constants.%.2] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T] +// CHECK:STDOUT: %.loc19_52: type = interface_type @GenericInterface, @GenericInterface(constants.%T) [symbolic = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -122,25 +122,25 @@ class C { // CHECK:STDOUT: has_error // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F.1(file.%T.loc11_28.2: type, @GenericInterface.%Self.1: @GenericInterface.%.1 (%.2)) { +// CHECK:STDOUT: generic fn @F.1(@GenericInterface.%T.loc11: type, @GenericInterface.%Self.1: @GenericInterface.%.1 (%.2)) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@GenericInterface.%x.loc12_8.2: @F.1.%T (%T)); +// CHECK:STDOUT: fn(%x: @F.1.%T (%T)); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F.2(@C.%T.loc19_23.2: type) { +// CHECK:STDOUT: generic fn @F.2(@impl.%T: type) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn(@impl.%x.loc20_10.2: @F.2.%T (%T)) { +// CHECK:STDOUT: fn(%x: @F.2.%T (%T)) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericInterface(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.2 @@ -155,8 +155,8 @@ class C { // CHECK:STDOUT: %T => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @GenericInterface(@GenericInterface.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @GenericInterface(@GenericInterface.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F.2(constants.%T) { diff --git a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon index dafb2aeeea166..3e5933083d157 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon @@ -52,7 +52,7 @@ extend impl i32 as I {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc16_13.2: type = converted %int.make_type_32, %.loc16_13.1 [template = i32] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -65,10 +65,10 @@ extend impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as %.1 { -// CHECK:STDOUT: %.loc16: = interface_witness () [template = constants.%.3] +// CHECK:STDOUT: %.loc16_22: = interface_witness () [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc16 +// CHECK:STDOUT: witness = %.loc16_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; 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 7b5a8f794723c..e67634a592d3f 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -93,10 +93,10 @@ class E { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: i32 as %.1 { -// CHECK:STDOUT: %.loc18: = interface_witness () [template = constants.%.3] +// CHECK:STDOUT: %.loc18_24: = interface_witness () [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc18 +// CHECK:STDOUT: witness = %.loc18_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %D as %.1; diff --git a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon index 3c35a83709f7b..c74327b930451 100644 --- a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon @@ -52,8 +52,8 @@ class C { // CHECK:STDOUT: impl @impl: %C as i32; // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: %.loc15_18.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc15_18.2: type = converted %int.make_type_32, %.loc15_18.1 [template = i32] +// CHECK:STDOUT: %.loc15_18.1: type = value_of_initializer @impl.%int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_18.2: type = converted @impl.%int.make_type_32, %.loc15_18.1 [template = i32] // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon index 1d078b01be62e..64473ba5d9101 100644 --- a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon +++ b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon @@ -55,7 +55,7 @@ impl as Simple { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] +// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon b/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon index 08e65962f60e1..9c5220b5c93df 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_const.carbon @@ -53,7 +53,7 @@ impl bool as I {} // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc16_6.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc16_6.2: type = converted %bool.make_type, %.loc16_6.1 [template = bool] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 25048fef4c16d..b72cdaedfd54e 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_assoc_fn.carbon @@ -379,56 +379,56 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc93_26: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc93_26.1: type = value_of_initializer %bool.make_type.loc93_26 [template = bool] // CHECK:STDOUT: %.loc93_26.2: type = converted %bool.make_type.loc93_26, %.loc93_26.1 [template = bool] -// CHECK:STDOUT: %self.loc93_20.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc93_20.2: bool = bind_name self, %self.loc93_20.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc93_35: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc93_35.1: type = value_of_initializer %bool.make_type.loc93_35 [template = bool] // CHECK:STDOUT: %.loc93_35.2: type = converted %bool.make_type.loc93_35, %.loc93_35.1 [template = bool] -// CHECK:STDOUT: %b.loc93_32.1: bool = param b, runtime_param1 -// CHECK:STDOUT: %b.loc93_32.2: bool = bind_name b, %b.loc93_32.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param1 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc93_44: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc93_44.1: type = value_of_initializer %bool.make_type.loc93_44 [template = bool] // CHECK:STDOUT: %.loc93_44.2: type = converted %bool.make_type.loc93_44, %.loc93_44.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc93_48: %.7 = assoc_entity element0, %F.decl [template = constants.%.8] +// CHECK:STDOUT: %.loc93: %.7 = assoc_entity element0, %F.decl [template = constants.%.8] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc93_48 +// CHECK:STDOUT: .F = %.loc93 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @SelfNested { // CHECK:STDOUT: %Self: %.9 = bind_symbolic_name Self 0 [symbolic = constants.%Self.3] // CHECK:STDOUT: %F.decl: %F.type.13 = fn_decl @F.13 [template = constants.%F.14] { -// CHECK:STDOUT: %Self.ref.loc188_12: %.9 = name_ref Self, %Self [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_16.1: type = facet_type_access %Self.ref.loc188_12 [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_16.2: type = converted %Self.ref.loc188_12, %.loc188_16.1 [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_16.3: type = ptr_type %Self.3 [symbolic = @F.13.%.1 (constants.%.10)] -// CHECK:STDOUT: %Self.ref.loc188_24: %.9 = name_ref Self, %Self [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_24.1: type = facet_type_access %Self.ref.loc188_24 [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_24.2: type = converted %Self.ref.loc188_24, %.loc188_24.1 [symbolic = @F.13.%Self (constants.%Self.3)] +// CHECK:STDOUT: %Self.ref.loc188_12: %.9 = name_ref Self, @SelfNested.%Self [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_16.1: type = facet_type_access %Self.ref.loc188_12 [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_16.2: type = converted %Self.ref.loc188_12, %.loc188_16.1 [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_16.3: type = ptr_type %Self.3 [symbolic = %.1 (constants.%.10)] +// CHECK:STDOUT: %Self.ref.loc188_24: %.9 = name_ref Self, @SelfNested.%Self [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_24.1: type = facet_type_access %Self.ref.loc188_24 [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_24.2: type = converted %Self.ref.loc188_24, %.loc188_24.1 [symbolic = %Self (constants.%Self.3)] // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc188_34.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc188_34.2: type = converted %int.make_type_32, %.loc188_34.1 [template = i32] -// CHECK:STDOUT: %.loc188_37: type = struct_type {.x: %Self.3, .y: i32} [symbolic = @F.13.%.2 (constants.%.11)] +// CHECK:STDOUT: %.loc188_37: type = struct_type {.x: %Self.3, .y: i32} [symbolic = %.2 (constants.%.11)] // CHECK:STDOUT: %.loc188_38.1: %.12 = tuple_literal (%.loc188_16.3, %.loc188_37) -// CHECK:STDOUT: %.loc188_38.2: type = converted %.loc188_38.1, constants.%.13 [symbolic = @F.13.%.3 (constants.%.13)] -// CHECK:STDOUT: %x.loc188_8.1: @F.13.%.3 (%.13) = param x, runtime_param0 -// CHECK:STDOUT: %x.loc188_8.2: @F.13.%.3 (%.13) = bind_name x, %x.loc188_8.1 -// CHECK:STDOUT: %Self.ref.loc188_45: %.9 = name_ref Self, %Self [symbolic = @F.13.%Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_38.2: type = converted %.loc188_38.1, constants.%.13 [symbolic = %.3 (constants.%.13)] +// CHECK:STDOUT: %x.param: @F.13.%.3 (%.13) = param x, runtime_param0 +// CHECK:STDOUT: %x: @F.13.%.3 (%.13) = bind_name x, %x.param +// CHECK:STDOUT: %Self.ref.loc188_45: %.9 = name_ref Self, @SelfNested.%Self [symbolic = %Self (constants.%Self.3)] // CHECK:STDOUT: %.loc188_51: i32 = int_literal 4 [template = constants.%.14] -// CHECK:STDOUT: %.loc188_45.1: type = facet_type_access %Self.ref.loc188_45 [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_45.2: type = converted %Self.ref.loc188_45, %.loc188_45.1 [symbolic = @F.13.%Self (constants.%Self.3)] -// CHECK:STDOUT: %.loc188_52: type = array_type %.loc188_51, %Self.3 [symbolic = @F.13.%.4 (constants.%.15)] -// CHECK:STDOUT: %return.var: ref @F.13.%.4 (%.15) = var +// CHECK:STDOUT: %.loc188_45.1: type = facet_type_access %Self.ref.loc188_45 [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_45.2: type = converted %Self.ref.loc188_45, %.loc188_45.1 [symbolic = %Self (constants.%Self.3)] +// CHECK:STDOUT: %.loc188_52: type = array_type %.loc188_51, %Self.3 [symbolic = %.4 (constants.%.15)] +// CHECK:STDOUT: %return: ref @F.13.%.4 (%.15) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc188_53: %.16 = assoc_entity element0, %F.decl [template = constants.%.17] +// CHECK:STDOUT: %.loc188: %.16 = assoc_entity element0, %F.decl [template = constants.%.17] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc188_53 +// CHECK:STDOUT: .F = %.loc188 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -463,8 +463,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc62_13.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc62_13.2: type = converted %bool.make_type, %.loc62_13.1 [template = bool] -// CHECK:STDOUT: %b.loc62_10.1: bool = param b, runtime_param0 -// CHECK:STDOUT: %b.loc62_10.2: bool = bind_name b, %b.loc62_10.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc54: = interface_witness () [template = ] // CHECK:STDOUT: @@ -476,8 +476,8 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: impl @impl.5: %FExtraImplicitParam as %.1 { // CHECK:STDOUT: %F.decl: %F.type.3 = fn_decl @F.3 [template = constants.%F.4] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FExtraImplicitParam [template = constants.%FExtraImplicitParam] -// CHECK:STDOUT: %self.loc75_10.1: %FExtraImplicitParam = param self, runtime_param0 -// CHECK:STDOUT: %self.loc75_10.2: %FExtraImplicitParam = bind_name self, %self.loc75_10.1 +// CHECK:STDOUT: %self.param: %FExtraImplicitParam = param self, runtime_param0 +// CHECK:STDOUT: %self: %FExtraImplicitParam = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc67: = interface_witness () [template = ] // CHECK:STDOUT: @@ -491,7 +491,7 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc89_15.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc89_15.2: type = converted %bool.make_type, %.loc89_15.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc81: = interface_witness () [template = ] // CHECK:STDOUT: @@ -505,12 +505,12 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc104_16: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc104_16.1: type = value_of_initializer %bool.make_type.loc104_16 [template = bool] // CHECK:STDOUT: %.loc104_16.2: type = converted %bool.make_type.loc104_16, %.loc104_16.1 [template = bool] -// CHECK:STDOUT: %self.loc104_10.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc104_10.2: bool = bind_name self, %self.loc104_10.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc104_27: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc104_27.1: type = value_of_initializer %bool.make_type.loc104_27 [template = bool] // CHECK:STDOUT: %.loc104_27.2: type = converted %bool.make_type.loc104_27, %.loc104_27.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc96: = interface_witness () [template = ] // CHECK:STDOUT: @@ -524,12 +524,12 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc117_13: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc117_13.1: type = value_of_initializer %bool.make_type.loc117_13 [template = bool] // CHECK:STDOUT: %.loc117_13.2: type = converted %bool.make_type.loc117_13, %.loc117_13.1 [template = bool] -// CHECK:STDOUT: %b.loc117_10.1: bool = param b, runtime_param0 -// CHECK:STDOUT: %b.loc117_10.2: bool = bind_name b, %b.loc117_10.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc117_22: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc117_22.1: type = value_of_initializer %bool.make_type.loc117_22 [template = bool] // CHECK:STDOUT: %.loc117_22.2: type = converted %bool.make_type.loc117_22, %.loc117_22.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc109: = interface_witness () [template = ] // CHECK:STDOUT: @@ -543,13 +543,13 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc130_16: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc130_16.1: type = value_of_initializer %bool.make_type.loc130_16 [template = bool] // CHECK:STDOUT: %.loc130_16.2: type = converted %bool.make_type.loc130_16, %.loc130_16.1 [template = bool] -// CHECK:STDOUT: %self.loc130_10.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc130_10.2: bool = bind_name self, %self.loc130_10.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc130_25: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc130_25.1: type = value_of_initializer %bool.make_type.loc130_25 [template = bool] // CHECK:STDOUT: %.loc130_25.2: type = converted %bool.make_type.loc130_25, %.loc130_25.1 [template = bool] -// CHECK:STDOUT: %b.loc130_22.1: bool = param b, runtime_param1 -// CHECK:STDOUT: %b.loc130_22.2: bool = bind_name b, %b.loc130_22.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param1 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc122: = interface_witness () [template = ] // CHECK:STDOUT: @@ -563,15 +563,15 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc143_16: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc143_16.1: type = value_of_initializer %bool.make_type.loc143_16 [template = bool] // CHECK:STDOUT: %.loc143_16.2: type = converted %bool.make_type.loc143_16, %.loc143_16.1 [template = bool] -// CHECK:STDOUT: %self.loc143_10.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc143_10.2: bool = bind_name self, %self.loc143_10.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FDifferentParamType [template = constants.%FDifferentParamType] -// CHECK:STDOUT: %b.loc143_22.1: %FDifferentParamType = param b, runtime_param1 -// CHECK:STDOUT: %b.loc143_22.2: %FDifferentParamType = bind_name b, %b.loc143_22.1 +// CHECK:STDOUT: %b.param: %FDifferentParamType = param b, runtime_param1 +// CHECK:STDOUT: %b: %FDifferentParamType = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc143_34: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc143_34.1: type = value_of_initializer %bool.make_type.loc143_34 [template = bool] // CHECK:STDOUT: %.loc143_34.2: type = converted %bool.make_type.loc143_34, %.loc143_34.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc135: = interface_witness () [template = ] // CHECK:STDOUT: @@ -583,17 +583,17 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: impl @impl.11: %FDifferentImplicitParamType as %.6 { // CHECK:STDOUT: %F.decl: %F.type.10 = fn_decl @F.10 [template = constants.%F.11] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FDifferentImplicitParamType [template = constants.%FDifferentImplicitParamType] -// CHECK:STDOUT: %self.loc156_10.1: %FDifferentImplicitParamType = param self, runtime_param0 -// CHECK:STDOUT: %self.loc156_10.2: %FDifferentImplicitParamType = bind_name self, %self.loc156_10.1 +// CHECK:STDOUT: %self.param: %FDifferentImplicitParamType = param self, runtime_param0 +// CHECK:STDOUT: %self: %FDifferentImplicitParamType = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc156_25: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc156_25.1: type = value_of_initializer %bool.make_type.loc156_25 [template = bool] // CHECK:STDOUT: %.loc156_25.2: type = converted %bool.make_type.loc156_25, %.loc156_25.1 [template = bool] -// CHECK:STDOUT: %b.loc156_22.1: bool = param b, runtime_param1 -// CHECK:STDOUT: %b.loc156_22.2: bool = bind_name b, %b.loc156_22.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param1 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc156_34: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc156_34.1: type = value_of_initializer %bool.make_type.loc156_34 [template = bool] // CHECK:STDOUT: %.loc156_34.2: type = converted %bool.make_type.loc156_34, %.loc156_34.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc148: = interface_witness () [template = ] // CHECK:STDOUT: @@ -607,15 +607,15 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc169_16: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc169_16.1: type = value_of_initializer %bool.make_type.loc169_16 [template = bool] // CHECK:STDOUT: %.loc169_16.2: type = converted %bool.make_type.loc169_16, %.loc169_16.1 [template = bool] -// CHECK:STDOUT: %self.loc169_10.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc169_10.2: bool = bind_name self, %self.loc169_10.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc169_25: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc169_25.1: type = value_of_initializer %bool.make_type.loc169_25 [template = bool] // CHECK:STDOUT: %.loc169_25.2: type = converted %bool.make_type.loc169_25, %.loc169_25.1 [template = bool] -// CHECK:STDOUT: %b.loc169_22.1: bool = param b, runtime_param1 -// CHECK:STDOUT: %b.loc169_22.2: bool = bind_name b, %b.loc169_22.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param1 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%FDifferentReturnType [template = constants.%FDifferentReturnType] -// CHECK:STDOUT: %return.var: ref %FDifferentReturnType = var +// CHECK:STDOUT: %return: ref %FDifferentReturnType = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc161: = interface_witness () [template = ] // CHECK:STDOUT: @@ -629,17 +629,17 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %bool.make_type.loc183_16: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc183_16.1: type = value_of_initializer %bool.make_type.loc183_16 [template = bool] // CHECK:STDOUT: %.loc183_16.2: type = converted %bool.make_type.loc183_16, %.loc183_16.1 [template = bool] -// CHECK:STDOUT: %self.loc183_10.1: bool = param self, runtime_param0 -// CHECK:STDOUT: %self.loc183_10.2: bool = bind_name self, %self.loc183_10.1 +// CHECK:STDOUT: %self.param: bool = param self, runtime_param0 +// CHECK:STDOUT: %self: bool = bind_name self, %self.param // CHECK:STDOUT: %bool.make_type.loc183_29: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc183_29.1: type = value_of_initializer %bool.make_type.loc183_29 [template = bool] // CHECK:STDOUT: %.loc183_29.2: type = converted %bool.make_type.loc183_29, %.loc183_29.1 [template = bool] -// CHECK:STDOUT: %not_b.loc183_22.1: bool = param not_b, runtime_param1 -// CHECK:STDOUT: %not_b.loc183_22.2: bool = bind_name not_b, %not_b.loc183_22.1 +// CHECK:STDOUT: %not_b.param: bool = param not_b, runtime_param1 +// CHECK:STDOUT: %not_b: bool = bind_name not_b, %not_b.param // CHECK:STDOUT: %bool.make_type.loc183_38: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc183_38.1: type = value_of_initializer %bool.make_type.loc183_38 [template = bool] // CHECK:STDOUT: %.loc183_38.2: type = converted %bool.make_type.loc183_38, %.loc183_38.1 [template = bool] -// CHECK:STDOUT: %return.var: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc175: = interface_witness () [template = ] // CHECK:STDOUT: @@ -661,12 +661,12 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc200_52: type = struct_type {.x: i32, .y: i32} [template = constants.%.19] // CHECK:STDOUT: %.loc200_53.1: %.12 = tuple_literal (%.loc200_32, %.loc200_52) // CHECK:STDOUT: %.loc200_53.2: type = converted %.loc200_53.1, constants.%.20 [template = constants.%.20] -// CHECK:STDOUT: %x.loc200_10.1: %.20 = param x, runtime_param0 -// CHECK:STDOUT: %x.loc200_10.2: %.20 = bind_name x, %x.loc200_10.1 +// CHECK:STDOUT: %x.param: %.20 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.20 = bind_name x, %x.param // CHECK:STDOUT: %SelfNestedBadParam.ref.loc200_60: type = name_ref SelfNestedBadParam, file.%SelfNestedBadParam.decl [template = constants.%SelfNestedBadParam] // CHECK:STDOUT: %.loc200_80: i32 = int_literal 4 [template = constants.%.14] // CHECK:STDOUT: %.loc200_81: type = array_type %.loc200_80, %SelfNestedBadParam [template = constants.%.21] -// CHECK:STDOUT: %return.var: ref %.21 = var +// CHECK:STDOUT: %return: ref %.21 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc192: = interface_witness () [template = ] // CHECK:STDOUT: @@ -686,12 +686,12 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.loc212_77: type = struct_type {.x: %SelfNestedBadReturnType, .y: i32} [template = constants.%.25] // CHECK:STDOUT: %.loc212_78.1: %.12 = tuple_literal (%.loc212_37, %.loc212_77) // CHECK:STDOUT: %.loc212_78.2: type = converted %.loc212_78.1, constants.%.26 [template = constants.%.26] -// CHECK:STDOUT: %x.loc212_10.1: %.26 = param x, runtime_param0 -// CHECK:STDOUT: %x.loc212_10.2: %.26 = bind_name x, %x.loc212_10.1 +// CHECK:STDOUT: %x.param: %.26 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.26 = bind_name x, %x.param // CHECK:STDOUT: %SelfNestedBadParam.ref: type = name_ref SelfNestedBadParam, file.%SelfNestedBadParam.decl [template = constants.%SelfNestedBadParam] // CHECK:STDOUT: %.loc212_105: i32 = int_literal 4 [template = constants.%.14] // CHECK:STDOUT: %.loc212_106: type = array_type %.loc212_105, %SelfNestedBadParam [template = constants.%.21] -// CHECK:STDOUT: %return.var: ref %.21 = var +// CHECK:STDOUT: %return: ref %.21 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc205: = interface_witness () [template = ] // CHECK:STDOUT: @@ -846,30 +846,30 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2(@impl.4.%b.loc62_10.2: bool); +// CHECK:STDOUT: fn @F.2(%b: bool); // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.3[@impl.5.%self.loc75_10.2: %FExtraImplicitParam](); +// CHECK:STDOUT: fn @F.3[%self: %FExtraImplicitParam](); // CHECK:STDOUT: // CHECK:STDOUT: fn @F.4() -> bool; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.5(@J.%Self: %.6) { // CHECK:STDOUT: -// CHECK:STDOUT: fn[@J.%self.loc93_20.2: bool](@J.%b.loc93_32.2: bool) -> bool; +// CHECK:STDOUT: fn[%self: bool](%b: bool) -> bool; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.6[@impl.7.%self.loc104_10.2: bool]() -> bool; +// CHECK:STDOUT: fn @F.6[%self: bool]() -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.7(@impl.8.%b.loc117_10.2: bool) -> bool; +// CHECK:STDOUT: fn @F.7(%b: bool) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.8[@impl.9.%self.loc130_10.2: bool](@impl.9.%b.loc130_22.2: bool); +// CHECK:STDOUT: fn @F.8[%self: bool](%b: bool); // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.9[@impl.10.%self.loc143_10.2: bool](@impl.10.%b.loc143_22.2: %FDifferentParamType) -> bool; +// CHECK:STDOUT: fn @F.9[%self: bool](%b: %FDifferentParamType) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.10[@impl.11.%self.loc156_10.2: %FDifferentImplicitParamType](@impl.11.%b.loc156_22.2: bool) -> bool; +// CHECK:STDOUT: fn @F.10[%self: %FDifferentImplicitParamType](%b: bool) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.11[@impl.12.%self.loc169_10.2: bool](@impl.12.%b.loc169_22.2: bool) -> %FDifferentReturnType; +// CHECK:STDOUT: fn @F.11[%self: bool](%b: bool) -> %FDifferentReturnType; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.12[@impl.13.%self.loc183_10.2: bool](@impl.13.%not_b.loc183_22.2: bool) -> bool; +// CHECK:STDOUT: fn @F.12[%self: bool](%not_b: bool) -> bool; // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: @@ -880,12 +880,12 @@ class SelfNestedBadReturnType { // CHECK:STDOUT: %.3: type = tuple_type (@F.13.%.1 (%.10), @F.13.%.2 (%.11)) [symbolic = %.3 (constants.%.13)] // CHECK:STDOUT: %.4: type = array_type constants.%.14, @F.13.%Self (%Self.3) [symbolic = %.4 (constants.%.15)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@SelfNested.%x.loc188_8.2: @F.13.%.3 (%.13)) -> @F.13.%.4 (%.15); +// CHECK:STDOUT: fn(%x: @F.13.%.3 (%.13)) -> @F.13.%.4 (%.15); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.14(@impl.14.%x.loc200_10.2: %.20) -> %.21; +// CHECK:STDOUT: fn @F.14(%x: %.20) -> %.21; // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.15(@impl.15.%x.loc212_10.2: %.26) -> %.21; +// CHECK:STDOUT: fn @F.15(%x: %.26) -> %.21; // CHECK:STDOUT: // CHECK:STDOUT: specific @F.1(constants.%Self.1) {} // 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 54602adfc8871..602a9d6bfe0fe 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon @@ -75,12 +75,12 @@ impl i32 as false {} // CHECK:STDOUT: %.loc21_13.1: type = interface_type @ImplicitAs, @ImplicitAs(type) [template = constants.%.6] // CHECK:STDOUT: %.loc21_13.2: %.7 = specific_constant imports.%import_ref.4, @ImplicitAs(type) [template = constants.%.8] // CHECK:STDOUT: %Convert.ref: %.7 = name_ref Convert, %.loc21_13.2 [template = constants.%.8] -// CHECK:STDOUT: %.loc21_13.3: type = converted %.loc21_13.4, [template = ] +// CHECK:STDOUT: %.loc21_13.3: type = converted @impl.%.loc21_13, [template = ] // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_6.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc21_6.2: type = converted %int.make_type_32, %.loc21_6.1 [template = i32] -// CHECK:STDOUT: %.loc21_13.4: bool = bool_literal false [template = constants.%.2] +// CHECK:STDOUT: %.loc21_13: bool = bool_literal false [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_redefinition.carbon b/toolchain/check/testdata/impl/fail_redefinition.carbon index ad9f7479cc2ab..a230acb742c7d 100644 --- a/toolchain/check/testdata/impl/fail_redefinition.carbon +++ b/toolchain/check/testdata/impl/fail_redefinition.carbon @@ -57,13 +57,13 @@ impl i32 as I {} // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_6.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_6.2: type = converted %int.make_type_32.loc13, %.loc13_6.1 [template = i32] -// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_6.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] // CHECK:STDOUT: %.loc21_6.2: type = converted %int.make_type_32.loc21, %.loc21_6.1 [template = i32] -// CHECK:STDOUT: %I.ref.loc21: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref.loc21: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/impl_forall.carbon b/toolchain/check/testdata/impl/impl_forall.carbon index 807e989d5bd65..ac448ff990ba6 100644 --- a/toolchain/check/testdata/impl/impl_forall.carbon +++ b/toolchain/check/testdata/impl/impl_forall.carbon @@ -53,10 +53,10 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %T.loc15_14.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc15_14.2: type = bind_symbolic_name T 0, %T.loc15_14.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc15_14.2 [symbolic = constants.%T] -// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T] +// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -85,7 +85,7 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: fn(); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F.2(file.%T.loc15_14.2: type) { +// CHECK:STDOUT: generic fn @F.2(@impl.%T: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: // CHECK:STDOUT: fn() { diff --git a/toolchain/check/testdata/impl/lookup/alias.carbon b/toolchain/check/testdata/impl/lookup/alias.carbon index 73ba2e16e0101..98f817274eaab 100644 --- a/toolchain/check/testdata/impl/lookup/alias.carbon +++ b/toolchain/check/testdata/impl/lookup/alias.carbon @@ -69,13 +69,13 @@ fn G(c: C) { // CHECK:STDOUT: %HasF.decl: type = interface_decl @HasF [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, %HasF.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, file.%HasF.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %C.ref.loc23: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %c.loc23_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: %C = bind_name c, %c.loc23_6.1 +// CHECK:STDOUT: %C.ref.loc23: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -121,7 +121,7 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%c: %C) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc24: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %G.ref.loc24: %.3 = name_ref G, @C.%G [template = constants.%.4] // CHECK:STDOUT: %.loc24: %F.type.1 = interface_witness_access @impl.%.loc19, element0 [template = constants.%F.2] // CHECK:STDOUT: %F.call.loc24: init %.2 = call %.loc24() diff --git a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon index 37172c9869f2d..85545cc288452 100644 --- a/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_alias_impl_not_found.carbon @@ -69,9 +69,9 @@ fn F(c: C) { // CHECK:STDOUT: %I.decl: type = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %c.loc19_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @F.2.%c: %C = bind_name c, %c.loc19_6.1 +// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -103,7 +103,7 @@ fn F(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: fn @F.2(%c: %C) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc24: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %F.ref.loc24: %.3 = name_ref F, @C.%F [template = constants.%.4] // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %F.ref.loc28: %.3 = name_ref F, @C.%F [template = constants.%.4] 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 60f95741d66a6..4961bc0b43341 100644 --- a/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon +++ b/toolchain/check/testdata/impl/lookup/fail_todo_undefined_impl.carbon @@ -79,11 +79,11 @@ impl C as I { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc19_11.2: type = converted %int.make_type_32, %.loc19_11.1 [template = i32] -// CHECK:STDOUT: @F.2.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %I.ref.loc27: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -109,7 +109,7 @@ impl C as I { // CHECK:STDOUT: // CHECK:STDOUT: class @C { // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref.loc16: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/impl/lookup/import.carbon b/toolchain/check/testdata/impl/lookup/import.carbon index a1df36d788418..e485019e22bd3 100644 --- a/toolchain/check/testdata/impl/lookup/import.carbon +++ b/toolchain/check/testdata/impl/lookup/import.carbon @@ -70,8 +70,8 @@ fn G(c: Impl.C) { // CHECK:STDOUT: %HasF.decl: type = interface_decl @HasF [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, %HasF.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, file.%HasF.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -169,10 +169,10 @@ fn G(c: Impl.C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Impl.import = import Impl // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Impl.ref: = name_ref Impl, imports.%Impl [template = imports.%Impl] +// CHECK:STDOUT: %Impl.ref.loc4: = name_ref Impl, imports.%Impl [template = imports.%Impl] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.6 [template = constants.%C] -// CHECK:STDOUT: %c.loc4_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: %C = bind_name c, %c.loc4_6.1 +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -196,7 +196,7 @@ fn G(c: Impl.C) { // CHECK:STDOUT: fn @G(%c: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C = name_ref c, %c -// CHECK:STDOUT: %Impl.ref: = name_ref Impl, imports.%Impl [template = imports.%Impl] +// CHECK:STDOUT: %Impl.ref.loc5: = name_ref Impl, imports.%Impl [template = imports.%Impl] // CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%import_ref.7 [template = constants.%.2] // CHECK:STDOUT: %F.ref: %.5 = name_ref F, imports.%import_ref.3 [template = constants.%.6] // CHECK:STDOUT: %.loc5: %F.type.1 = interface_witness_access imports.%import_ref.5, element0 [template = constants.%F.2] diff --git a/toolchain/check/testdata/impl/lookup/instance_method.carbon b/toolchain/check/testdata/impl/lookup/instance_method.carbon index 27d12030f844f..0818b895e8411 100644 --- a/toolchain/check/testdata/impl/lookup/instance_method.carbon +++ b/toolchain/check/testdata/impl/lookup/instance_method.carbon @@ -73,46 +73,46 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: %I.decl: type = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: %C.decl.loc17: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %F.decl: %F.type.3 = fn_decl @F.3 [template = constants.%F.3] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl.loc11 [template = constants.%C] -// CHECK:STDOUT: %c.loc23_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @F.3.%c: %C = bind_name c, %c.loc23_6.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl.loc11 [template = constants.%C] +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc23_15.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc23_15.2: type = converted %int.make_type_32, %.loc23_15.1 [template = i32] -// CHECK:STDOUT: @F.3.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { -// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc14_14.1: type = facet_type_access %Self.ref [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc14_14.2: type = converted %Self.ref, %.loc14_14.1 [symbolic = @F.1.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc14_8.1: @F.1.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_8.2: @F.1.%Self (%Self) = bind_name self, %self.loc14_8.1 +// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, @I.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc14_14.1: type = facet_type_access %Self.ref [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc14_14.2: type = converted %Self.ref, %.loc14_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @F.1.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.1.%Self (%Self) = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_25.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc14_25.2: type = converted %int.make_type_32, %.loc14_25.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc14_28: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc14: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc14_28 +// CHECK:STDOUT: .F = %.loc14 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C as %.1 { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %self.loc19_10.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc19_10.2: %C = bind_name self, %self.loc19_10.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_27.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc19_27.2: type = converted %int.make_type_32, %.loc19_27.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc18: = interface_witness (%F.decl) [template = constants.%.5] // CHECK:STDOUT: @@ -136,15 +136,15 @@ fn F(c: C) -> i32 { // CHECK:STDOUT: generic fn @F.1(@I.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@I.%self.loc14_8.2: @F.1.%Self (%Self)]() -> i32; +// CHECK:STDOUT: fn[%self: @F.1.%Self (%Self)]() -> i32; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[@impl.%self.loc19_10.2: %C]() -> i32; +// CHECK:STDOUT: fn @F.2[%self: %C]() -> i32; // CHECK:STDOUT: // CHECK:STDOUT: fn @F.3(%c: %C) -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C = name_ref c, %c -// CHECK:STDOUT: %F.ref: %.3 = name_ref F, @I.%.loc14_28 [template = constants.%.4] +// CHECK:STDOUT: %F.ref: %.3 = name_ref F, @I.%.loc14 [template = constants.%.4] // CHECK:STDOUT: %.loc24_11.1: %F.type.1 = interface_witness_access @impl.%.loc18, element0 [template = constants.%F.2] // CHECK:STDOUT: %.loc24_11.2: = bound_method %c.ref, %.loc24_11.1 // CHECK:STDOUT: %F.call: init i32 = call %.loc24_11.2(%c.ref) diff --git a/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon b/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon index 45439134cbc72..28e4f0dc47940 100644 --- a/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon +++ b/toolchain/check/testdata/impl/lookup/no_prelude/import.carbon @@ -55,8 +55,8 @@ fn G(c: Impl.C) { // CHECK:STDOUT: %HasF.decl: type = interface_decl @HasF [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, %HasF.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %HasF.ref: type = name_ref HasF, file.%HasF.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -142,10 +142,10 @@ fn G(c: Impl.C) { // CHECK:STDOUT: } // CHECK:STDOUT: %Impl.import = import Impl // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Impl.ref: = name_ref Impl, imports.%Impl [template = imports.%Impl] +// CHECK:STDOUT: %Impl.ref.loc4: = name_ref Impl, imports.%Impl [template = imports.%Impl] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.6 [template = constants.%C] -// CHECK:STDOUT: %c.loc4_6.1: %C = param c, runtime_param0 -// CHECK:STDOUT: @G.%c: %C = bind_name c, %c.loc4_6.1 +// CHECK:STDOUT: %c.param: %C = param c, runtime_param0 +// CHECK:STDOUT: %c: %C = bind_name c, %c.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -169,7 +169,7 @@ fn G(c: Impl.C) { // CHECK:STDOUT: fn @G(%c: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %c.ref: %C = name_ref c, %c -// CHECK:STDOUT: %Impl.ref: = name_ref Impl, imports.%Impl [template = imports.%Impl] +// CHECK:STDOUT: %Impl.ref.loc5: = name_ref Impl, imports.%Impl [template = imports.%Impl] // CHECK:STDOUT: %HasF.ref: type = name_ref HasF, imports.%import_ref.7 [template = constants.%.2] // CHECK:STDOUT: %F.ref: %.5 = name_ref F, imports.%import_ref.3 [template = constants.%.6] // CHECK:STDOUT: %.loc5: %F.type.1 = interface_witness_access imports.%import_ref.5, element0 [template = constants.%F.2] diff --git a/toolchain/check/testdata/impl/no_prelude/basic.carbon b/toolchain/check/testdata/impl/no_prelude/basic.carbon index 716e20c3cb6b4..f438a2c7edf9a 100644 --- a/toolchain/check/testdata/impl/no_prelude/basic.carbon +++ b/toolchain/check/testdata/impl/no_prelude/basic.carbon @@ -43,8 +43,8 @@ impl C as Simple { // CHECK:STDOUT: %Simple.decl: type = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %Simple.ref: type = name_ref Simple, file.%Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/fail_impl_bad_type.carbon b/toolchain/check/testdata/impl/no_prelude/fail_impl_bad_type.carbon index 3f34039b9f8c1..5939db8840139 100644 --- a/toolchain/check/testdata/impl/no_prelude/fail_impl_bad_type.carbon +++ b/toolchain/check/testdata/impl/no_prelude/fail_impl_bad_type.carbon @@ -33,7 +33,7 @@ impl true as I {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc16_6.1: bool = bool_literal true [template = constants.%.2] // CHECK:STDOUT: %.loc16_6.2: type = converted %.loc16_6.1, [template = ] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -46,9 +46,9 @@ impl true as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: as %.1 { -// CHECK:STDOUT: %.loc16: = interface_witness () [template = constants.%.4] +// CHECK:STDOUT: %.loc16_16: = interface_witness () [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc16 +// CHECK:STDOUT: witness = %.loc16_16 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/import_self.carbon b/toolchain/check/testdata/impl/no_prelude/import_self.carbon index e942e73534a5b..a8e95709b90d7 100644 --- a/toolchain/check/testdata/impl/no_prelude/import_self.carbon +++ b/toolchain/check/testdata/impl/no_prelude/import_self.carbon @@ -52,33 +52,33 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: interface @Add { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %Op.decl: %Op.type = fn_decl @Op [template = constants.%Op] { -// CHECK:STDOUT: %Self.ref.loc5_15: %.1 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_15.1: type = facet_type_access %Self.ref.loc5_15 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_15.2: type = converted %Self.ref.loc5_15, %.loc5_15.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc5_9.1: @Op.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc5_9.2: @Op.%Self (%Self) = bind_name self, %self.loc5_9.1 -// CHECK:STDOUT: %Self.ref.loc5_28: %.1 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_28.1: type = facet_type_access %Self.ref.loc5_28 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_28.2: type = converted %Self.ref.loc5_28, %.loc5_28.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %other.loc5_21.1: @Op.%Self (%Self) = param other, runtime_param1 -// CHECK:STDOUT: %other.loc5_21.2: @Op.%Self (%Self) = bind_name other, %other.loc5_21.1 -// CHECK:STDOUT: %Self.ref.loc5_37: %.1 = name_ref Self, %Self [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_37.1: type = facet_type_access %Self.ref.loc5_37 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc5_37.2: type = converted %Self.ref.loc5_37, %.loc5_37.1 [symbolic = @Op.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @Op.%Self (%Self) = var +// CHECK:STDOUT: %Self.ref.loc5_15: %.1 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_15.1: type = facet_type_access %Self.ref.loc5_15 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_15.2: type = converted %Self.ref.loc5_15, %.loc5_15.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @Op.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @Op.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %Self.ref.loc5_28: %.1 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_28.1: type = facet_type_access %Self.ref.loc5_28 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_28.2: type = converted %Self.ref.loc5_28, %.loc5_28.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %other.param: @Op.%Self (%Self) = param other, runtime_param1 +// CHECK:STDOUT: %other: @Op.%Self (%Self) = bind_name other, %other.param +// CHECK:STDOUT: %Self.ref.loc5_37: %.1 = name_ref Self, @Add.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_37.1: type = facet_type_access %Self.ref.loc5_37 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc5_37.2: type = converted %Self.ref.loc5_37, %.loc5_37.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @Op.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc5_41: %.3 = assoc_entity element0, %Op.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc5: %.3 = assoc_entity element0, %Op.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .Op = %.loc5_41 +// CHECK:STDOUT: .Op = %.loc5 // CHECK:STDOUT: witness = (%Op.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op(@Add.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@Add.%self.loc5_9.2: @Op.%Self (%Self)](@Add.%other.loc5_21.2: @Op.%Self (%Self)) -> @Op.%Self (%Self); +// CHECK:STDOUT: fn[%self: @Op.%Self (%Self)](%other: @Op.%Self (%Self)) -> @Op.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Op(constants.%Self) { @@ -125,15 +125,15 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %.loc10_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc10_10.2: type = converted %.loc10_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc10_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @F.%x: %.1 = bind_name x, %x.loc10_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: %.loc10_17.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %y.loc10_13.1: %.1 = param y, runtime_param1 -// CHECK:STDOUT: @F.%y: %.1 = bind_name y, %y.loc10_13.1 +// CHECK:STDOUT: %y.param: %.1 = param y, runtime_param1 +// CHECK:STDOUT: %y: %.1 = bind_name y, %y.param // CHECK:STDOUT: %.loc10_24.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc10_24.2: type = converted %.loc10_24.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,22 +147,22 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: impl @impl: %.1 as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %Self.ref.loc7_15: type = name_ref Self, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %self.loc7_9.1: %.1 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_9.2: %.1 = bind_name self, %self.loc7_9.1 +// CHECK:STDOUT: %self.param: %.1 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.1 = bind_name self, %self.param // CHECK:STDOUT: %Self.ref.loc7_28: type = name_ref Self, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %other.loc7_21.1: %.1 = param other, runtime_param1 -// CHECK:STDOUT: %other.loc7_21.2: %.1 = bind_name other, %other.loc7_21.1 +// CHECK:STDOUT: %other.param: %.1 = param other, runtime_param1 +// CHECK:STDOUT: %other: %.1 = bind_name other, %other.param // CHECK:STDOUT: %Self.ref.loc7_37: type = name_ref Self, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %return.var: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc6: = interface_witness (%Op.decl) [template = constants.%.3] +// CHECK:STDOUT: %.loc6_16: = interface_witness (%Op.decl) [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Op = %Op.decl -// CHECK:STDOUT: witness = %.loc6 +// CHECK:STDOUT: witness = %.loc6_16 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.%self.loc7_9.2: %.1](@impl.%other.loc7_21.2: %.1) -> %.1 { +// CHECK:STDOUT: fn @Op.1[%self: %.1](%other: %.1) -> %.1 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_52: %.1 = tuple_literal () // CHECK:STDOUT: %tuple: %.1 = tuple_value () [template = constants.%tuple] @@ -181,7 +181,7 @@ fn F(x: (), y: ()) -> () { // CHECK:STDOUT: %x.ref: %.1 = name_ref x, %x // CHECK:STDOUT: %Add.ref: type = name_ref Add, imports.%import_ref.1 [template = constants.%.2] // CHECK:STDOUT: %Op.ref: %.4 = name_ref Op, imports.%import_ref.3 [template = constants.%.5] -// CHECK:STDOUT: %.loc11_11.1: %Op.type.2 = interface_witness_access @impl.%.loc6, element0 [template = constants.%Op.1] +// CHECK:STDOUT: %.loc11_11.1: %Op.type.2 = interface_witness_access @impl.%.loc6_16, element0 [template = constants.%Op.1] // CHECK:STDOUT: %.loc11_11.2: = bound_method %x.ref, %.loc11_11.1 // CHECK:STDOUT: %y.ref: %.1 = name_ref y, %y // CHECK:STDOUT: %Op.call: init %.1 = call %.loc11_11.2(%x.ref, %y.ref) diff --git a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon index c7960491d75d1..d77b59b8a0046 100644 --- a/toolchain/check/testdata/impl/no_prelude/interface_args.carbon +++ b/toolchain/check/testdata/impl/no_prelude/interface_args.carbon @@ -117,39 +117,39 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Action.decl: %Action.type = interface_decl @Action [template = constants.%Action] { -// CHECK:STDOUT: %T.loc4_18.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_18.2: type = bind_symbolic_name T 0, %T.loc4_18.1 [symbolic = @Action.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %A.ref.loc12: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %Action.ref: %Action.type = name_ref Action, %Action.decl [template = constants.%Action] -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] -// CHECK:STDOUT: %.loc12: type = interface_type @Action, @Action(constants.%B) [template = constants.%.6] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %Action.ref: %Action.type = name_ref Action, file.%Action.decl [template = constants.%Action] +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] +// CHECK:STDOUT: %.loc12_17: type = interface_type @Action, @Action(constants.%B) [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %A.ref.loc16: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %a.loc16_6.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: %A = bind_name a, %a.loc16_6.1 +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Action(file.%T.loc4_18.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @Action(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Action, @Action(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @Action, @Action(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %Op.type: type = fn_type @Op.1, @Action(%T) [symbolic = %Op.type (constants.%Op.type.1)] +// CHECK:STDOUT: %Op.type: type = fn_type @Op.1, @Action(%T.1) [symbolic = %Op.type (constants.%Op.type.1)] // CHECK:STDOUT: %Op: @Action.%Op.type (%Op.type.1) = struct_value () [symbolic = %Op (constants.%Op.1)] // CHECK:STDOUT: %.2: type = assoc_entity_type @Action.%.1 (%.2), @Action.%Op.type (%Op.type.1) [symbolic = %.2 (constants.%.3)] // CHECK:STDOUT: %.3: @Action.%.2 (%.3) = assoc_entity element0, %Op.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @Action.%.1 (%.2) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %Op.decl: @Action.%Op.type (%Op.type.1) = fn_decl @Op.1 [symbolic = %Op (constants.%Op.1)] {} +// CHECK:STDOUT: %Op.decl: @Action.%Op.type (%Op.type.1) = fn_decl @Op.1 [symbolic = @Action.%Op (constants.%Op.1)] {} // CHECK:STDOUT: %.loc5: @Action.%.2 (%.3) = assoc_entity element0, %Op.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -161,11 +161,11 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %A as %.6 { // CHECK:STDOUT: %Op.decl: %Op.type.2 = fn_decl @Op.2 [template = constants.%Op.2] {} -// CHECK:STDOUT: %.loc12: = interface_witness (%Op.decl) [template = constants.%.9] +// CHECK:STDOUT: %.loc12_21: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Op = %Op.decl -// CHECK:STDOUT: witness = %.loc12 +// CHECK:STDOUT: witness = %.loc12_21 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { @@ -183,7 +183,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Op.1(file.%T.loc4_18.2: type, @Action.%Self.1: @Action.%.1 (%.2)) { +// CHECK:STDOUT: generic fn @Op.1(@Action.%T.loc4: type, @Action.%Self.1: @Action.%.1 (%.2)) { // CHECK:STDOUT: // CHECK:STDOUT: fn(); // CHECK:STDOUT: } @@ -201,23 +201,23 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %.loc16_23: type = interface_type @Action, @Action(constants.%B) [template = constants.%.6] // CHECK:STDOUT: %.loc16_26: %.7 = specific_constant @Action.%.loc5, @Action(constants.%B) [template = constants.%.8] // CHECK:STDOUT: %Op.ref: %.7 = name_ref Op, %.loc16_26 [template = constants.%.8] -// CHECK:STDOUT: %.loc16_15: %Op.type.3 = interface_witness_access @impl.%.loc12, element0 [template = constants.%Op.2] +// CHECK:STDOUT: %.loc16_15: %Op.type.3 = interface_witness_access @impl.%.loc12_21, element0 [template = constants.%Op.2] // CHECK:STDOUT: %Op.call: init %.1 = call %.loc16_15() // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Action(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Op.1(constants.%T, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @Action(@Action.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Action(@Action.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Action(constants.%B) { -// CHECK:STDOUT: %T => constants.%B +// CHECK:STDOUT: %T.1 => constants.%B // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.6 @@ -291,8 +291,8 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.2 [template = constants.%A] -// CHECK:STDOUT: %a.loc4_6.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @G.%a: %A = bind_name a, %a.loc4_6.1 +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -437,8 +437,8 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.2 [template = constants.%A] -// CHECK:STDOUT: %a.loc8_6.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @G.%a: %A = bind_name a, %a.loc8_6.1 +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -564,35 +564,35 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Factory.decl: %Factory.type = interface_decl @Factory [template = constants.%Factory] { -// CHECK:STDOUT: %T.loc4_19.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_19.2: type = bind_symbolic_name T 0, %T.loc4_19.1 [symbolic = @Factory.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] -// CHECK:STDOUT: %Factory.ref: %Factory.type = name_ref Factory, %Factory.decl [template = constants.%Factory] -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] -// CHECK:STDOUT: %.loc11: type = interface_type @Factory, @Factory(constants.%B) [template = constants.%.6] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] +// CHECK:STDOUT: %Factory.ref: %Factory.type = name_ref Factory, file.%Factory.decl [template = constants.%Factory] +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] +// CHECK:STDOUT: %.loc11_18: type = interface_type @Factory, @Factory(constants.%B) [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Factory(file.%T.loc4_19.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @Factory(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Factory, @Factory(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @Factory, @Factory(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %Make.type: type = fn_type @Make.1, @Factory(%T) [symbolic = %Make.type (constants.%Make.type.1)] +// CHECK:STDOUT: %Make.type: type = fn_type @Make.1, @Factory(%T.1) [symbolic = %Make.type (constants.%Make.type.1)] // CHECK:STDOUT: %Make: @Factory.%Make.type (%Make.type.1) = struct_value () [symbolic = %Make (constants.%Make.1)] // CHECK:STDOUT: %.2: type = assoc_entity_type @Factory.%.1 (%.2), @Factory.%Make.type (%Make.type.1) [symbolic = %.2 (constants.%.3)] // CHECK:STDOUT: %.3: @Factory.%.2 (%.3) = assoc_entity element0, %Make.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @Factory.%.1 (%.2) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %Make.decl: @Factory.%Make.type (%Make.type.1) = fn_decl @Make.1 [symbolic = %Make (constants.%Make.1)] { -// CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc4_19.2 [symbolic = @Make.1.%T (constants.%T)] -// CHECK:STDOUT: %return.var: ref @Make.1.%T (%T) = var +// CHECK:STDOUT: %Make.decl: @Factory.%Make.type (%Make.type.1) = fn_decl @Make.1 [symbolic = @Factory.%Make (constants.%Make.1)] { +// CHECK:STDOUT: %T.ref: type = name_ref T, @Factory.%T.loc4 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: %return: ref @Make.1.%T (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc5: @Factory.%.2 (%.3) = assoc_entity element0, %Make.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: @@ -606,13 +606,13 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: impl @impl: %A as %.6 { // CHECK:STDOUT: %Make.decl: %Make.type.2 = fn_decl @Make.2 [template = constants.%Make.2] { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] -// CHECK:STDOUT: %return.var: ref %B = var +// CHECK:STDOUT: %return: ref %B = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc11: = interface_witness (%Make.decl) [template = constants.%.9] +// CHECK:STDOUT: %.loc11_22: = interface_witness (%Make.decl) [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Make = %Make.decl -// CHECK:STDOUT: witness = %.loc11 +// CHECK:STDOUT: witness = %.loc11_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { @@ -625,7 +625,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: .Self = constants.%B // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @Make.1(file.%T.loc4_19.2: type, @Factory.%Self.1: @Factory.%.1 (%.2)) { +// CHECK:STDOUT: generic fn @Make.1(@Factory.%T.loc4: type, @Factory.%Self.1: @Factory.%.1 (%.2)) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: fn() -> @Make.1.%T (%T); @@ -634,19 +634,19 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: fn @Make.2() -> %B; // CHECK:STDOUT: // CHECK:STDOUT: specific @Factory(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Make.1(constants.%T, constants.%Self) { // CHECK:STDOUT: %T => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Factory(@Factory.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @Factory(@Factory.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Factory(constants.%B) { -// CHECK:STDOUT: %T => constants.%B +// CHECK:STDOUT: %T.1 => constants.%B // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.6 @@ -718,10 +718,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %MakeB.decl: %MakeB.type = fn_decl @MakeB [template = constants.%MakeB] { // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.2 [template = constants.%A] -// CHECK:STDOUT: %a.loc4_10.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @MakeB.%a: %A = bind_name a, %a.loc4_10.1 -// CHECK:STDOUT: %B.ref: type = name_ref B, imports.%import_ref.3 [template = constants.%B] -// CHECK:STDOUT: @MakeB.%return: ref %B = var +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param +// CHECK:STDOUT: %B.ref.loc4: type = name_ref B, imports.%import_ref.3 [template = constants.%B] +// CHECK:STDOUT: %return: ref %B = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -769,7 +769,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a // CHECK:STDOUT: %Factory.ref: %Factory.type = name_ref Factory, imports.%import_ref.1 [template = constants.%Factory] -// CHECK:STDOUT: %B.ref: type = name_ref B, imports.%import_ref.3 [template = constants.%B] +// CHECK:STDOUT: %B.ref.loc5: type = name_ref B, imports.%import_ref.3 [template = constants.%B] // CHECK:STDOUT: %.loc5_20: type = interface_type @Factory, @Factory(constants.%B) [template = constants.%.4] // CHECK:STDOUT: %.loc5_23: %.7 = specific_constant imports.%import_ref.7, @Factory(constants.%B) [template = constants.%.8] // CHECK:STDOUT: %Make.ref: %.7 = name_ref Make, %.loc5_23 [template = constants.%.8] @@ -867,10 +867,10 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %MakeC.decl: %MakeC.type = fn_decl @MakeC [template = constants.%MakeC] { // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.2 [template = constants.%A] -// CHECK:STDOUT: %a.loc6_10.1: %A = param a, runtime_param0 -// CHECK:STDOUT: @MakeC.%a: %A = bind_name a, %a.loc6_10.1 -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @MakeC.%return: ref %C = var +// CHECK:STDOUT: %a.param: %A = param a, runtime_param0 +// CHECK:STDOUT: %a: %A = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -923,7 +923,7 @@ fn MakeC(a: A) -> C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref: %A = name_ref a, %a // CHECK:STDOUT: %Factory.ref: %Factory.type = name_ref Factory, imports.%import_ref.1 [template = constants.%Factory] -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc10: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc10_20: type = interface_type @Factory, @Factory(constants.%C) [template = constants.%.10] // CHECK:STDOUT: %.loc10_23: %.11 = specific_constant imports.%import_ref.7, @Factory(constants.%C) [template = constants.%.12] // CHECK:STDOUT: %Make.ref: %.11 = name_ref Make, %.loc10_23 [template = constants.%.12] 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 c0462d46c21bb..54200e11ca928 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 @@ -95,7 +95,7 @@ impl () as D; // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc6_7.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc6_7.2: type = converted %.loc6_7.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%.1] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -148,10 +148,10 @@ impl () as D; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %.1 as %.2 { -// CHECK:STDOUT: %.loc6: = interface_witness () [template = constants.%.3] +// CHECK:STDOUT: %.loc6_14: = interface_witness () [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc6 +// CHECK:STDOUT: witness = %.loc6_14 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- use_decl_in_api.carbon @@ -205,7 +205,7 @@ impl () as D; // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc6_7.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc6_7.2: type = converted %.loc6_7.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%.1] +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -264,7 +264,7 @@ impl () as D; // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc6_7.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc6_7.2: type = converted %.loc6_7.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -336,7 +336,7 @@ impl () as D; // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc9_7.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc9_7.2: type = converted %.loc9_7.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %D.ref: type = name_ref D, %D.decl [template = constants.%.1] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon b/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon index a461abbbdd404..569bd4384dbd1 100644 --- a/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon +++ b/toolchain/check/testdata/impl/no_prelude/self_in_class.carbon @@ -56,23 +56,23 @@ class A { // CHECK:STDOUT: interface @DefaultConstructible { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %Make.decl: %Make.type.1 = fn_decl @Make.1 [template = constants.%Make.1] { -// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, %Self [symbolic = @Make.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_16.1: type = facet_type_access %Self.ref [symbolic = @Make.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_16.2: type = converted %Self.ref, %.loc12_16.1 [symbolic = @Make.1.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @Make.1.%Self (%Self) = var +// CHECK:STDOUT: %Self.ref: %.1 = name_ref Self, @DefaultConstructible.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_16.1: type = facet_type_access %Self.ref [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_16.2: type = converted %Self.ref, %.loc12_16.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @Make.1.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12_20: %.3 = assoc_entity element0, %Make.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %Make.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .Make = %.loc12_20 +// CHECK:STDOUT: .Make = %.loc12 // CHECK:STDOUT: witness = (%Make.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C as %.1 { // CHECK:STDOUT: %Make.decl: %Make.type.2 = fn_decl @Make.2 [template = constants.%Make.2] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc18: = interface_witness (%Make.decl) [template = constants.%.6] // CHECK:STDOUT: @@ -102,12 +102,12 @@ class A { // CHECK:STDOUT: fn() -> @Make.1.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Make.2() -> @impl.%return.var: %C { +// CHECK:STDOUT: fn @Make.2() -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc21_33.1: %.5 = struct_literal () -// CHECK:STDOUT: %.loc21_33.2: init %C = class_init (), @impl.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc21_33.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc21_34: init %C = converted %.loc21_33.1, %.loc21_33.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc21_34 to @impl.%return.var +// CHECK:STDOUT: return %.loc21_34 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Make.1(constants.%Self) { diff --git a/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon b/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon index 03ae456d0a405..16d37462a2eba 100644 --- a/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon +++ b/toolchain/check/testdata/impl/no_prelude/self_in_signature.carbon @@ -93,86 +93,86 @@ impl D as SelfNested { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %UseSelf.ref.loc19: type = name_ref UseSelf, %UseSelf.decl [template = constants.%.1] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %UseSelf.ref: type = name_ref UseSelf, file.%UseSelf.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %D.ref.loc23: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %UseSelf.ref.loc23: type = name_ref UseSelf, %UseSelf.decl [template = constants.%.1] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %UseSelf.ref: type = name_ref UseSelf, file.%UseSelf.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: %SelfNested.decl: type = interface_decl @SelfNested [template = constants.%.9] {} // CHECK:STDOUT: impl_decl @impl.3 { -// CHECK:STDOUT: %C.ref.loc31: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %SelfNested.ref.loc31: type = name_ref SelfNested, %SelfNested.decl [template = constants.%.9] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %SelfNested.ref: type = name_ref SelfNested, file.%SelfNested.decl [template = constants.%.9] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.4 { -// CHECK:STDOUT: %D.ref.loc35: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %SelfNested.ref.loc35: type = name_ref SelfNested, %SelfNested.decl [template = constants.%.9] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %SelfNested.ref: type = name_ref SelfNested, file.%SelfNested.decl [template = constants.%.9] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @UseSelf { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self.1] // CHECK:STDOUT: %F.decl: %F.type.1 = fn_decl @F.1 [template = constants.%F.1] { -// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %self.loc12_8.1: @F.1.%Self (%Self.1) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: @F.1.%Self (%Self.1) = bind_name self, %self.loc12_8.1 -// CHECK:STDOUT: %Self.ref.loc12_23: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_23.1: type = facet_type_access %Self.ref.loc12_23 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_23.2: type = converted %Self.ref.loc12_23, %.loc12_23.1 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %x.loc12_20.1: @F.1.%Self (%Self.1) = param x, runtime_param1 -// CHECK:STDOUT: %x.loc12_20.2: @F.1.%Self (%Self.1) = bind_name x, %x.loc12_20.1 -// CHECK:STDOUT: %Self.ref.loc12_32: %.1 = name_ref Self, %Self [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_32.1: type = facet_type_access %Self.ref.loc12_32 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %.loc12_32.2: type = converted %Self.ref.loc12_32, %.loc12_32.1 [symbolic = @F.1.%Self (constants.%Self.1)] -// CHECK:STDOUT: %return.var: ref @F.1.%Self (%Self.1) = var +// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %self.param: @F.1.%Self (%Self.1) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.1.%Self (%Self.1) = bind_name self, %self.param +// CHECK:STDOUT: %Self.ref.loc12_23: %.1 = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_23.1: type = facet_type_access %Self.ref.loc12_23 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_23.2: type = converted %Self.ref.loc12_23, %.loc12_23.1 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %x.param: @F.1.%Self (%Self.1) = param x, runtime_param1 +// CHECK:STDOUT: %x: @F.1.%Self (%Self.1) = bind_name x, %x.param +// CHECK:STDOUT: %Self.ref.loc12_32: %.1 = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_32.1: type = facet_type_access %Self.ref.loc12_32 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %.loc12_32.2: type = converted %Self.ref.loc12_32, %.loc12_32.1 [symbolic = %Self (constants.%Self.1)] +// CHECK:STDOUT: %return: ref @F.1.%Self (%Self.1) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12_36: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc12_36 +// CHECK:STDOUT: .F = %.loc12 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @SelfNested { // CHECK:STDOUT: %Self: %.9 = bind_symbolic_name Self 0 [symbolic = constants.%Self.2] // CHECK:STDOUT: %F.decl: %F.type.4 = fn_decl @F.4 [template = constants.%F.4] { -// CHECK:STDOUT: %Self.ref.loc28_12: %.9 = name_ref Self, %Self [symbolic = @F.4.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc28_16.1: type = facet_type_access %Self.ref.loc28_12 [symbolic = @F.4.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc28_16.2: type = converted %Self.ref.loc28_12, %.loc28_16.1 [symbolic = @F.4.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc28_16.3: type = ptr_type %Self.2 [symbolic = @F.4.%.1 (constants.%.10)] -// CHECK:STDOUT: %Self.ref.loc28_24: %.9 = name_ref Self, %Self [symbolic = @F.4.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc28_24.1: type = facet_type_access %Self.ref.loc28_24 [symbolic = @F.4.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc28_24.2: type = converted %Self.ref.loc28_24, %.loc28_24.1 [symbolic = @F.4.%Self (constants.%Self.2)] +// CHECK:STDOUT: %Self.ref.loc28_12: %.9 = name_ref Self, @SelfNested.%Self [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc28_16.1: type = facet_type_access %Self.ref.loc28_12 [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc28_16.2: type = converted %Self.ref.loc28_12, %.loc28_16.1 [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc28_16.3: type = ptr_type %Self.2 [symbolic = %.1 (constants.%.10)] +// CHECK:STDOUT: %Self.ref.loc28_24: %.9 = name_ref Self, @SelfNested.%Self [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc28_24.1: type = facet_type_access %Self.ref.loc28_24 [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc28_24.2: type = converted %Self.ref.loc28_24, %.loc28_24.1 [symbolic = %Self (constants.%Self.2)] // CHECK:STDOUT: %.loc28_35.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc28_35.2: type = converted %.loc28_35.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %.loc28_36: type = struct_type {.x: %Self.2, .y: %.2} [symbolic = @F.4.%.2 (constants.%.11)] +// CHECK:STDOUT: %.loc28_36: type = struct_type {.x: %Self.2, .y: %.2} [symbolic = %.2 (constants.%.11)] // CHECK:STDOUT: %.loc28_37.1: %.12 = tuple_literal (%.loc28_16.3, %.loc28_36) -// CHECK:STDOUT: %.loc28_37.2: type = converted %.loc28_37.1, constants.%.13 [symbolic = @F.4.%.3 (constants.%.13)] -// CHECK:STDOUT: %x.loc28_8.1: @F.4.%.3 (%.13) = param x, runtime_param0 -// CHECK:STDOUT: %x.loc28_8.2: @F.4.%.3 (%.13) = bind_name x, %x.loc28_8.1 +// CHECK:STDOUT: %.loc28_37.2: type = converted %.loc28_37.1, constants.%.13 [symbolic = %.3 (constants.%.13)] +// CHECK:STDOUT: %x.param: @F.4.%.3 (%.13) = param x, runtime_param0 +// CHECK:STDOUT: %x: @F.4.%.3 (%.13) = bind_name x, %x.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc28_39: %.14 = assoc_entity element0, %F.decl [template = constants.%.15] +// CHECK:STDOUT: %.loc28: %.14 = assoc_entity element0, %F.decl [template = constants.%.15] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc28_39 +// CHECK:STDOUT: .F = %.loc28 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: %C as %.1 { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %C.ref.loc20_14: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc20_8.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc20_8.2: %C = bind_name self, %self.loc20_8.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc20_20: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %x.loc20_17.1: %C = param x, runtime_param1 -// CHECK:STDOUT: %x.loc20_17.2: %C = bind_name x, %x.loc20_17.1 +// CHECK:STDOUT: %x.param: %C = param x, runtime_param1 +// CHECK:STDOUT: %x: %C = bind_name x, %x.param // CHECK:STDOUT: %C.ref.loc20_26: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc19: = interface_witness (%F.decl) [template = constants.%.6] // CHECK:STDOUT: @@ -184,13 +184,13 @@ impl D as SelfNested { // CHECK:STDOUT: impl @impl.2: %D as %.1 { // CHECK:STDOUT: %F.decl: %F.type.3 = fn_decl @F.3 [template = constants.%F.3] { // CHECK:STDOUT: %Self.ref.loc24_14: type = name_ref Self, constants.%D [template = constants.%D] -// CHECK:STDOUT: %self.loc24_8.1: %D = param self, runtime_param0 -// CHECK:STDOUT: %self.loc24_8.2: %D = bind_name self, %self.loc24_8.1 +// CHECK:STDOUT: %self.param: %D = param self, runtime_param0 +// CHECK:STDOUT: %self: %D = bind_name self, %self.param // CHECK:STDOUT: %Self.ref.loc24_23: type = name_ref Self, constants.%D [template = constants.%D] -// CHECK:STDOUT: %x.loc24_20.1: %D = param x, runtime_param1 -// CHECK:STDOUT: %x.loc24_20.2: %D = bind_name x, %x.loc24_20.1 +// CHECK:STDOUT: %x.param: %D = param x, runtime_param1 +// CHECK:STDOUT: %x: %D = bind_name x, %x.param // CHECK:STDOUT: %Self.ref.loc24_32: type = name_ref Self, constants.%D [template = constants.%D] -// CHECK:STDOUT: %return.var: ref %D = var +// CHECK:STDOUT: %return: ref %D = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc23: = interface_witness (%F.decl) [template = constants.%.8] // CHECK:STDOUT: @@ -209,8 +209,8 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc32_30: type = struct_type {.x: %C, .y: %.2} [template = constants.%.17] // CHECK:STDOUT: %.loc32_31.1: %.12 = tuple_literal (%.loc32_13, %.loc32_30) // CHECK:STDOUT: %.loc32_31.2: type = converted %.loc32_31.1, constants.%.18 [template = constants.%.18] -// CHECK:STDOUT: %x.loc32_8.1: %.18 = param x, runtime_param0 -// CHECK:STDOUT: %x.loc32_8.2: %.18 = bind_name x, %x.loc32_8.1 +// CHECK:STDOUT: %x.param: %.18 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.18 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc31: = interface_witness (%F.decl) [template = constants.%.19] // CHECK:STDOUT: @@ -229,8 +229,8 @@ impl D as SelfNested { // CHECK:STDOUT: %.loc36_36: type = struct_type {.x: %D, .y: %.2} [template = constants.%.21] // CHECK:STDOUT: %.loc36_37.1: %.12 = tuple_literal (%.loc36_16, %.loc36_36) // CHECK:STDOUT: %.loc36_37.2: type = converted %.loc36_37.1, constants.%.22 [template = constants.%.22] -// CHECK:STDOUT: %x.loc36_8.1: %.22 = param x, runtime_param0 -// CHECK:STDOUT: %x.loc36_8.2: %.22 = bind_name x, %x.loc36_8.1 +// CHECK:STDOUT: %x.param: %.22 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.22 = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc35: = interface_witness (%F.decl) [template = constants.%.23] // CHECK:STDOUT: @@ -252,23 +252,23 @@ impl D as SelfNested { // CHECK:STDOUT: generic fn @F.1(@UseSelf.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.1)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@UseSelf.%self.loc12_8.2: @F.1.%Self (%Self.1)](@UseSelf.%x.loc12_20.2: @F.1.%Self (%Self.1)) -> @F.1.%Self (%Self.1); +// CHECK:STDOUT: fn[%self: @F.1.%Self (%Self.1)](%x: @F.1.%Self (%Self.1)) -> @F.1.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2[@impl.1.%self.loc20_8.2: %C](@impl.1.%x.loc20_17.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @F.2[%self: %C](%x: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc20_38.1: %.5 = struct_literal () -// CHECK:STDOUT: %.loc20_38.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct.1] +// CHECK:STDOUT: %.loc20_38.2: init %C = class_init (), %return [template = constants.%struct.1] // CHECK:STDOUT: %.loc20_39: init %C = converted %.loc20_38.1, %.loc20_38.2 [template = constants.%struct.1] -// CHECK:STDOUT: return %.loc20_39 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc20_39 to %return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.3[@impl.2.%self.loc24_8.2: %D](@impl.2.%x.loc24_20.2: %D) -> @impl.2.%return.var: %D { +// CHECK:STDOUT: fn @F.3[%self: %D](%x: %D) -> %return: %D { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc24_47.1: %.5 = struct_literal () -// CHECK:STDOUT: %.loc24_47.2: init %D = class_init (), @impl.2.%return.var [template = constants.%struct.2] +// CHECK:STDOUT: %.loc24_47.2: init %D = class_init (), %return [template = constants.%struct.2] // CHECK:STDOUT: %.loc24_48: init %D = converted %.loc24_47.1, %.loc24_47.2 [template = constants.%struct.2] -// CHECK:STDOUT: return %.loc24_48 to @impl.2.%return.var +// CHECK:STDOUT: return %.loc24_48 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F.4(@SelfNested.%Self: %.9) { @@ -277,12 +277,12 @@ impl D as SelfNested { // CHECK:STDOUT: %.2: type = struct_type {.x: @F.4.%Self (%Self.2), .y: %.2} [symbolic = %.2 (constants.%.11)] // CHECK:STDOUT: %.3: type = tuple_type (@F.4.%.1 (%.10), @F.4.%.2 (%.11)) [symbolic = %.3 (constants.%.13)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@SelfNested.%x.loc28_8.2: @F.4.%.3 (%.13)); +// CHECK:STDOUT: fn(%x: @F.4.%.3 (%.13)); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.5(@impl.3.%x.loc32_8.2: %.18); +// CHECK:STDOUT: fn @F.5(%x: %.18); // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.6(@impl.4.%x.loc36_8.2: %.22); +// CHECK:STDOUT: fn @F.6(%x: %.22); // CHECK:STDOUT: // CHECK:STDOUT: specific @F.1(constants.%Self.1) { // CHECK:STDOUT: %Self => constants.%Self.1 diff --git a/toolchain/check/testdata/impl/redeclaration.carbon b/toolchain/check/testdata/impl/redeclaration.carbon index 89f419cc114b3..839a34df32439 100644 --- a/toolchain/check/testdata/impl/redeclaration.carbon +++ b/toolchain/check/testdata/impl/redeclaration.carbon @@ -58,14 +58,14 @@ impl i32 as I {} // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_6.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_6.2: type = converted %int.make_type_32.loc13, %.loc13_6.1 [template = i32] -// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref.loc13: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %int.make_type_32.loc19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc19_6.1: type = value_of_initializer %int.make_type_32.loc19 [template = i32] // CHECK:STDOUT: %.loc19_6.2: type = converted %int.make_type_32.loc19, %.loc19_6.1 [template = i32] -// CHECK:STDOUT: %I.ref.loc19: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref.loc19: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -78,18 +78,18 @@ impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as %.1 { -// CHECK:STDOUT: %.loc19: = interface_witness () [template = constants.%.4] +// CHECK:STDOUT: %.loc19_15: = interface_witness () [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc19 +// CHECK:STDOUT: witness = %.loc19_15 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc16_8.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc16_8.2: type = converted %int.make_type_32, %.loc16_8.1 [template = i32] -// CHECK:STDOUT: %I.ref: type = name_ref I, file.%I.decl [template = constants.%.1] +// CHECK:STDOUT: %int.make_type_32.loc16: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc16_8.1: type = value_of_initializer %int.make_type_32.loc16 [template = i32] +// CHECK:STDOUT: %.loc16_8.2: type = converted %int.make_type_32.loc16, %.loc16_8.1 [template = i32] +// CHECK:STDOUT: %I.ref.loc16: type = name_ref I, file.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 2ed51bc49110f..8f71cdb7c52fd 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -76,12 +76,12 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_17: i32 = int_literal 3 [template = constants.%.2] -// CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32.loc11, %.loc11_12.1 [template = i32] +// CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32, %.loc11_12.1 [template = i32] // CHECK:STDOUT: %.loc11_18: type = array_type %.loc11_17, i32 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] @@ -89,8 +89,8 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: %.loc13_10.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_10.2: type = converted %int.make_type_32.loc13, %.loc13_10.1 [template = i32] // CHECK:STDOUT: %.loc13_16: type = array_type %.loc13_15, i32 [template = constants.%.3] -// CHECK:STDOUT: %b.loc13_6.1: %.3 = param b, runtime_param0 -// CHECK:STDOUT: @G.%b: %.3 = bind_name b, %b.loc13_6.1 +// CHECK:STDOUT: %b.param: %.3 = param b, runtime_param0 +// CHECK:STDOUT: %b: %.3 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: %ValueBinding.decl: %ValueBinding.type = fn_decl @ValueBinding [template = constants.%ValueBinding] { // CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] @@ -98,8 +98,8 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: %.loc21_21.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] // CHECK:STDOUT: %.loc21_21.2: type = converted %int.make_type_32.loc21, %.loc21_21.1 [template = i32] // CHECK:STDOUT: %.loc21_27: type = array_type %.loc21_26, i32 [template = constants.%.3] -// CHECK:STDOUT: %b.loc21_17.1: %.3 = param b, runtime_param0 -// CHECK:STDOUT: @ValueBinding.%b: %.3 = bind_name b, %b.loc21_17.1 +// CHECK:STDOUT: %b.param: %.3 = param b, runtime_param0 +// CHECK:STDOUT: %b: %.3 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -153,10 +153,10 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: // CHECK:STDOUT: fn @ValueBinding(%b: %.3) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_16: i32 = int_literal 3 [template = constants.%.2] -// CHECK:STDOUT: %.loc22_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc22_11.2: type = converted %int.make_type_32, %.loc22_11.1 [template = i32] +// CHECK:STDOUT: %.loc22_11.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] +// CHECK:STDOUT: %.loc22_11.2: type = converted %int.make_type_32.loc22, %.loc22_11.1 [template = i32] // CHECK:STDOUT: %.loc22_17: type = array_type %.loc22_16, i32 [template = constants.%.3] // CHECK:STDOUT: %a.var: ref %.3 = var a // CHECK:STDOUT: %a: ref %.3 = bind_name a, %a.var diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 64152ed266f2d..16ea4278fb8eb 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -77,12 +77,12 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_17: i32 = int_literal 3 [template = constants.%.2] -// CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32.loc11, %.loc11_12.1 [template = i32] +// CHECK:STDOUT: %.loc11_12.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_12.2: type = converted %int.make_type_32, %.loc11_12.1 [template = i32] // CHECK:STDOUT: %.loc11_18: type = array_type %.loc11_17, i32 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { // CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] @@ -90,8 +90,8 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: %.loc13_10.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] // CHECK:STDOUT: %.loc13_10.2: type = converted %int.make_type_32.loc13, %.loc13_10.1 [template = i32] // CHECK:STDOUT: %.loc13_16: type = array_type %.loc13_15, i32 [template = constants.%.3] -// CHECK:STDOUT: %b.loc13_6.1: %.3 = param b, runtime_param0 -// CHECK:STDOUT: @G.%b: %.3 = bind_name b, %b.loc13_6.1 +// CHECK:STDOUT: %b.param: %.3 = param b, runtime_param0 +// CHECK:STDOUT: %b: %.3 = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 ebd8e1d917c5f..50c44b032230f 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 @@ -71,24 +71,24 @@ interface Interface { // CHECK:STDOUT: %int.make_type_32.loc21_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_19.1: type = value_of_initializer %int.make_type_32.loc21_19 [template = i32] // CHECK:STDOUT: %.loc21_19.2: type = converted %int.make_type_32.loc21_19, %.loc21_19.1 [template = i32] -// CHECK:STDOUT: %a.loc21_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: %a.loc21_16.2: i32 = bind_name a, %a.loc21_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc21_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_27.1: type = value_of_initializer %int.make_type_32.loc21_27 [template = i32] // CHECK:STDOUT: %.loc21_27.2: type = converted %int.make_type_32.loc21_27, %.loc21_27.1 [template = i32] -// CHECK:STDOUT: %b.loc21_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: %b.loc21_24.2: i32 = bind_name b, %b.loc21_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc21_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_35.1: type = value_of_initializer %int.make_type_32.loc21_35 [template = i32] // CHECK:STDOUT: %.loc21_35.2: type = converted %int.make_type_32.loc21_35, %.loc21_35.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc21_39: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] +// CHECK:STDOUT: %.loc21: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %.loc16 -// CHECK:STDOUT: .G = %.loc21_39 +// CHECK:STDOUT: .G = %.loc21 // CHECK:STDOUT: witness = (%F.decl, %G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -105,7 +105,7 @@ interface Interface { // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G(@Interface.%Self: %.1) { // CHECK:STDOUT: -// CHECK:STDOUT: fn(@Interface.%a.loc21_16.2: i32, @Interface.%b.loc21_24.2: i32) -> i32 = "int.sadd"; +// CHECK:STDOUT: fn(%a: i32, %b: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%Self) {} 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 19a2c2b255a97..a0e8e5841cf9f 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 @@ -112,17 +112,17 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: %int.make_type_32.loc31_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_19.1: type = value_of_initializer %int.make_type_32.loc31_19 [template = i32] // CHECK:STDOUT: %.loc31_19.2: type = converted %int.make_type_32.loc31_19, %.loc31_19.1 [template = i32] -// CHECK:STDOUT: %a.loc31_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @.2.%a: i32 = bind_name a, %a.loc31_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc31_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_27.1: type = value_of_initializer %int.make_type_32.loc31_27 [template = i32] // CHECK:STDOUT: %.loc31_27.2: type = converted %int.make_type_32.loc31_27, %.loc31_27.1 [template = i32] -// CHECK:STDOUT: %b.loc31_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: @.2.%b: i32 = bind_name b, %b.loc31_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc31_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc31_35.1: type = value_of_initializer %int.make_type_32.loc31_35 [template = i32] // CHECK:STDOUT: %.loc31_35.2: type = converted %int.make_type_32.loc31_35, %.loc31_35.1 [template = i32] -// CHECK:STDOUT: @.2.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -134,24 +134,24 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: %int.make_type_32.loc13_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_19.1: type = value_of_initializer %int.make_type_32.loc13_19 [template = i32] // CHECK:STDOUT: %.loc13_19.2: type = converted %int.make_type_32.loc13_19, %.loc13_19.1 [template = i32] -// CHECK:STDOUT: %a.loc13_16.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: %a.loc13_16.2: i32 = bind_name a, %a.loc13_16.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc13_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_27.1: type = value_of_initializer %int.make_type_32.loc13_27 [template = i32] // CHECK:STDOUT: %.loc13_27.2: type = converted %int.make_type_32.loc13_27, %.loc13_27.1 [template = i32] -// CHECK:STDOUT: %b.loc13_24.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: %b.loc13_24.2: i32 = bind_name b, %b.loc13_24.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc13_35: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc13_35.1: type = value_of_initializer %int.make_type_32.loc13_35 [template = i32] // CHECK:STDOUT: %.loc13_35.2: type = converted %int.make_type_32.loc13_35, %.loc13_35.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc13_38: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] +// CHECK:STDOUT: %.loc13: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %.loc7 -// CHECK:STDOUT: .G = %.loc13_38 +// CHECK:STDOUT: .G = %.loc13 // CHECK:STDOUT: witness = (%F.decl, %G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: @@ -164,7 +164,7 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G(@Interface.%Self: %.1) { // CHECK:STDOUT: -// CHECK:STDOUT: fn(@Interface.%a.loc13_16.2: i32, @Interface.%b.loc13_24.2: i32) -> i32; +// CHECK:STDOUT: fn(%a: i32, %b: i32) -> i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @.1(@Interface.%Self: %.1) { @@ -226,16 +226,16 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: %Interface.decl: type = interface_decl @Interface [template = constants.%.1] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [symbolic = constants.%F] { // CHECK:STDOUT: %.loc20: type = specific_constant constants.%C.2, @C(constants.%Self) [symbolic = constants.%C.2] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc20 [symbolic = constants.%C.2] -// CHECK:STDOUT: %self.loc20_18.1: %C.2 = param self, runtime_param0 -// CHECK:STDOUT: @F.%self: %C.2 = bind_name self, %self.loc20_18.1 -// CHECK:STDOUT: %U.loc20_30.1: type = param U, runtime_param -// CHECK:STDOUT: @F.%U.loc20: type = bind_symbolic_name U 1, %U.loc20_30.1 [symbolic = constants.%U] -// CHECK:STDOUT: %U.ref.loc20_43: type = name_ref U, @F.%U.loc20 [symbolic = constants.%U] -// CHECK:STDOUT: %u.loc20_40.1: %U = param u, runtime_param1 -// CHECK:STDOUT: @F.%u: %U = bind_name u, %u.loc20_40.1 -// CHECK:STDOUT: %U.ref.loc20_49: type = name_ref U, @F.%U.loc20 [symbolic = constants.%U] -// CHECK:STDOUT: @F.%return: ref %U = var +// CHECK:STDOUT: %Self.ref.loc20: type = name_ref Self, %.loc20 [symbolic = constants.%C.2] +// CHECK:STDOUT: %self.param.loc20: %C.2 = param self, runtime_param0 +// CHECK:STDOUT: %self.loc20: %C.2 = bind_name self, %self.param.loc20 +// CHECK:STDOUT: %U.param.loc20: type = param U, runtime_param +// CHECK:STDOUT: %U.loc20: type = bind_symbolic_name U 1, %U.param.loc20 [symbolic = constants.%U] +// CHECK:STDOUT: %U.ref.loc20_43: type = name_ref U, %U.loc20 [symbolic = constants.%U] +// CHECK:STDOUT: %u.param.loc20: %U = param u, runtime_param1 +// CHECK:STDOUT: %u.loc20: %U = bind_name u, %u.param.loc20 +// CHECK:STDOUT: %U.ref.loc20_49: type = name_ref U, %U.loc20 [symbolic = constants.%U] +// CHECK:STDOUT: %return: ref %U = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -256,18 +256,18 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: %F: @C.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: // CHECK:STDOUT: class { -// CHECK:STDOUT: %F.decl: @C.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %.loc14: type = specific_constant constants.%C.2, @C(constants.%Self) [symbolic = @F.%C (constants.%C.2)] -// CHECK:STDOUT: %Self.ref: type = name_ref Self, %.loc14 [symbolic = @F.%C (constants.%C.2)] -// CHECK:STDOUT: %self.loc14_10.1: @F.%C (%C.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_10.2: @F.%C (%C.2) = bind_name self, %self.loc14_10.1 -// CHECK:STDOUT: %U.loc14_22.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc14_22.2: type = bind_symbolic_name U 1, %U.loc14_22.1 [symbolic = @F.%U.1 (constants.%U)] -// CHECK:STDOUT: %U.ref.loc14_35: type = name_ref U, %U.loc14_22.2 [symbolic = @F.%U.1 (constants.%U)] -// CHECK:STDOUT: %u.loc14_32.1: @F.%U.1 (%U) = param u, runtime_param1 -// CHECK:STDOUT: %u.loc14_32.2: @F.%U.1 (%U) = bind_name u, %u.loc14_32.1 -// CHECK:STDOUT: %U.ref.loc14_41: type = name_ref U, %U.loc14_22.2 [symbolic = @F.%U.1 (constants.%U)] -// CHECK:STDOUT: %return.var: ref @F.%U.1 (%U) = var +// CHECK:STDOUT: %F.decl: @C.%F.type (%F.type) = fn_decl @F [symbolic = @C.%F (constants.%F)] { +// CHECK:STDOUT: %.loc14: type = specific_constant constants.%C.2, @C(constants.%Self) [symbolic = %C (constants.%C.2)] +// CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, %.loc14 [symbolic = %C (constants.%C.2)] +// CHECK:STDOUT: %self.param.loc14: @F.%C (%C.2) = param self, runtime_param0 +// CHECK:STDOUT: %self.loc14: @F.%C (%C.2) = bind_name self, %self.param.loc14 +// CHECK:STDOUT: %U.param.loc14: type = param U, runtime_param +// CHECK:STDOUT: %U.loc14: type = bind_symbolic_name U 1, %U.param.loc14 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %U.ref.loc14_35: type = name_ref U, %U.loc14 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %u.param.loc14: @F.%U.1 (%U) = param u, runtime_param1 +// CHECK:STDOUT: %u.loc14: @F.%U.1 (%U) = bind_name u, %u.param.loc14 +// CHECK:STDOUT: %U.ref.loc14_41: type = name_ref U, %U.loc14 [symbolic = %U.1 (constants.%U)] +// CHECK:STDOUT: %return.var.loc14: ref @F.%U.1 (%U) = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -276,16 +276,16 @@ fn Interface.C.F[self: Self](U:! type, u: U) -> U { return u; } // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(@Interface.%Self: %.1, @C.%U.loc14_22.2: type) { +// CHECK:STDOUT: generic fn @F(@Interface.%Self: %.1, %U.loc14: type) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: %C: type = class_type @C, @C(%Self) [symbolic = %C (constants.%C.2)] // CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: -// CHECK:STDOUT: fn[%self: %C.2](%U.loc20: type, %u: %U) -> %U { +// CHECK:STDOUT: fn[%self.loc20: %C.2](%U.loc20: type, %u.loc20: %U) -> %U { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %u.ref: @F.%U.1 (%U) = name_ref u, %u +// CHECK:STDOUT: %u.ref: @F.%U.1 (%U) = name_ref u, %u.loc20 // CHECK:STDOUT: return %u.ref // CHECK:STDOUT: } // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/as_type.carbon b/toolchain/check/testdata/interface/no_prelude/as_type.carbon index 7e3b42ad3222a..88df95f1cbbac 100644 --- a/toolchain/check/testdata/interface/no_prelude/as_type.carbon +++ b/toolchain/check/testdata/interface/no_prelude/as_type.carbon @@ -29,9 +29,9 @@ fn F(e: Empty) {} // CHECK:STDOUT: } // CHECK:STDOUT: %Empty.decl: type = interface_decl @Empty [template = constants.%.1] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] -// CHECK:STDOUT: %e.loc13_6.1: %.1 = param e, runtime_param0 -// CHECK:STDOUT: @F.%e: %.1 = bind_name e, %e.loc13_6.1 +// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, file.%Empty.decl [template = constants.%.1] +// CHECK:STDOUT: %e.param: %.1 = param e, runtime_param0 +// CHECK:STDOUT: %e: %.1 = bind_name e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/as_type_of_type.carbon b/toolchain/check/testdata/interface/no_prelude/as_type_of_type.carbon index e7615eaef5764..fc872ce3078f0 100644 --- a/toolchain/check/testdata/interface/no_prelude/as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/no_prelude/as_type_of_type.carbon @@ -32,9 +32,9 @@ fn F(T:! Empty) { // CHECK:STDOUT: } // CHECK:STDOUT: %Empty.decl: type = interface_decl @Empty [template = constants.%.1] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] -// CHECK:STDOUT: %T.loc13_6.1: %.1 = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc13: %.1 = bind_symbolic_name T 0, %T.loc13_6.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %Empty.ref: type = name_ref Empty, file.%Empty.decl [template = constants.%.1] +// CHECK:STDOUT: %T.param: %.1 = param T, runtime_param +// CHECK:STDOUT: %T.loc13: %.1 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/default_fn.carbon b/toolchain/check/testdata/interface/no_prelude/default_fn.carbon index 37af99c982386..fce1c8a28b1db 100644 --- a/toolchain/check/testdata/interface/no_prelude/default_fn.carbon +++ b/toolchain/check/testdata/interface/no_prelude/default_fn.carbon @@ -73,7 +73,7 @@ class C { // CHECK:STDOUT: %I.decl: type = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] +// CHECK:STDOUT: %I.ref: type = name_ref I, @C.%I.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/no_prelude/export_name.carbon b/toolchain/check/testdata/interface/no_prelude/export_name.carbon index c0838fd2b7e19..f9968b2ce0eeb 100644 --- a/toolchain/check/testdata/interface/no_prelude/export_name.carbon +++ b/toolchain/check/testdata/interface/no_prelude/export_name.carbon @@ -109,8 +109,8 @@ fn UseEmpty(i: I) {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %UseEmpty.decl: %UseEmpty.type = fn_decl @UseEmpty [template = constants.%UseEmpty] { // CHECK:STDOUT: %I.ref: type = name_ref I, imports.%import_ref.1 [template = constants.%.1] -// CHECK:STDOUT: %i.loc6_13.1: %.1 = param i, runtime_param0 -// CHECK:STDOUT: @UseEmpty.%i: %.1 = bind_name i, %i.loc6_13.1 +// CHECK:STDOUT: %i.param: %.1 = param i, runtime_param0 +// CHECK:STDOUT: %i: %.1 = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/fail_add_member_outside_definition.carbon b/toolchain/check/testdata/interface/no_prelude/fail_add_member_outside_definition.carbon index 5727fa06d2315..c659e430e6d19 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_add_member_outside_definition.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_add_member_outside_definition.carbon @@ -90,7 +90,7 @@ interface Outer { // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @Inner.%.1 (%.5) = bind_symbolic_name Self 1 [symbolic = %Self.3 (constants.%Self.3)] -// CHECK:STDOUT: %.decl: @Inner.%.type (%.type) = fn_decl @.1 [symbolic = %.2 (constants.%.6)] {} +// CHECK:STDOUT: %.decl: @Inner.%.type (%.type) = fn_decl @.1 [symbolic = @Inner.%.2 (constants.%.6)] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 diff --git a/toolchain/check/testdata/interface/no_prelude/fail_duplicate.carbon b/toolchain/check/testdata/interface/no_prelude/fail_duplicate.carbon index 88183e0a0f4da..9fe3a66324573 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_duplicate.carbon @@ -150,24 +150,24 @@ interface Class { } // CHECK:STDOUT: interface @.1 { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = constants.%Self.2] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref: %.2 = name_ref Self, %Self [symbolic = @F.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc14_14.1: type = facet_type_access %Self.ref [symbolic = @F.%Self (constants.%Self.2)] -// CHECK:STDOUT: %.loc14_14.2: type = converted %Self.ref, %.loc14_14.1 [symbolic = @F.%Self (constants.%Self.2)] -// CHECK:STDOUT: %self.loc14_8.1: @F.%Self (%Self.2) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc14_8.2: @F.%Self (%Self.2) = bind_name self, %self.loc14_8.1 +// CHECK:STDOUT: %Self.ref: %.2 = name_ref Self, @.1.%Self [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc14_14.1: type = facet_type_access %Self.ref [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %.loc14_14.2: type = converted %Self.ref, %.loc14_14.1 [symbolic = %Self (constants.%Self.2)] +// CHECK:STDOUT: %self.param: @F.%Self (%Self.2) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.%Self (%Self.2) = bind_name self, %self.param // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc14_21: %.4 = assoc_entity element0, %F.decl [template = constants.%.5] +// CHECK:STDOUT: %.loc14: %.4 = assoc_entity element0, %F.decl [template = constants.%.5] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc14_21 +// CHECK:STDOUT: .F = %.loc14 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F(@.1.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.2)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@.1.%self.loc14_8.2: @F.%Self (%Self.2)](); +// CHECK:STDOUT: fn[%self: @F.%Self (%Self.2)](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%Self.2) { diff --git a/toolchain/check/testdata/interface/no_prelude/fail_generic_redeclaration.carbon b/toolchain/check/testdata/interface/no_prelude/fail_generic_redeclaration.carbon index dd5d11057882c..f9bbd2b27bd72 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_generic_redeclaration.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_generic_redeclaration.carbon @@ -68,33 +68,33 @@ interface DifferentParams(T:! ()) {} // CHECK:STDOUT: } // CHECK:STDOUT: %NotGeneric.decl: type = interface_decl @NotGeneric [template = constants.%.1] {} // CHECK:STDOUT: %.decl.loc19: %.type.1 = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %T.loc19_22.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc19_22.2: type = bind_symbolic_name T 0, %T.loc19_22.1 [symbolic = @.1.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc19: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %Generic.decl: %Generic.type = interface_decl @Generic [template = constants.%Generic] { -// CHECK:STDOUT: %T.loc21_19.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc21_19.2: type = bind_symbolic_name T 0, %T.loc21_19.1 [symbolic = @Generic.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc21: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc29: type = interface_decl @.2 [template = constants.%.5] {} // CHECK:STDOUT: %DifferentParams.decl: %DifferentParams.type = interface_decl @DifferentParams [template = constants.%DifferentParams] { -// CHECK:STDOUT: %T.loc31_27.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc31_27.2: type = bind_symbolic_name T 0, %T.loc31_27.1 [symbolic = @DifferentParams.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc31: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc38: %.type.2 = interface_decl @.3 [template = constants.%.6] { // CHECK:STDOUT: %.loc38_32.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc38_32.2: type = converted %.loc38_32.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %T.loc38_27.1: %.2 = param T, runtime_param -// CHECK:STDOUT: %T.loc38_27.2: %.2 = bind_symbolic_name T 0, %T.loc38_27.1 [symbolic = @.3.%T (constants.%T.2)] +// CHECK:STDOUT: %T.param: %.2 = param T, runtime_param +// CHECK:STDOUT: %T.loc38: %.2 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @NotGeneric; // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%T.loc19_22.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @.1(%T.loc19: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%T) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%T.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -106,8 +106,8 @@ interface DifferentParams(T:! ()) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Generic(file.%T.loc21_19.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @Generic(%T.loc21: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } @@ -120,17 +120,17 @@ interface DifferentParams(T:! ()) {} // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @DifferentParams(file.%T.loc31_27.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @DifferentParams(%T.loc31: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.3(file.%T.loc38_27.2: %.2) { -// CHECK:STDOUT: %T: %.2 = bind_symbolic_name T 0 [symbolic = %T (constants.%T.2)] +// CHECK:STDOUT: generic interface @.3(%T.loc38: %.2) { +// CHECK:STDOUT: %T.1: %.2 = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.3, @.3(%T) [symbolic = %.1 (constants.%.7)] +// CHECK:STDOUT: %.1: type = interface_type @.3, @.3(%T.1) [symbolic = %.1 (constants.%.7)] // CHECK:STDOUT: %Self.2: %.7 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.3)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -143,26 +143,26 @@ interface DifferentParams(T:! ()) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%T) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: specific @.1(@.1.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @DifferentParams(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.3(constants.%T.2) { -// CHECK:STDOUT: %T => constants.%T.2 +// CHECK:STDOUT: %T.1 => constants.%T.2 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.3(@.3.%T) { -// CHECK:STDOUT: %T => constants.%T.2 +// CHECK:STDOUT: specific @.3(@.3.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.2 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon b/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon index 57556582dc032..3454424478f43 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_lookup_undefined.carbon @@ -87,7 +87,7 @@ interface BeingDefined { // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { // CHECK:STDOUT: %BeingDefined.ref: type = name_ref BeingDefined, file.%BeingDefined.decl [template = constants.%.4] // CHECK:STDOUT: %T.ref: = name_ref T, [template = ] -// CHECK:STDOUT: %return.var: ref = var +// CHECK:STDOUT: %return: ref = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc45: %.5 = assoc_entity element0, %H.decl [template = constants.%.6] // CHECK:STDOUT: %.decl: %.type.2 = fn_decl @.2 [template = constants.%.7] {} diff --git a/toolchain/check/testdata/interface/no_prelude/fail_todo_facet_lookup.carbon b/toolchain/check/testdata/interface/no_prelude/fail_todo_facet_lookup.carbon index 51c70ba0d2e43..35f0f46090cdd 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_todo_facet_lookup.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_todo_facet_lookup.carbon @@ -50,19 +50,19 @@ fn CallFacet(T:! Interface, x: T) { // CHECK:STDOUT: } // CHECK:STDOUT: %Interface.decl: type = interface_decl @Interface [template = constants.%.1] {} // CHECK:STDOUT: %CallStatic.decl: %CallStatic.type = fn_decl @CallStatic [template = constants.%CallStatic] { -// CHECK:STDOUT: %Interface.ref.loc13: type = name_ref Interface, %Interface.decl [template = constants.%.1] -// CHECK:STDOUT: %T.loc13_15.1: %.1 = param T, runtime_param -// CHECK:STDOUT: @CallStatic.%T.loc13: %.1 = bind_symbolic_name T 0, %T.loc13_15.1 [symbolic = @CallStatic.%T.1 (constants.%T)] +// CHECK:STDOUT: %Interface.ref: type = name_ref Interface, file.%Interface.decl [template = constants.%.1] +// CHECK:STDOUT: %T.param: %.1 = param T, runtime_param +// CHECK:STDOUT: %T.loc13: %.1 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %CallFacet.decl: %CallFacet.type = fn_decl @CallFacet [template = constants.%CallFacet] { -// CHECK:STDOUT: %Interface.ref.loc21: type = name_ref Interface, %Interface.decl [template = constants.%.1] -// CHECK:STDOUT: %T.loc21_14.1: %.1 = param T, runtime_param -// CHECK:STDOUT: @CallFacet.%T.loc21: %.1 = bind_symbolic_name T 0, %T.loc21_14.1 [symbolic = @CallFacet.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref: %.1 = name_ref T, @CallFacet.%T.loc21 [symbolic = @CallFacet.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc21_32.1: type = facet_type_access %T.ref [symbolic = @CallFacet.%T.1 (constants.%T)] -// CHECK:STDOUT: %.loc21_32.2: type = converted %T.ref, %.loc21_32.1 [symbolic = @CallFacet.%T.1 (constants.%T)] -// CHECK:STDOUT: %x.loc21_29.1: @CallFacet.%T.1 (%T) = param x, runtime_param0 -// CHECK:STDOUT: @CallFacet.%x: @CallFacet.%T.1 (%T) = bind_name x, %x.loc21_29.1 +// CHECK:STDOUT: %Interface.ref: type = name_ref Interface, file.%Interface.decl [template = constants.%.1] +// CHECK:STDOUT: %T.param: %.1 = param T, runtime_param +// CHECK:STDOUT: %T.loc21: %.1 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: %.1 = name_ref T, %T.loc21 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc21_32.1: type = facet_type_access %T.ref [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc21_32.2: type = converted %T.ref, %.loc21_32.1 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %x.param: @CallFacet.%T.1 (%T) = param x, runtime_param0 +// CHECK:STDOUT: %x: @CallFacet.%T.1 (%T) = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/fail_todo_generic_default_fn.carbon b/toolchain/check/testdata/interface/no_prelude/fail_todo_generic_default_fn.carbon index 8a20f77bc15a7..ebbcc42485311 100644 --- a/toolchain/check/testdata/interface/no_prelude/fail_todo_generic_default_fn.carbon +++ b/toolchain/check/testdata/interface/no_prelude/fail_todo_generic_default_fn.carbon @@ -43,72 +43,72 @@ fn I(T:! type).F[self: Self]() -> Self { return self; } // CHECK:STDOUT: .I = %I.decl // CHECK:STDOUT: } // CHECK:STDOUT: %I.decl: %I.type = interface_decl @I [template = constants.%I] { -// CHECK:STDOUT: %T.loc11_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_13.2: type = bind_symbolic_name T 0, %T.loc11_13.1 [symbolic = @I.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc11: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [symbolic = constants.%.5] { -// CHECK:STDOUT: %T.loc22_6.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc22_6.2: type = bind_symbolic_name T 0, %T.loc22_6.1 [symbolic = @.1.%T (constants.%T)] -// CHECK:STDOUT: %.loc22_24.1: @.1.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %Self.ref.loc22_24: @.1.%.1 (%.2) = name_ref Self, %.loc22_24.1 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc22_24.2: type = facet_type_access %Self.ref.loc22_24 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc22_24.3: type = converted %Self.ref.loc22_24, %.loc22_24.2 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc22_18.1: @.1.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: @.1.%self: @.1.%Self (%Self) = bind_name self, %self.loc22_18.1 -// CHECK:STDOUT: %.loc22_35.1: @.1.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %Self.ref.loc22_35: @.1.%.1 (%.2) = name_ref Self, %.loc22_35.1 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc22_35.2: type = facet_type_access %Self.ref.loc22_35 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc22_35.3: type = converted %Self.ref.loc22_35, %.loc22_35.2 [symbolic = @.1.%Self (constants.%Self)] -// CHECK:STDOUT: @.1.%return: ref @.1.%Self (%Self) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc22: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.loc22_24.1: @.1.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %Self.ref.loc22_24: @.1.%.1 (%.2) = name_ref Self, %.loc22_24.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc22_24.2: type = facet_type_access %Self.ref.loc22_24 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc22_24.3: type = converted %Self.ref.loc22_24, %.loc22_24.2 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @.1.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @.1.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %.loc22_35.1: @.1.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %Self.ref.loc22_35: @.1.%.1 (%.2) = name_ref Self, %.loc22_35.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc22_35.2: type = facet_type_access %Self.ref.loc22_35 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc22_35.3: type = converted %Self.ref.loc22_35, %.loc22_35.2 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @.1.%Self (%Self) = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @I(file.%T.loc11_13.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @I(%T.loc11: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @I, @I(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @I, @I(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.type: type = fn_type @F, @I(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @I(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @I.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: %.2: type = assoc_entity_type @I.%.1 (%.2), @I.%F.type (%F.type) [symbolic = %.2 (constants.%.3)] // CHECK:STDOUT: %.3: @I.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @I.%.1 (%.2) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.decl: @I.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] { -// CHECK:STDOUT: %.loc13_14.1: @F.%.1 (%.2) = specific_constant %Self.1, @I(constants.%T) [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %Self.ref.loc13_14: @F.%.1 (%.2) = name_ref Self, %.loc13_14.1 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_14.2: type = facet_type_access %Self.ref.loc13_14 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_14.3: type = converted %Self.ref.loc13_14, %.loc13_14.2 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc13_8.1: @F.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc13_8.2: @F.%Self (%Self) = bind_name self, %self.loc13_8.1 -// CHECK:STDOUT: %.loc13_25.1: @F.%.1 (%.2) = specific_constant %Self.1, @I(constants.%T) [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %Self.ref.loc13_25: @F.%.1 (%.2) = name_ref Self, %.loc13_25.1 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_25.2: type = facet_type_access %Self.ref.loc13_25 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc13_25.3: type = converted %Self.ref.loc13_25, %.loc13_25.2 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @F.%Self (%Self) = var +// CHECK:STDOUT: %F.decl: @I.%F.type (%F.type) = fn_decl @F [symbolic = @I.%F (constants.%F)] { +// CHECK:STDOUT: %.loc13_14.1: @F.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %Self.ref.loc13_14: @F.%.1 (%.2) = name_ref Self, %.loc13_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_14.2: type = facet_type_access %Self.ref.loc13_14 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_14.3: type = converted %Self.ref.loc13_14, %.loc13_14.2 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @F.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %.loc13_25.1: @F.%.1 (%.2) = specific_constant @I.%Self.1, @I(constants.%T) [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %Self.ref.loc13_25: @F.%.1 (%.2) = name_ref Self, %.loc13_25.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_25.2: type = facet_type_access %Self.ref.loc13_25 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc13_25.3: type = converted %Self.ref.loc13_25, %.loc13_25.2 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @F.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc13_29: @I.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] +// CHECK:STDOUT: %.loc13: @I.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self.1 -// CHECK:STDOUT: .F = %.loc13_29 +// CHECK:STDOUT: .F = %.loc13 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc11_13.2: type, @I.%Self.1: @I.%.1 (%.2)) { +// CHECK:STDOUT: generic fn @F(@I.%T.loc11: type, @I.%Self.1: @I.%.1 (%.2)) { // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %.1: type = interface_type @I, @I(%T) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 1 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@I.%self.loc13_8.2: @F.%Self (%Self)]() -> @F.%Self (%Self); +// CHECK:STDOUT: fn[%self: @F.%Self (%Self)]() -> @F.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%T.loc22_6.2: type, @I.%Self.1: @I.%.1 (%.2)) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %.1: type = interface_type @I, @I(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: generic fn @.1(%T.loc22: type, @I.%Self.1: @I.%.1 (%.2)) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %.1: type = interface_type @I, @I(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 1 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: @@ -121,7 +121,7 @@ fn I(T:! type).F[self: Self]() -> Self { return self; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @I(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.2 @@ -133,7 +133,7 @@ fn I(T:! type).F[self: Self]() -> Self { return self; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @I(@F.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T, constants.%Self) { @@ -142,16 +142,16 @@ fn I(T:! type).F[self: Self]() -> Self { return self; } // CHECK:STDOUT: %Self => constants.%Self // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @I(@I.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @I(@I.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @I(@.1.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @I(@.1.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T, constants.%Self) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: %.1 => constants.%.2 // CHECK:STDOUT: %Self => constants.%Self // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/no_prelude/generic.carbon b/toolchain/check/testdata/interface/no_prelude/generic.carbon index b1b599e4e987e..96eec1f3d49cc 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic.carbon @@ -111,43 +111,43 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: .Pass = %Pass.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Simple.decl: %Simple.type = interface_decl @Simple [template = constants.%Simple] { -// CHECK:STDOUT: %T.loc4_18.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_18.2: type = bind_symbolic_name T 0, %T.loc4_18.1 [symbolic = @Simple.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: %WithAssocFn.decl: %WithAssocFn.type = interface_decl @WithAssocFn [template = constants.%WithAssocFn] { -// CHECK:STDOUT: %T.loc8_23.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc8_23.2: type = bind_symbolic_name T 0, %T.loc8_23.1 [symbolic = @WithAssocFn.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %WithImplicitArgs.decl: %WithImplicitArgs.type = interface_decl @WithImplicitArgs [template = constants.%WithImplicitArgs] { -// CHECK:STDOUT: %T.loc22_28.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc22_28.2: type = bind_symbolic_name T 0, %T.loc22_28.1 [symbolic = @WithImplicitArgs.%T (constants.%T.1)] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc22_28.2 [symbolic = @WithImplicitArgs.%T (constants.%T.1)] -// CHECK:STDOUT: %N.loc22_38.1: @WithImplicitArgs.%T (%T.1) = param N, runtime_param -// CHECK:STDOUT: %N.loc22_38.2: @WithImplicitArgs.%T (%T.1) = bind_symbolic_name N 1, %N.loc22_38.1 [symbolic = @WithImplicitArgs.%N (constants.%N)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc22: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc22 [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %N.param: @WithImplicitArgs.%T.1 (%T.1) = param N, runtime_param +// CHECK:STDOUT: %N.loc22: @WithImplicitArgs.%T.1 (%T.1) = bind_symbolic_name N 1, %N.param [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: } // CHECK:STDOUT: %Receive.decl: %Receive.type = fn_decl @Receive [template = constants.%Receive] { -// CHECK:STDOUT: %Simple.ref.loc24: %Simple.type = name_ref Simple, %Simple.decl [template = constants.%Simple] -// CHECK:STDOUT: %C.ref.loc24: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %Simple.ref: %Simple.type = name_ref Simple, file.%Simple.decl [template = constants.%Simple] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc24: type = interface_type @Simple, @Simple(constants.%C) [template = constants.%.7] -// CHECK:STDOUT: %T.loc24_12.1: %.7 = param T, runtime_param -// CHECK:STDOUT: @Receive.%T.loc24: %.7 = bind_symbolic_name T 0, %T.loc24_12.1 [symbolic = @Receive.%T.1 (constants.%T.2)] +// CHECK:STDOUT: %T.param: %.7 = param T, runtime_param +// CHECK:STDOUT: %T.loc24: %.7 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: %Pass.decl: %Pass.type = fn_decl @Pass [template = constants.%Pass] { -// CHECK:STDOUT: %Simple.ref.loc25: %Simple.type = name_ref Simple, %Simple.decl [template = constants.%Simple] -// CHECK:STDOUT: %C.ref.loc25: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %Simple.ref: %Simple.type = name_ref Simple, file.%Simple.decl [template = constants.%Simple] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc25: type = interface_type @Simple, @Simple(constants.%C) [template = constants.%.7] -// CHECK:STDOUT: %T.loc25_9.1: %.7 = param T, runtime_param -// CHECK:STDOUT: @Pass.%T.loc25: %.7 = bind_symbolic_name T 0, %T.loc25_9.1 [symbolic = @Pass.%T.1 (constants.%T.2)] +// CHECK:STDOUT: %T.param: %.7 = param T, runtime_param +// CHECK:STDOUT: %T.loc25: %.7 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Simple(file.%T.loc4_18.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @Simple(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Simple, @Simple(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @Simple, @Simple(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -159,22 +159,22 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @WithAssocFn(file.%T.loc8_23.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @WithAssocFn(%T.loc8: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @WithAssocFn, @WithAssocFn(%T) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @WithAssocFn, @WithAssocFn(%T.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.2)] -// CHECK:STDOUT: %F.type: type = fn_type @F.1, @WithAssocFn(%T) [symbolic = %F.type (constants.%F.type.1)] +// CHECK:STDOUT: %F.type: type = fn_type @F.1, @WithAssocFn(%T.1) [symbolic = %F.type (constants.%F.type.1)] // CHECK:STDOUT: %F: @WithAssocFn.%F.type (%F.type.1) = struct_value () [symbolic = %F (constants.%F.1)] // CHECK:STDOUT: %.2: type = assoc_entity_type @WithAssocFn.%.1 (%.4), @WithAssocFn.%F.type (%F.type.1) [symbolic = %.2 (constants.%.5)] // CHECK:STDOUT: %.3: @WithAssocFn.%.2 (%.5) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.6)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @WithAssocFn.%.1 (%.4) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.2)] -// CHECK:STDOUT: %F.decl: @WithAssocFn.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = %F (constants.%F.1)] { +// CHECK:STDOUT: %F.decl: @WithAssocFn.%F.type (%F.type.1) = fn_decl @F.1 [symbolic = @WithAssocFn.%F (constants.%F.1)] { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %return.var: ref %X = var +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: @WithAssocFn.%.2 (%.5) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.6)] // CHECK:STDOUT: @@ -185,30 +185,30 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @WithImplicitArgs(file.%T.loc22_28.2: type, file.%N.loc22_38.2: @WithImplicitArgs.%T (%T.1)) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] -// CHECK:STDOUT: %N: %T.1 = bind_symbolic_name N 1 [symbolic = %N (constants.%N)] +// CHECK:STDOUT: generic interface @WithImplicitArgs(%T.loc22: type, %N.loc22: @WithImplicitArgs.%T.1 (%T.1)) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] +// CHECK:STDOUT: %N.1: %T.1 = bind_symbolic_name N 1 [symbolic = %N.1 (constants.%N)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: %C as %.7 { -// CHECK:STDOUT: %.loc14: = interface_witness () [template = constants.%.8] +// CHECK:STDOUT: %.loc14_21: = interface_witness () [template = constants.%.8] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc14 +// CHECK:STDOUT: witness = %.loc14_21 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %C as %.9 { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %return.var: ref %X = var +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = interface_witness (%F.decl) [template = constants.%.12] +// CHECK:STDOUT: %.loc15_26: = interface_witness (%F.decl) [template = constants.%.12] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_26 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { @@ -219,30 +219,30 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: class @C { // CHECK:STDOUT: impl_decl @impl.1 { // CHECK:STDOUT: %Simple.ref: %Simple.type = name_ref Simple, file.%Simple.decl [template = constants.%Simple] -// CHECK:STDOUT: %C.ref.loc14: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %.loc14: type = interface_type @Simple, @Simple(constants.%C) [template = constants.%.7] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %.loc14_17: type = interface_type @Simple, @Simple(constants.%C) [template = constants.%.7] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { // CHECK:STDOUT: %WithAssocFn.ref: %WithAssocFn.type = name_ref WithAssocFn, file.%WithAssocFn.decl [template = constants.%WithAssocFn] -// CHECK:STDOUT: %C.ref.loc15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %.loc15: type = interface_type @WithAssocFn, @WithAssocFn(constants.%C) [template = constants.%.9] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %.loc15_22: type = interface_type @WithAssocFn, @WithAssocFn(constants.%C) [template = constants.%.9] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F.1(file.%T.loc8_23.2: type, @WithAssocFn.%Self.1: @WithAssocFn.%.1 (%.4)) { +// CHECK:STDOUT: generic fn @F.1(@WithAssocFn.%T.loc8: type, @WithAssocFn.%Self.1: @WithAssocFn.%.1 (%.4)) { // CHECK:STDOUT: // CHECK:STDOUT: fn() -> %X; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F.2() -> @impl.2.%return.var: %X { +// CHECK:STDOUT: fn @F.2() -> %return: %X { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc17_15.1: %.3 = struct_literal () -// CHECK:STDOUT: %.loc17_15.2: init %X = class_init (), @impl.2.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc17_15.2: init %X = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc17_16: init %X = converted %.loc17_15.1, %.loc17_15.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc17_16 to @impl.2.%return.var +// CHECK:STDOUT: return %.loc17_16 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Receive(%T.loc24: %.7) { @@ -266,25 +266,25 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Simple(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Simple(@Simple.%T) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: specific @Simple(@Simple.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @WithAssocFn(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F.1(constants.%T.1, constants.%Self.2) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @WithAssocFn(@WithAssocFn.%T) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: specific @WithAssocFn(@WithAssocFn.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Simple(constants.%C) { -// CHECK:STDOUT: %T => constants.%C +// CHECK:STDOUT: %T.1 => constants.%C // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.7 @@ -292,7 +292,7 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @WithAssocFn(constants.%C) { -// CHECK:STDOUT: %T => constants.%C +// CHECK:STDOUT: %T.1 => constants.%C // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.9 @@ -306,8 +306,8 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: specific @F.1(constants.%C, constants.%C) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @WithImplicitArgs(constants.%T.1, constants.%N) { -// CHECK:STDOUT: %T => constants.%T.1 -// CHECK:STDOUT: %N => constants.%N +// CHECK:STDOUT: %T.1 => constants.%T.1 +// CHECK:STDOUT: %N.1 => constants.%N // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Receive(constants.%T.2) { @@ -349,32 +349,32 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: .G = %G.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Generic.decl: %Generic.type = interface_decl @Generic [template = constants.%Generic] { -// CHECK:STDOUT: %T.loc4_19.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_19.2: type = bind_symbolic_name T 0, %T.loc4_19.1 [symbolic = @Generic.%T (constants.%T.1)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: type = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %B.decl: type = class_decl @B [template = constants.%B] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Generic.ref.loc9: %Generic.type = name_ref Generic, %Generic.decl [template = constants.%Generic] -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] +// CHECK:STDOUT: %Generic.ref: %Generic.type = name_ref Generic, file.%Generic.decl [template = constants.%Generic] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc9: type = interface_type @Generic, @Generic(constants.%A) [template = constants.%.4] -// CHECK:STDOUT: %T.loc9_6.1: %.4 = param T, runtime_param -// CHECK:STDOUT: @F.%T.loc9: %.4 = bind_symbolic_name T 0, %T.loc9_6.1 [symbolic = @F.%T.1 (constants.%T.2)] +// CHECK:STDOUT: %T.param: %.4 = param T, runtime_param +// CHECK:STDOUT: %T.loc9: %.4 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.2)] // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %Generic.ref.loc10: %Generic.type = name_ref Generic, %Generic.decl [template = constants.%Generic] -// CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] +// CHECK:STDOUT: %Generic.ref: %Generic.type = name_ref Generic, file.%Generic.decl [template = constants.%Generic] +// CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc10: type = interface_type @Generic, @Generic(constants.%B) [template = constants.%.5] -// CHECK:STDOUT: %T.loc10_6.1: %.5 = param T, runtime_param -// CHECK:STDOUT: @G.%T.loc10: %.5 = bind_symbolic_name T 0, %T.loc10_6.1 [symbolic = @G.%T.1 (constants.%T.3)] +// CHECK:STDOUT: %T.param: %.5 = param T, runtime_param +// CHECK:STDOUT: %T.loc10: %.5 = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T.3)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Generic(file.%T.loc4_19.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T.1)] +// CHECK:STDOUT: generic interface @Generic(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T.1)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Generic, @Generic(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @Generic, @Generic(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -417,15 +417,15 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%T.1) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Generic(@Generic.%T) { -// CHECK:STDOUT: %T => constants.%T.1 +// CHECK:STDOUT: specific @Generic(@Generic.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T.1 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%A) { -// CHECK:STDOUT: %T => constants.%A +// CHECK:STDOUT: %T.1 => constants.%A // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T.2) { @@ -433,7 +433,7 @@ fn G(T:! Generic(B)) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Generic(constants.%B) { -// CHECK:STDOUT: %T => constants.%B +// CHECK:STDOUT: %T.1 => constants.%B // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @G(constants.%T.3) { diff --git a/toolchain/check/testdata/interface/no_prelude/generic_binding_after_assoc_const.carbon b/toolchain/check/testdata/interface/no_prelude/generic_binding_after_assoc_const.carbon index 8233be7d7ed4a..f0f440823db93 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic_binding_after_assoc_const.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic_binding_after_assoc_const.carbon @@ -45,15 +45,15 @@ interface I { // CHECK:STDOUT: interface @I { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %T.loc12_8.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc12_8.2: type = bind_symbolic_name T 1, %T.loc12_8.1 [symbolic = @F.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc12: type = bind_symbolic_name T 1, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: %U: type = assoc_const_decl U [template] // CHECK:STDOUT: %.loc13: %.5 = assoc_entity element1, %U [template = constants.%.6] // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %T.loc16_8.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc16_8.2: type = bind_symbolic_name T 1, %T.loc16_8.1 [symbolic = @G.%T.1 (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc16: type = bind_symbolic_name T 1, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16: %.7 = assoc_entity element2, %G.decl [template = constants.%.8] // CHECK:STDOUT: @@ -65,16 +65,16 @@ interface I { // CHECK:STDOUT: witness = (%F.decl, %U, %G.decl) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(@I.%Self: %.1, @I.%T.loc12_8.2: type) { +// CHECK:STDOUT: generic fn @F(@I.%Self: %.1, %T.loc12: type) { // CHECK:STDOUT: %T.1: type = bind_symbolic_name T 1 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@I.%T.loc12_8.2: type); +// CHECK:STDOUT: fn(%T.loc12: type); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @G(@I.%Self: %.1, @I.%T.loc16_8.2: type) { +// CHECK:STDOUT: generic fn @G(@I.%Self: %.1, %T.loc16: type) { // CHECK:STDOUT: %T.1: type = bind_symbolic_name T 1 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: -// CHECK:STDOUT: fn(@I.%T.loc16_8.2: type); +// CHECK:STDOUT: fn(%T.loc16: type); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%Self, constants.%T) { diff --git a/toolchain/check/testdata/interface/no_prelude/generic_import.carbon b/toolchain/check/testdata/interface/no_prelude/generic_import.carbon index 55de8e31ffaa4..f88da03b1b727 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic_import.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic_import.carbon @@ -47,25 +47,25 @@ impl C as AddWith(C) { // CHECK:STDOUT: .AddWith = %AddWith.decl // CHECK:STDOUT: } // CHECK:STDOUT: %AddWith.decl: %AddWith.type = interface_decl @AddWith [template = constants.%AddWith] { -// CHECK:STDOUT: %T.loc4_19.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_19.2: type = bind_symbolic_name T 0, %T.loc4_19.1 [symbolic = @AddWith.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @AddWith(file.%T.loc4_19.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @AddWith(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @AddWith, @AddWith(%T) [symbolic = %.1 (constants.%.2)] +// CHECK:STDOUT: %.1: type = interface_type @AddWith, @AddWith(%T.1) [symbolic = %.1 (constants.%.2)] // CHECK:STDOUT: %Self.2: %.2 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.type: type = fn_type @F, @AddWith(%T) [symbolic = %F.type (constants.%F.type)] +// CHECK:STDOUT: %F.type: type = fn_type @F, @AddWith(%T.1) [symbolic = %F.type (constants.%F.type)] // CHECK:STDOUT: %F: @AddWith.%F.type (%F.type) = struct_value () [symbolic = %F (constants.%F)] // CHECK:STDOUT: %.2: type = assoc_entity_type @AddWith.%.1 (%.2), @AddWith.%F.type (%F.type) [symbolic = %.2 (constants.%.3)] // CHECK:STDOUT: %.3: @AddWith.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: interface { // CHECK:STDOUT: %Self.1: @AddWith.%.1 (%.2) = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] -// CHECK:STDOUT: %F.decl: @AddWith.%F.type (%F.type) = fn_decl @F [symbolic = %F (constants.%F)] {} +// CHECK:STDOUT: %F.decl: @AddWith.%F.type (%F.type) = fn_decl @F [symbolic = @AddWith.%F (constants.%F)] {} // CHECK:STDOUT: %.loc5: @AddWith.%.2 (%.3) = assoc_entity element0, %F.decl [symbolic = %.3 (constants.%.4)] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -75,19 +75,19 @@ impl C as AddWith(C) { // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @F(file.%T.loc4_19.2: type, @AddWith.%Self.1: @AddWith.%.1 (%.2)) { +// CHECK:STDOUT: generic fn @F(@AddWith.%T.loc4: type, @AddWith.%Self.1: @AddWith.%.1 (%.2)) { // CHECK:STDOUT: // CHECK:STDOUT: fn(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @AddWith(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%T, constants.%Self) {} // CHECK:STDOUT: -// CHECK:STDOUT: specific @AddWith(@AddWith.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @AddWith(@AddWith.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- b.carbon @@ -132,10 +132,10 @@ impl C as AddWith(C) { // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc7_6: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc7_6: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %AddWith.ref: %AddWith.type = name_ref AddWith, imports.%import_ref.1 [template = constants.%AddWith] -// CHECK:STDOUT: %C.ref.loc7_19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %.loc7: type = interface_type @AddWith, @AddWith(constants.%C) [template = constants.%.6] +// CHECK:STDOUT: %C.ref.loc7_19: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %.loc7_18: type = interface_type @AddWith, @AddWith(constants.%C) [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -160,11 +160,11 @@ impl C as AddWith(C) { // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: %C as %.6 { // CHECK:STDOUT: %F.decl: %F.type.2 = fn_decl @F.2 [template = constants.%F.2] {} -// CHECK:STDOUT: %.loc7: = interface_witness (%F.decl) [template = constants.%.9] +// CHECK:STDOUT: %.loc7_22: = interface_witness (%F.decl) [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F.decl -// CHECK:STDOUT: witness = %.loc7 +// CHECK:STDOUT: witness = %.loc7_22 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/interface/no_prelude/generic_vs_params.carbon b/toolchain/check/testdata/interface/no_prelude/generic_vs_params.carbon index 1d5ae16e38a9c..03987605813f3 100644 --- a/toolchain/check/testdata/interface/no_prelude/generic_vs_params.carbon +++ b/toolchain/check/testdata/interface/no_prelude/generic_vs_params.carbon @@ -95,44 +95,44 @@ interface A(T: type) {} // CHECK:STDOUT: %NotGenericNoParams.decl: type = interface_decl @NotGenericNoParams [template = constants.%.1] {} // CHECK:STDOUT: %NotGenericButParams.decl: %NotGenericButParams.type = interface_decl @NotGenericButParams [template = constants.%NotGenericButParams] {} // CHECK:STDOUT: %GenericAndParams.decl: %GenericAndParams.type.1 = interface_decl @GenericAndParams.1 [template = constants.%GenericAndParams.1] { -// CHECK:STDOUT: %T.loc6_28.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc6_28.2: type = bind_symbolic_name T 0, %T.loc6_28.1 [symbolic = @GenericAndParams.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc6: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = class_decl @C [template = constants.%C.1] { -// CHECK:STDOUT: %T.loc8_9.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc8_9.2: type = bind_symbolic_name T 0, %T.loc8_9.1 [symbolic = @C.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc8: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %X.ref.loc14: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %NotGenericNoParams.ref: type = name_ref NotGenericNoParams, %NotGenericNoParams.decl [template = constants.%.1] +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %NotGenericNoParams.ref: type = name_ref NotGenericNoParams, file.%NotGenericNoParams.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %X.ref.loc15: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %NotGenericButParams.ref: %NotGenericButParams.type = name_ref NotGenericButParams, %NotGenericButParams.decl [template = constants.%NotGenericButParams] -// CHECK:STDOUT: %.loc15: type = interface_type @NotGenericButParams [template = constants.%.3] +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %NotGenericButParams.ref: %NotGenericButParams.type = name_ref NotGenericButParams, file.%NotGenericButParams.decl [template = constants.%NotGenericButParams] +// CHECK:STDOUT: %.loc15_30: type = interface_type @NotGenericButParams [template = constants.%.3] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.3 { -// CHECK:STDOUT: %X.ref.loc16_6: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %GenericAndParams.ref.loc16: %GenericAndParams.type.1 = name_ref GenericAndParams, %GenericAndParams.decl [template = constants.%GenericAndParams.1] -// CHECK:STDOUT: %X.ref.loc16_28: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %.loc16: type = interface_type @GenericAndParams.1, @GenericAndParams.1(constants.%X) [template = constants.%.10] +// CHECK:STDOUT: %X.ref.loc16_6: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %GenericAndParams.ref: %GenericAndParams.type.1 = name_ref GenericAndParams, file.%GenericAndParams.decl [template = constants.%GenericAndParams.1] +// CHECK:STDOUT: %X.ref.loc16_28: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %.loc16_27: type = interface_type @GenericAndParams.1, @GenericAndParams.1(constants.%X) [template = constants.%.10] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.4 { -// CHECK:STDOUT: %X.ref.loc17_6: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %C.ref.loc17: %C.type = name_ref C, %C.decl [template = constants.%C.1] -// CHECK:STDOUT: %X.ref.loc17_13: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %C.loc17: type = class_type @C, @C(constants.%X) [template = constants.%C.3] +// CHECK:STDOUT: %X.ref.loc17_6: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] +// CHECK:STDOUT: %X.ref.loc17_13: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %C: type = class_type @C, @C(constants.%X) [template = constants.%C.3] // CHECK:STDOUT: %GenericNoParams.ref: type = name_ref GenericNoParams, @C.%GenericNoParams.decl [template = constants.%.5] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.5 { -// CHECK:STDOUT: %X.ref.loc18_6: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %C.ref.loc18: %C.type = name_ref C, %C.decl [template = constants.%C.1] -// CHECK:STDOUT: %X.ref.loc18_13: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %C.loc18: type = class_type @C, @C(constants.%X) [template = constants.%C.3] +// CHECK:STDOUT: %X.ref.loc18_6: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] +// CHECK:STDOUT: %X.ref.loc18_13: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %C: type = class_type @C, @C(constants.%X) [template = constants.%C.3] // CHECK:STDOUT: %.loc18_15: %GenericAndParams.type.3 = specific_constant @C.%GenericAndParams.decl, @C(constants.%X) [template = constants.%GenericAndParams.3] -// CHECK:STDOUT: %GenericAndParams.ref.loc18: %GenericAndParams.type.3 = name_ref GenericAndParams, %.loc18_15 [template = constants.%GenericAndParams.3] -// CHECK:STDOUT: %X.ref.loc18_33: type = name_ref X, %X.decl [template = constants.%X] +// CHECK:STDOUT: %GenericAndParams.ref: %GenericAndParams.type.3 = name_ref GenericAndParams, %.loc18_15 [template = constants.%GenericAndParams.3] +// CHECK:STDOUT: %X.ref.loc18_33: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %.loc18_32: type = interface_type @GenericAndParams.2, @GenericAndParams.2(constants.%X, constants.%X) [template = constants.%.12] // CHECK:STDOUT: } // CHECK:STDOUT: } @@ -153,11 +153,11 @@ interface A(T: type) {} // CHECK:STDOUT: witness = () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @GenericAndParams.1(file.%T.loc6_28.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic interface @GenericAndParams.1(%T.loc6: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @GenericAndParams.1, @GenericAndParams.1(%T) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @GenericAndParams.1, @GenericAndParams.1(%T.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.3)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -169,7 +169,7 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @GenericNoParams(file.%T.loc8_9.2: type) { +// CHECK:STDOUT: generic interface @GenericNoParams(@C.%T.loc8: type) { // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] // CHECK:STDOUT: %.1: type = interface_type @GenericNoParams, @GenericNoParams(%T) [symbolic = %.1 (constants.%.6)] @@ -184,12 +184,12 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @GenericAndParams.2(file.%T.loc8_9.2: type, @C.%U.loc10_30.2: type) { -// CHECK:STDOUT: %U: type = bind_symbolic_name U 1 [symbolic = %U (constants.%U)] +// CHECK:STDOUT: generic interface @GenericAndParams.2(@C.%T.loc8: type, %U.loc10: type) { +// CHECK:STDOUT: %U.1: type = bind_symbolic_name U 1 [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] -// CHECK:STDOUT: %.1: type = interface_type @GenericAndParams.2, @GenericAndParams.2(%T, %U) [symbolic = %.1 (constants.%.7)] +// CHECK:STDOUT: %.1: type = interface_type @GenericAndParams.2, @GenericAndParams.2(%T, %U.1) [symbolic = %.1 (constants.%.7)] // CHECK:STDOUT: %Self.2: %.7 = bind_symbolic_name Self 2 [symbolic = %Self.2 (constants.%Self.5)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -209,17 +209,17 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %X as %.3 { -// CHECK:STDOUT: %.loc15: = interface_witness () [template = constants.%.9] +// CHECK:STDOUT: %.loc15_33: = interface_witness () [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_33 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.3: %X as %.10 { -// CHECK:STDOUT: %.loc16: = interface_witness () [template = constants.%.9] +// CHECK:STDOUT: %.loc16_31: = interface_witness () [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc16 +// CHECK:STDOUT: witness = %.loc16_31 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.4: %X as %.5 { @@ -230,24 +230,24 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.5: %X as %.12 { -// CHECK:STDOUT: %.loc18: = interface_witness () [template = constants.%.9] +// CHECK:STDOUT: %.loc18_36: = interface_witness () [template = constants.%.9] // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = %.loc18 +// CHECK:STDOUT: witness = %.loc18_36 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%T.loc8_9.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C(%T.loc8: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %GenericAndParams.type: type = generic_interface_type @GenericAndParams.2, @C(%T) [symbolic = %GenericAndParams.type (constants.%GenericAndParams.type.2)] +// CHECK:STDOUT: %GenericAndParams.type: type = generic_interface_type @GenericAndParams.2, @C(%T.1) [symbolic = %GenericAndParams.type (constants.%GenericAndParams.type.2)] // CHECK:STDOUT: %GenericAndParams: @C.%GenericAndParams.type (%GenericAndParams.type.2) = struct_value () [symbolic = %GenericAndParams (constants.%GenericAndParams.2)] // CHECK:STDOUT: // CHECK:STDOUT: class { // CHECK:STDOUT: %GenericNoParams.decl: type = interface_decl @GenericNoParams [template = constants.%.5] {} -// CHECK:STDOUT: %GenericAndParams.decl: @C.%GenericAndParams.type (%GenericAndParams.type.2) = interface_decl @GenericAndParams.2 [symbolic = %GenericAndParams (constants.%GenericAndParams.2)] { -// CHECK:STDOUT: %U.loc10_30.1: type = param U, runtime_param -// CHECK:STDOUT: %U.loc10_30.2: type = bind_symbolic_name U 1, %U.loc10_30.1 [symbolic = @GenericAndParams.2.%U (constants.%U)] +// CHECK:STDOUT: %GenericAndParams.decl: @C.%GenericAndParams.type (%GenericAndParams.type.2) = interface_decl @GenericAndParams.2 [symbolic = @C.%GenericAndParams (constants.%GenericAndParams.2)] { +// CHECK:STDOUT: %U.param: type = param U, runtime_param +// CHECK:STDOUT: %U.loc10: type = bind_symbolic_name U 1, %U.param [symbolic = %U.1 (constants.%U)] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -263,15 +263,15 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @GenericAndParams.1(@GenericAndParams.1.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @GenericAndParams.1(@GenericAndParams.1.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericNoParams(constants.%T) {} @@ -279,19 +279,19 @@ interface A(T: type) {} // CHECK:STDOUT: specific @GenericNoParams(@GenericNoParams.%T) {} // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.2(constants.%T, constants.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @GenericAndParams.2(@GenericAndParams.2.%T, @GenericAndParams.2.%U) { -// CHECK:STDOUT: %U => constants.%U +// CHECK:STDOUT: specific @GenericAndParams.2(@GenericAndParams.2.%T, @GenericAndParams.2.%U.1) { +// CHECK:STDOUT: %U.1 => constants.%U // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @C(@C.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: specific @C(@C.%T.1) { +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.1(constants.%X) { -// CHECK:STDOUT: %T => constants.%X +// CHECK:STDOUT: %T.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %.1 => constants.%.10 @@ -299,7 +299,7 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%X) { -// CHECK:STDOUT: %T => constants.%X +// CHECK:STDOUT: %T.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %GenericAndParams.type => constants.%GenericAndParams.type.3 @@ -307,7 +307,7 @@ interface A(T: type) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @GenericAndParams.2(constants.%X, constants.%X) { -// CHECK:STDOUT: %U => constants.%X +// CHECK:STDOUT: %U.1 => constants.%X // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: %T => constants.%X @@ -330,8 +330,8 @@ interface A(T: type) {} // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: %A.type = interface_decl @A [template = constants.%A] { -// CHECK:STDOUT: %T.loc8_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc8_13.2: type = bind_name T, %T.loc8_13.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_name T, %T.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -358,8 +358,8 @@ interface A(T: type) {} // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: } // CHECK:STDOUT: %A.decl: %A.type = interface_decl @A [template = constants.%A] { -// CHECK:STDOUT: %T.loc7_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc7_13.2: type = bind_name T, %T.loc7_13.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_name T, %T.param // 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 a2a1155c1b28e..e831a25babe7e 100644 --- a/toolchain/check/testdata/interface/no_prelude/import.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import.carbon @@ -208,23 +208,23 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: .UseBasicF = %UseBasicF // CHECK:STDOUT: .UseForwardDeclaredT = %UseForwardDeclaredT // CHECK:STDOUT: .UseForwardDeclaredF = %UseForwardDeclaredF -// CHECK:STDOUT: .f = %f.loc16 +// CHECK:STDOUT: .f = %f // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %UseEmpty.decl: %UseEmpty.type = fn_decl @UseEmpty [template = constants.%UseEmpty] { // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, imports.%import_ref.1 [template = constants.%.1] -// CHECK:STDOUT: %e.loc6_13.1: %.1 = param e, runtime_param0 -// CHECK:STDOUT: @UseEmpty.%e: %.1 = bind_name e, %e.loc6_13.1 +// CHECK:STDOUT: %e.param: %.1 = param e, runtime_param0 +// CHECK:STDOUT: %e: %.1 = bind_name e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseBasic.decl: %UseBasic.type = fn_decl @UseBasic [template = constants.%UseBasic] { -// CHECK:STDOUT: %Basic.ref.loc7: type = name_ref Basic, imports.%import_ref.2 [template = constants.%.3] -// CHECK:STDOUT: %e.loc7_13.1: %.3 = param e, runtime_param0 -// CHECK:STDOUT: @UseBasic.%e: %.3 = bind_name e, %e.loc7_13.1 +// CHECK:STDOUT: %Basic.ref: type = name_ref Basic, imports.%import_ref.2 [template = constants.%.3] +// CHECK:STDOUT: %e.param: %.3 = param e, runtime_param0 +// CHECK:STDOUT: %e: %.3 = bind_name e, %e.param // CHECK:STDOUT: } // CHECK:STDOUT: %UseForwardDeclared.decl: %UseForwardDeclared.type = fn_decl @UseForwardDeclared [template = constants.%UseForwardDeclared] { -// CHECK:STDOUT: %ForwardDeclared.ref.loc8: type = name_ref ForwardDeclared, imports.%import_ref.3 [template = constants.%.4] -// CHECK:STDOUT: %f.loc8_23.1: %.4 = param f, runtime_param0 -// CHECK:STDOUT: @UseForwardDeclared.%f: %.4 = bind_name f, %f.loc8_23.1 +// CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, imports.%import_ref.3 [template = constants.%.4] +// CHECK:STDOUT: %f.param: %.4 = param f, runtime_param0 +// CHECK:STDOUT: %f: %.4 = bind_name f, %f.param // CHECK:STDOUT: } // CHECK:STDOUT: %Basic.ref.loc10: type = name_ref Basic, imports.%import_ref.2 [template = constants.%.3] // CHECK:STDOUT: %T.ref.loc10: %.5 = name_ref T, imports.%import_ref.7 [template = constants.%.6] @@ -241,7 +241,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%import_ref.3 [template = constants.%.4] // CHECK:STDOUT: %.loc16: type = ptr_type %.4 [template = constants.%.13] // CHECK:STDOUT: %f.var: ref %.13 = var f -// CHECK:STDOUT: %f.loc16: ref %.13 = bind_name f, %f.var +// CHECK:STDOUT: %f: ref %.13 = bind_name f, %f.var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty { diff --git a/toolchain/check/testdata/interface/no_prelude/import_access.carbon b/toolchain/check/testdata/interface/no_prelude/import_access.carbon index 4f72b9769948a..ca589bce4791c 100644 --- a/toolchain/check/testdata/interface/no_prelude/import_access.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import_access.carbon @@ -215,8 +215,8 @@ private interface Redecl {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%import_ref.1 [template = constants.%.1] -// CHECK:STDOUT: %i.loc4_6.1: %.1 = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: %.1 = bind_name i, %i.loc4_6.1 +// CHECK:STDOUT: %i.param: %.1 = param i, runtime_param0 +// CHECK:STDOUT: %i: %.1 = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -246,8 +246,8 @@ private interface Redecl {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Def.ref: = name_ref Def, [template = ] -// CHECK:STDOUT: %i.loc10_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc10_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -279,8 +279,8 @@ private interface Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [template = imports.%Test] // CHECK:STDOUT: %Def.ref: = name_ref Def, [template = ] -// CHECK:STDOUT: %i.loc10_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc10_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -313,8 +313,8 @@ private interface Redecl {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%import_ref.1 [template = constants.%.1] -// CHECK:STDOUT: %i.loc4_6.1: %.1 = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: %.1 = bind_name i, %i.loc4_6.1 +// CHECK:STDOUT: %i.param: %.1 = param i, runtime_param0 +// CHECK:STDOUT: %i: %.1 = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -344,8 +344,8 @@ private interface Redecl {} // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [template = ] -// CHECK:STDOUT: %i.loc10_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc10_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -377,8 +377,8 @@ private interface Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [template = imports.%Test] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [template = ] -// CHECK:STDOUT: %i.loc10_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc10_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -407,8 +407,8 @@ private interface Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [template = ] // CHECK:STDOUT: %.loc8: type = ptr_type [template = ] -// CHECK:STDOUT: %i.loc8_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc8_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: %Forward.decl: type = interface_decl @Forward [template = constants.%.2] {} // CHECK:STDOUT: } @@ -442,8 +442,8 @@ private interface Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [template = ] // CHECK:STDOUT: %.loc10: type = ptr_type [template = ] -// CHECK:STDOUT: %i.loc10_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc10_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -475,8 +475,8 @@ private interface Redecl {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Forward.ref: = name_ref Forward, [template = ] // CHECK:STDOUT: %.loc9: type = ptr_type [template = ] -// CHECK:STDOUT: %i.loc9_6.1: = param i, runtime_param0 -// CHECK:STDOUT: @F.%i: = bind_name i, %i.loc9_6.1 +// CHECK:STDOUT: %i.param: = param i, runtime_param0 +// CHECK:STDOUT: %i: = bind_name i, %i.param // CHECK:STDOUT: } // 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 4fef8b10b8b3b..de1bfd1208aa3 100644 --- a/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon +++ b/toolchain/check/testdata/interface/no_prelude/import_interface_decl.carbon @@ -32,7 +32,7 @@ impl library "[[@TEST_NAME]]"; // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc3_7.1: %.2 = tuple_literal () // CHECK:STDOUT: %.loc3_7.2: type = converted %.loc3_7.1, constants.%.2 [template = constants.%.2] -// CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%.1] +// CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/no_prelude/self.carbon b/toolchain/check/testdata/interface/no_prelude/self.carbon index a2b4b2f4ceac7..1075a00532ab2 100644 --- a/toolchain/check/testdata/interface/no_prelude/self.carbon +++ b/toolchain/check/testdata/interface/no_prelude/self.carbon @@ -34,28 +34,28 @@ interface UseSelf { // CHECK:STDOUT: interface @UseSelf { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = constants.%Self] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, %Self [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %self.loc12_8.1: @F.%Self (%Self) = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_8.2: @F.%Self (%Self) = bind_name self, %self.loc12_8.1 -// CHECK:STDOUT: %Self.ref.loc12_25: %.1 = name_ref Self, %Self [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_25.1: type = facet_type_access %Self.ref.loc12_25 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %.loc12_25.2: type = converted %Self.ref.loc12_25, %.loc12_25.1 [symbolic = @F.%Self (constants.%Self)] -// CHECK:STDOUT: %return.var: ref @F.%Self (%Self) = var +// CHECK:STDOUT: %Self.ref.loc12_14: %.1 = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.1: type = facet_type_access %Self.ref.loc12_14 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_14.2: type = converted %Self.ref.loc12_14, %.loc12_14.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %self.param: @F.%Self (%Self) = param self, runtime_param0 +// CHECK:STDOUT: %self: @F.%Self (%Self) = bind_name self, %self.param +// CHECK:STDOUT: %Self.ref.loc12_25: %.1 = name_ref Self, @UseSelf.%Self [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_25.1: type = facet_type_access %Self.ref.loc12_25 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %.loc12_25.2: type = converted %Self.ref.loc12_25, %.loc12_25.1 [symbolic = %Self (constants.%Self)] +// CHECK:STDOUT: %return: ref @F.%Self (%Self) = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc12_29: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] +// CHECK:STDOUT: %.loc12: %.3 = assoc_entity element0, %F.decl [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self -// CHECK:STDOUT: .F = %.loc12_29 +// CHECK:STDOUT: .F = %.loc12 // CHECK:STDOUT: witness = (%F.decl) // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @F(@UseSelf.%Self: %.1) { // CHECK:STDOUT: %Self: %.1 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] // CHECK:STDOUT: -// CHECK:STDOUT: fn[@UseSelf.%self.loc12_8.2: @F.%Self (%Self)]() -> @F.%Self (%Self); +// CHECK:STDOUT: fn[%self: @F.%Self (%Self)]() -> @F.%Self (%Self); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%Self) { diff --git a/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon b/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon index e01d7644e504b..d9f6d4b30be10 100644 --- a/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon +++ b/toolchain/check/testdata/interface/no_prelude/syntactic_merge.carbon @@ -216,35 +216,35 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: .Bar = %Bar.decl.loc10 // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc8: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc8_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc8_15.2: %C = bind_symbolic_name a 0, %a.loc8_15.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc8: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc8: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc8: %C = bind_symbolic_name a 0, %a.param.loc8 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc10: %Bar.type = interface_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc10_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc10_15.2: %C = bind_symbolic_name a 0, %a.loc10_15.1 [symbolic = @Bar.%a (constants.%a)] +// CHECK:STDOUT: %D.ref.loc10: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc10: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc10: %C = bind_symbolic_name a 0, %a.param.loc10 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl.loc11: %Bar.type = interface_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc11_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc11_15.2: %C = bind_symbolic_name a 0, %a.loc11_15.1 [symbolic = constants.%a] +// CHECK:STDOUT: %D.ref.loc11: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param.loc11: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc11: %C = bind_symbolic_name a 0, %a.param.loc11 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc7_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a) [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a.1) [symbolic = %.1 (constants.%.3)] // CHECK:STDOUT: %Self.2: %.3 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -256,11 +256,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Bar(file.%a.loc10_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Bar(%a.loc10: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Bar, @Bar(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @Bar, @Bar(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.2)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -278,19 +278,19 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Foo(@Foo.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @Foo(@Foo.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Bar(@Bar.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @Bar(@Bar.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- spacing.carbon @@ -313,22 +313,22 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_21.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_21.2: %C = bind_symbolic_name a 0, %a.loc6_21.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param.loc6 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_17.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_17.2: %C = bind_symbolic_name a 0, %a.loc7_17.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc6_21.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a) [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a.1) [symbolic = %.1 (constants.%.3)] // CHECK:STDOUT: %Self.2: %.3 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -346,11 +346,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Foo(@Foo.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @Foo(@Foo.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_parens.carbon @@ -375,28 +375,28 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_15.2: %C = bind_symbolic_name a 0, %a.loc6_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %C.ref.loc14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc14_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc14_15.2: %C = bind_symbolic_name a 0, %a.loc14_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc14: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc6_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc14_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc14: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -414,15 +414,15 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- todo_fail_raw_identifier.carbon @@ -445,22 +445,22 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl.loc6: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_15.2: %C = bind_symbolic_name a 0, %a.loc6_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc6: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param.loc6 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Foo.decl.loc7: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = constants.%a] +// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param.loc7: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param.loc7 [symbolic = constants.%a] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc6_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a) [symbolic = %.1 (constants.%.3)] +// CHECK:STDOUT: %.1: type = interface_type @Foo, @Foo(%a.1) [symbolic = %.1 (constants.%.3)] // CHECK:STDOUT: %Self.2: %.3 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -478,11 +478,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @Foo(@Foo.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @Foo(@Foo.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- two_file.carbon @@ -506,28 +506,28 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: .Bar = %Bar.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %Bar.decl: %Bar.type = interface_decl @Bar [template = constants.%Bar] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc8_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc8_15.2: %C = bind_symbolic_name a 0, %a.loc8_15.1 [symbolic = @Bar.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc8: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc7_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Bar(file.%a.loc8_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Bar(%a.loc8: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } @@ -538,11 +538,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_todo_two_file.impl.carbon @@ -585,13 +585,13 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: %default.import.loc2_6.2 = import // CHECK:STDOUT: %.decl.loc14: %.type.1 = interface_decl @.1 [template = constants.%.3] { // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] -// CHECK:STDOUT: %a.loc14_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc14_15.2: %C = bind_symbolic_name a 0, %a.loc14_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc14: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl.loc25: %.type.2 = interface_decl @.2 [template = constants.%.5] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%import_ref.2 [template = constants.%C] -// CHECK:STDOUT: %a.loc25_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc25_15.2: %C = bind_symbolic_name a 0, %a.loc25_15.1 [symbolic = @.2.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc25: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -601,11 +601,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc14_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc14: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.1)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -623,11 +623,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.2(file.%a.loc25_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.2(%a.loc25: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.2, @.2(%a) [symbolic = %.1 (constants.%.6)] +// CHECK:STDOUT: %.1: type = interface_type @.2, @.2(%a.1) [symbolic = %.1 (constants.%.6)] // CHECK:STDOUT: %Self.2: %.6 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self.2)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -649,11 +649,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Bar(constants.%a) { @@ -661,11 +661,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.2(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.2(@.2.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.2(@.2.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_name_mismatch.carbon @@ -691,31 +691,31 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %b.loc15_15.1: %C = param b, runtime_param -// CHECK:STDOUT: %b.loc15_15.2: %C = bind_symbolic_name b 0, %b.loc15_15.1 [symbolic = @.1.%b (constants.%b)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param +// CHECK:STDOUT: %b.loc15: %C = bind_symbolic_name b 0, %b.param [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc7_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%b.loc15_15.2: %C) { -// CHECK:STDOUT: %b: %C = bind_symbolic_name b 0 [symbolic = %b (constants.%b)] +// CHECK:STDOUT: generic interface @.1(%b.loc15: %C) { +// CHECK:STDOUT: %b.1: %C = bind_symbolic_name b 0 [symbolic = %b.1 (constants.%b)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%b) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%b.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -733,15 +733,15 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%b) { -// CHECK:STDOUT: %b => constants.%b +// CHECK:STDOUT: specific @.1(@.1.%b.1) { +// CHECK:STDOUT: %b.1 => constants.%b // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_alias.carbon @@ -766,31 +766,31 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc15_15.2: %C = bind_symbolic_name a 0, %a.loc15_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc15: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc7_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc15_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc15: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -808,15 +808,15 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_deduced_alias.carbon @@ -841,31 +841,31 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: .Foo = %Foo.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} -// CHECK:STDOUT: %C.ref.loc5: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, %C.decl [template = constants.%C] // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc7_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc7_15.2: %C = bind_symbolic_name a 0, %a.loc7_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc7: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc15_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc15_15.2: %C = bind_symbolic_name a 0, %a.loc15_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc15: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc7_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc7: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc15_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc15: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -883,15 +883,15 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- alias_two_file.carbon @@ -912,14 +912,14 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc6_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc6_15.2: %C = bind_symbolic_name a 0, %a.loc6_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc6_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc6: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } @@ -930,7 +930,7 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_alias_two_file.impl.carbon @@ -965,9 +965,9 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %D: type = bind_alias D, imports.%import_ref.1 [template = constants.%C] // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.3] { -// CHECK:STDOUT: %D.ref: type = name_ref D, %D [template = constants.%C] -// CHECK:STDOUT: %a.loc19_15.1: %C = param a, runtime_param -// CHECK:STDOUT: %a.loc19_15.2: %C = bind_symbolic_name a 0, %a.loc19_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param +// CHECK:STDOUT: %a.loc19: %C = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -977,11 +977,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc19_15.2: %C) { -// CHECK:STDOUT: %a: %C = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc19: %C) { +// CHECK:STDOUT: %a.1: %C = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.4)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.4)] // CHECK:STDOUT: %Self.2: %.4 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -1003,11 +1003,11 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_repeat_const.carbon @@ -1033,31 +1033,31 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = interface_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc6: type = const_type %C [template = constants.%.2] -// CHECK:STDOUT: %a.loc6_15.1: %.2 = param a, runtime_param -// CHECK:STDOUT: %a.loc6_15.2: %.2 = bind_symbolic_name a 0, %a.loc6_15.1 [symbolic = @Foo.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param +// CHECK:STDOUT: %a.loc6: %.2 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: %.decl: %.type = interface_decl @.1 [template = constants.%.4] { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc17_26: type = const_type %C [template = constants.%.2] // CHECK:STDOUT: %.loc17_19: type = const_type %.2 [template = constants.%.2] -// CHECK:STDOUT: %a.loc17_15.1: %.2 = param a, runtime_param -// CHECK:STDOUT: %a.loc17_15.2: %.2 = bind_symbolic_name a 0, %a.loc17_15.1 [symbolic = @.1.%a (constants.%a)] +// CHECK:STDOUT: %a.param: %.2 = param a, runtime_param +// CHECK:STDOUT: %a.loc17: %.2 = bind_symbolic_name a 0, %a.param [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @Foo(file.%a.loc6_15.2: %.2) { -// CHECK:STDOUT: %a: %.2 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @Foo(%a.loc6: %.2) { +// CHECK:STDOUT: %a.1: %.2 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: interface; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic interface @.1(file.%a.loc17_15.2: %.2) { -// CHECK:STDOUT: %a: %.2 = bind_symbolic_name a 0 [symbolic = %a (constants.%a)] +// CHECK:STDOUT: generic interface @.1(%a.loc17: %.2) { +// CHECK:STDOUT: %a.1: %.2 = bind_symbolic_name a 0 [symbolic = %a.1 (constants.%a)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: -// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a) [symbolic = %.1 (constants.%.5)] +// CHECK:STDOUT: %.1: type = interface_type @.1, @.1(%a.1) [symbolic = %.1 (constants.%.5)] // CHECK:STDOUT: %Self.2: %.5 = bind_symbolic_name Self 1 [symbolic = %Self.2 (constants.%Self)] // CHECK:STDOUT: // CHECK:STDOUT: interface { @@ -1075,14 +1075,14 @@ interface Foo(a:! const (const C)) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @Foo(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: specific @.1(@.1.%a) { -// CHECK:STDOUT: %a => constants.%a +// CHECK:STDOUT: specific @.1(@.1.%a.1) { +// CHECK:STDOUT: %a.1 => constants.%a // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/todo_define_not_default.carbon b/toolchain/check/testdata/interface/todo_define_not_default.carbon index 1866820e7d625..7aec7ca2ccdd8 100644 --- a/toolchain/check/testdata/interface/todo_define_not_default.carbon +++ b/toolchain/check/testdata/interface/todo_define_not_default.carbon @@ -76,19 +76,19 @@ interface I { // CHECK:STDOUT: %int.make_type_32.loc14_11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %int.make_type_32.loc14_11 [template = i32] // CHECK:STDOUT: %.loc14_11.2: type = converted %int.make_type_32.loc14_11, %.loc14_11.1 [template = i32] -// CHECK:STDOUT: %a.loc14_8.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: %a.loc14_8.2: i32 = bind_name a, %a.loc14_8.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc14_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_19.1: type = value_of_initializer %int.make_type_32.loc14_19 [template = i32] // CHECK:STDOUT: %.loc14_19.2: type = converted %int.make_type_32.loc14_19, %.loc14_19.1 [template = i32] -// CHECK:STDOUT: %b.loc14_16.1: i32 = param b, runtime_param1 -// CHECK:STDOUT: %b.loc14_16.2: i32 = bind_name b, %b.loc14_16.1 +// CHECK:STDOUT: %b.param: i32 = param b, runtime_param1 +// CHECK:STDOUT: %b: i32 = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc14_27: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc14_27.1: type = value_of_initializer %int.make_type_32.loc14_27 [template = i32] // CHECK:STDOUT: %.loc14_27.2: type = converted %int.make_type_32.loc14_27, %.loc14_27.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc14_31: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] +// CHECK:STDOUT: %.loc14: %.5 = assoc_entity element1, %G.decl [template = constants.%.6] // CHECK:STDOUT: %int.make_type_32.loc18_19: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %int.make_type_32.loc18_24: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_27: %.7 = tuple_literal (%int.make_type_32.loc18_19, %int.make_type_32.loc18_24) @@ -109,7 +109,7 @@ interface I { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = %Self // CHECK:STDOUT: .F = %.loc13 -// CHECK:STDOUT: .G = %.loc14_31 +// CHECK:STDOUT: .G = %.loc14 // CHECK:STDOUT: .T = %.loc18_28.6 // CHECK:STDOUT: .N = %.loc19_19 // CHECK:STDOUT: witness = (%F.decl, %G.decl, %T, %N) @@ -128,7 +128,7 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: generic fn @G(@I.%Self: %.1) { // CHECK:STDOUT: -// CHECK:STDOUT: fn(@I.%a.loc14_8.2: i32, @I.%b.loc14_16.2: i32) -> i32 = "int.sadd"; +// CHECK:STDOUT: fn(%a: i32, %b: i32) -> i32 = "int.sadd"; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @F(constants.%Self) {} diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 27b62aa10aa3c..acdcef96b0846 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -54,10 +54,10 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index b0e2213a2b67d..d63ac4314c2d8 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -93,12 +93,12 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc12_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_9.1: type = value_of_initializer %int.make_type_32.loc12_9 [template = i32] // CHECK:STDOUT: %.loc12_9.2: type = converted %int.make_type_32.loc12_9, %.loc12_9.1 [template = i32] -// CHECK:STDOUT: %a.loc12_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc12_6.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc12_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_17.1: type = value_of_initializer %int.make_type_32.loc12_17 [template = i32] // CHECK:STDOUT: %.loc12_17.2: type = converted %int.make_type_32.loc12_17, %.loc12_17.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -125,9 +125,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_21.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc13_21.2: type = converted %int.make_type_32, %.loc13_21.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_21.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] +// CHECK:STDOUT: %.loc13_21.2: type = converted %int.make_type_32.loc13, %.loc13_21.1 [template = i32] // CHECK:STDOUT: %T: type = bind_symbolic_name T 0, %.loc13_21.2 [symbolic = constants.%T] // CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T] // CHECK:STDOUT: %.loc21_14: i32 = int_literal 5 [template = constants.%.2] diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 822fc5b7278d6..6498b0beafaf0 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -45,14 +45,14 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_8.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_8.2: type = converted %int.make_type_32.loc11, %.loc11_8.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_8.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_8.2: type = converted %int.make_type_32, %.loc11_8.1 [template = i32] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32.loc13, %.loc13_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32, %.loc13_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index b6ce534205701..3fb542239a961 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -48,12 +48,12 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc11_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32.loc11_9 [template = i32] // CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32.loc11_9, %.loc11_9.1 [template = i32] -// CHECK:STDOUT: %a.loc11_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc11_6.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_17.1: type = value_of_initializer %int.make_type_32.loc11_17 [template = i32] // CHECK:STDOUT: %.loc11_17.2: type = converted %int.make_type_32.loc11_17, %.loc11_17.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -61,9 +61,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32, %.loc12_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32.loc12, %.loc12_10.1 [template = i32] // CHECK:STDOUT: %a.ref: i32 = name_ref a, %a // CHECK:STDOUT: %b: i32 = bind_name b, %a.ref // CHECK:STDOUT: %b.ref: i32 = name_ref b, %b diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index cf00d57f939ed..6fa4016a7842c 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -50,12 +50,12 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc11_9: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %int.make_type_32.loc11_9 [template = i32] // CHECK:STDOUT: %.loc11_9.2: type = converted %int.make_type_32.loc11_9, %.loc11_9.1 [template = i32] -// CHECK:STDOUT: %a.loc11_6.1: i32 = param a, runtime_param0 -// CHECK:STDOUT: @F.%a.loc11: i32 = bind_name a, %a.loc11_6.1 +// CHECK:STDOUT: %a.param: i32 = param a, runtime_param0 +// CHECK:STDOUT: %a.loc11: i32 = bind_name a, %a.param // CHECK:STDOUT: %int.make_type_32.loc11_17: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_17.1: type = value_of_initializer %int.make_type_32.loc11_17 [template = i32] // CHECK:STDOUT: %.loc11_17.2: type = converted %int.make_type_32.loc11_17, %.loc11_17.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -63,9 +63,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.loc11: i32) -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32, %.loc12_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32.loc12, %.loc12_10.1 [template = i32] // CHECK:STDOUT: %.loc12_16: i32 = int_literal 1 [template = constants.%.2] // CHECK:STDOUT: %a.loc12: i32 = bind_name a, %.loc12_16 // CHECK:STDOUT: %a.ref: i32 = name_ref a, %a.loc12 diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index c0a0e90b5cb0d..0f09e2ecfc32f 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -86,14 +86,14 @@ var a: i32 = NS.A(); // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { -// CHECK:STDOUT: %int.make_type_32.loc4: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc4_14.1: type = value_of_initializer %int.make_type_32.loc4 [template = i32] -// CHECK:STDOUT: %.loc4_14.2: type = converted %int.make_type_32.loc4, %.loc4_14.1 [template = i32] -// CHECK:STDOUT: @A.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc4_14.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc4_14.2: type = converted %int.make_type_32, %.loc4_14.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %int.make_type_32.loc6: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32.loc6 [template = i32] -// CHECK:STDOUT: %.loc6_8.2: type = converted %int.make_type_32.loc6, %.loc6_8.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc6_8.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc6_8.2: type = converted %int.make_type_32, %.loc6_8.1 [template = i32] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } @@ -102,8 +102,8 @@ var a: i32 = NS.A(); // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc4: i32 = int_literal 0 [template = constants.%.2] -// CHECK:STDOUT: return %.loc4 +// CHECK:STDOUT: %.loc4_27: i32 = int_literal 0 [template = constants.%.2] +// CHECK:STDOUT: return %.loc4_27 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @__global_init() { diff --git a/toolchain/check/testdata/namespace/alias.carbon b/toolchain/check/testdata/namespace/alias.carbon index 806b1adc6d4b1..369cd96464fdb 100644 --- a/toolchain/check/testdata/namespace/alias.carbon +++ b/toolchain/check/testdata/namespace/alias.carbon @@ -66,25 +66,25 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: %NS.ref.loc13: = name_ref NS, %NS [template = %NS] // CHECK:STDOUT: %ns: = bind_alias ns, %NS [template = %NS] // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_14.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_14.2: type = converted %int.make_type_32.loc15, %.loc15_14.1 [template = i32] -// CHECK:STDOUT: @A.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_14.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_14.2: type = converted %int.make_type_32, %.loc15_14.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { -// CHECK:STDOUT: %int.make_type_32.loc17: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc17_11.1: type = value_of_initializer %int.make_type_32.loc17 [template = i32] -// CHECK:STDOUT: %.loc17_11.2: type = converted %int.make_type_32.loc17, %.loc17_11.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc17_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc17_11.2: type = converted %int.make_type_32, %.loc17_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %NS.ref.loc19: = name_ref NS, %NS [template = %NS] // CHECK:STDOUT: %A.ref: %A.type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %C: %A.type = bind_alias C, %A.decl [template = constants.%A] // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] { -// CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc21_11.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] -// CHECK:STDOUT: %.loc21_11.2: type = converted %int.make_type_32.loc21, %.loc21_11.1 [template = i32] -// CHECK:STDOUT: @D.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc21_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc21_11.2: type = converted %int.make_type_32, %.loc21_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -92,8 +92,8 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc15: i32 = int_literal 0 [template = constants.%.2] -// CHECK:STDOUT: return %.loc15 +// CHECK:STDOUT: %.loc15_27: i32 = int_literal 0 [template = constants.%.2] +// CHECK:STDOUT: return %.loc15_27 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() -> i32 { diff --git a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon index 13357c314acaa..d3fd6f981d937 100644 --- a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon +++ b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon @@ -61,7 +61,7 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc22_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc22_14.2: type = converted %int.make_type_32, %.loc22_14.1 [template = i32] -// CHECK:STDOUT: @.1.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -69,7 +69,7 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: // CHECK:STDOUT: fn @.1() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc22: i32 = int_literal 0 [template = constants.%.3] -// CHECK:STDOUT: return %.loc22 +// CHECK:STDOUT: %.loc22_27: i32 = int_literal 0 [template = constants.%.3] +// CHECK:STDOUT: return %.loc22_27 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_params.carbon b/toolchain/check/testdata/namespace/fail_params.carbon index 049d755023186..6b602bceb0ca5 100644 --- a/toolchain/check/testdata/namespace/fail_params.carbon +++ b/toolchain/check/testdata/namespace/fail_params.carbon @@ -82,19 +82,19 @@ fn D(T:! type).F() {} // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc24_16.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc24_16.2: type = converted %int.make_type_32, %.loc24_16.1 [template = i32] -// CHECK:STDOUT: %n.loc24_13.1: i32 = param n, runtime_param -// CHECK:STDOUT: %n.loc24_13.2: i32 = bind_name n, %n.loc24_13.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: %B: = namespace [template] {} -// CHECK:STDOUT: %T.loc30_13.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc30_13.2: type = bind_symbolic_name T 0, %T.loc30_13.1 [symbolic = constants.%T] -// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc30_13.2 [symbolic = constants.%T] -// CHECK:STDOUT: %x.loc30_23.1: %T = param x, runtime_param -// CHECK:STDOUT: %x.loc30_23.2: %T = bind_name x, %x.loc30_23.1 +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T: type = bind_symbolic_name T 0, %T.param [symbolic = constants.%T] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T [symbolic = constants.%T] +// CHECK:STDOUT: %x.param: %T = param x, runtime_param +// CHECK:STDOUT: %x: %T = bind_name x, %x.param // CHECK:STDOUT: %C: = namespace [template] {} // CHECK:STDOUT: %D: = namespace [template] {} // CHECK:STDOUT: %.decl: %.type = fn_decl @.1 [template = constants.%.2] { -// CHECK:STDOUT: %T.loc39_6.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc39_6.2: type = bind_symbolic_name T 0, %T.loc39_6.1 [symbolic = @.1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc39: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -105,8 +105,8 @@ fn D(T:! type).F() {} // CHECK:STDOUT: // CHECK:STDOUT: fn @Int32() -> type = "int.make_type_32"; // CHECK:STDOUT: -// CHECK:STDOUT: generic fn @.1(file.%T.loc39_6.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic fn @.1(%T.loc39: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -117,6 +117,6 @@ fn D(T:! type).F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @.1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/merging_with_indirections.carbon b/toolchain/check/testdata/namespace/merging_with_indirections.carbon index a3b9394394f95..478614b45f6a0 100644 --- a/toolchain/check/testdata/namespace/merging_with_indirections.carbon +++ b/toolchain/check/testdata/namespace/merging_with_indirections.carbon @@ -127,7 +127,7 @@ fn Run() { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %NS1.ref: = name_ref NS1, imports.%NS1 [template = imports.%NS1] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%import_ref.2 [template = constants.%A] -// CHECK:STDOUT: @F.%return: ref %A = var +// CHECK:STDOUT: %return: ref %A = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index b927644a2e375..e00bc00a46bea 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -75,10 +75,10 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc18_15.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc18_15.2: type = converted %int.make_type_32, %.loc18_15.1 [template = i32] -// CHECK:STDOUT: @B.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc18: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc18_15.1: type = value_of_initializer %int.make_type_32.loc18 [template = i32] +// CHECK:STDOUT: %.loc18_15.2: type = converted %int.make_type_32.loc18, %.loc18_15.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -96,9 +96,9 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: if %.loc21 br !if.then else br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.then: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc22_12.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc22_12.2: type = converted %int.make_type_32, %.loc22_12.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc22_12.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] +// CHECK:STDOUT: %.loc22_12.2: type = converted %int.make_type_32.loc22, %.loc22_12.1 [template = i32] // CHECK:STDOUT: %A.var: ref i32 = var A // CHECK:STDOUT: %A: ref i32 = bind_name A, %A.var // CHECK:STDOUT: %.loc22_18: i32 = int_literal 0 [template = constants.%.3] diff --git a/toolchain/check/testdata/operators/builtin/and.carbon b/toolchain/check/testdata/operators/builtin/and.carbon index cd493a68e7a67..6ed59ff15e77e 100644 --- a/toolchain/check/testdata/operators/builtin/and.carbon +++ b/toolchain/check/testdata/operators/builtin/and.carbon @@ -73,30 +73,30 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %bool.make_type.loc11: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type.loc11 [template = bool] -// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type.loc11, %.loc11_11.1 [template = bool] -// CHECK:STDOUT: @F.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type, %.loc11_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type.loc12, %.loc12_11.1 [template = bool] -// CHECK:STDOUT: @G.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type, %.loc12_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %And.decl: %And.type = fn_decl @And [template = constants.%And] { -// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_13.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] -// CHECK:STDOUT: %.loc14_13.2: type = converted %bool.make_type.loc14, %.loc14_13.1 [template = bool] -// CHECK:STDOUT: @And.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_13.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc14_13.2: type = converted %bool.make_type, %.loc14_13.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Constant.decl: %Constant.type = fn_decl @Constant [template = constants.%Constant] {} // CHECK:STDOUT: %PartialConstant.decl: %PartialConstant.type = fn_decl @PartialConstant [template = constants.%PartialConstant] { // CHECK:STDOUT: %bool.make_type.loc25: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc25_23.1: type = value_of_initializer %bool.make_type.loc25 [template = bool] // CHECK:STDOUT: %.loc25_23.2: type = converted %bool.make_type.loc25, %.loc25_23.1 [template = bool] -// CHECK:STDOUT: %x.loc25_20.1: bool = param x, runtime_param0 -// CHECK:STDOUT: @PartialConstant.%x: bool = bind_name x, %x.loc25_20.1 +// CHECK:STDOUT: %x.param: bool = param x, runtime_param0 +// CHECK:STDOUT: %x: bool = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -104,14 +104,14 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: bool = bool_literal true [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_25: bool = bool_literal true [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_25 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> bool { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc12: bool = bool_literal true [template = constants.%.2] -// CHECK:STDOUT: return %.loc12 +// CHECK:STDOUT: %.loc12_25: bool = bool_literal true [template = constants.%.2] +// CHECK:STDOUT: return %.loc12_25 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @And() -> bool { @@ -277,9 +277,9 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: if %.loc26_19.2 br !if.expr.then else br !if.expr.else // CHECK:STDOUT: // CHECK:STDOUT: !if.expr.then: -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc26_30.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc26_30.2: type = converted %bool.make_type, %.loc26_30.1 [template = bool] +// CHECK:STDOUT: %bool.make_type.loc26: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc26_30.1: type = value_of_initializer %bool.make_type.loc26 [template = bool] +// CHECK:STDOUT: %.loc26_30.2: type = converted %bool.make_type.loc26, %.loc26_30.1 [template = bool] // CHECK:STDOUT: br !if.expr.result(%.loc26_30.2) // CHECK:STDOUT: // CHECK:STDOUT: !if.expr.else: 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 cb75d0735bfe5..80b5e211a600f 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 @@ -77,11 +77,11 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %PartialConstant.decl: %PartialConstant.type = fn_decl @PartialConstant [template = constants.%PartialConstant] { -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc4_23.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc4_23.2: type = converted %bool.make_type, %.loc4_23.1 [template = bool] -// CHECK:STDOUT: %x.loc4_20.1: bool = param x, runtime_param0 -// CHECK:STDOUT: @PartialConstant.%x: bool = bind_name x, %x.loc4_20.1 +// CHECK:STDOUT: %bool.make_type.loc4: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc4_23.1: type = value_of_initializer %bool.make_type.loc4 [template = bool] +// CHECK:STDOUT: %.loc4_23.2: type = converted %bool.make_type.loc4, %.loc4_23.1 [template = bool] +// CHECK:STDOUT: %x.param: bool = param x, runtime_param0 +// CHECK:STDOUT: %x: bool = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -181,11 +181,11 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %KnownValueButNonConstantCondition.decl: %KnownValueButNonConstantCondition.type = fn_decl @KnownValueButNonConstantCondition [template = constants.%KnownValueButNonConstantCondition] { -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc4_41.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc4_41.2: type = converted %bool.make_type, %.loc4_41.1 [template = bool] -// CHECK:STDOUT: %x.loc4_38.1: bool = param x, runtime_param0 -// CHECK:STDOUT: @KnownValueButNonConstantCondition.%x: bool = bind_name x, %x.loc4_38.1 +// CHECK:STDOUT: %bool.make_type.loc4: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc4_41.1: type = value_of_initializer %bool.make_type.loc4 [template = bool] +// CHECK:STDOUT: %.loc4_41.2: type = converted %bool.make_type.loc4, %.loc4_41.1 [template = bool] +// CHECK:STDOUT: %x.param: bool = param x, runtime_param0 +// CHECK:STDOUT: %x: bool = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 33f4af64824ae..b6601b4c09afd 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 @@ -110,7 +110,7 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // 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 9df9dd73f5b22..3f56d97a81981 100644 --- a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon @@ -63,7 +63,7 @@ fn Main() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [template = constants.%Main] {} // CHECK:STDOUT: } @@ -72,8 +72,8 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: i32 = int_literal 0 [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_24: i32 = int_literal 0 [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_24 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { 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 0af5fcb5882e4..14375899a1fb0 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_once.carbon @@ -70,7 +70,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 50c84f3574028..4129f4dc5c456 100644 --- a/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_unimplemented_op.carbon @@ -64,7 +64,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/builtin/or.carbon b/toolchain/check/testdata/operators/builtin/or.carbon index 64ce6858a05a6..2acd9c76d7337 100644 --- a/toolchain/check/testdata/operators/builtin/or.carbon +++ b/toolchain/check/testdata/operators/builtin/or.carbon @@ -73,30 +73,30 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %bool.make_type.loc11: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type.loc11 [template = bool] -// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type.loc11, %.loc11_11.1 [template = bool] -// CHECK:STDOUT: @F.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type, %.loc11_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type.loc12, %.loc12_11.1 [template = bool] -// CHECK:STDOUT: @G.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type, %.loc12_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Or.decl: %Or.type = fn_decl @Or [template = constants.%Or] { -// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_12.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] -// CHECK:STDOUT: %.loc14_12.2: type = converted %bool.make_type.loc14, %.loc14_12.1 [template = bool] -// CHECK:STDOUT: @Or.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_12.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc14_12.2: type = converted %bool.make_type, %.loc14_12.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Constant.decl: %Constant.type = fn_decl @Constant [template = constants.%Constant] {} // CHECK:STDOUT: %PartialConstant.decl: %PartialConstant.type = fn_decl @PartialConstant [template = constants.%PartialConstant] { // CHECK:STDOUT: %bool.make_type.loc25: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc25_23.1: type = value_of_initializer %bool.make_type.loc25 [template = bool] // CHECK:STDOUT: %.loc25_23.2: type = converted %bool.make_type.loc25, %.loc25_23.1 [template = bool] -// CHECK:STDOUT: %x.loc25_20.1: bool = param x, runtime_param0 -// CHECK:STDOUT: @PartialConstant.%x: bool = bind_name x, %x.loc25_20.1 +// CHECK:STDOUT: %x.param: bool = param x, runtime_param0 +// CHECK:STDOUT: %x: bool = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -104,14 +104,14 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc11: bool = bool_literal true [template = constants.%.2] -// CHECK:STDOUT: return %.loc11 +// CHECK:STDOUT: %.loc11_25: bool = bool_literal true [template = constants.%.2] +// CHECK:STDOUT: return %.loc11_25 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> bool { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc12: bool = bool_literal true [template = constants.%.2] -// CHECK:STDOUT: return %.loc12 +// CHECK:STDOUT: %.loc12_25: bool = bool_literal true [template = constants.%.2] +// CHECK:STDOUT: return %.loc12_25 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Or() -> bool { @@ -279,9 +279,9 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: if %.loc26_18.3 br !if.expr.then else br !if.expr.else // CHECK:STDOUT: // CHECK:STDOUT: !if.expr.then: -// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc26_28.1: type = value_of_initializer %bool.make_type [template = bool] -// CHECK:STDOUT: %.loc26_28.2: type = converted %bool.make_type, %.loc26_28.1 [template = bool] +// CHECK:STDOUT: %bool.make_type.loc26: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc26_28.1: type = value_of_initializer %bool.make_type.loc26 [template = bool] +// CHECK:STDOUT: %.loc26_28.2: type = converted %bool.make_type.loc26, %.loc26_28.1 [template = bool] // CHECK:STDOUT: br !if.expr.result(%.loc26_28.2) // CHECK:STDOUT: // CHECK:STDOUT: !if.expr.else: diff --git a/toolchain/check/testdata/operators/builtin/unary_op.carbon b/toolchain/check/testdata/operators/builtin/unary_op.carbon index b10f6ed3aafe5..e1ee085cb272d 100644 --- a/toolchain/check/testdata/operators/builtin/unary_op.carbon +++ b/toolchain/check/testdata/operators/builtin/unary_op.carbon @@ -63,12 +63,12 @@ fn Constant() { // CHECK:STDOUT: %bool.make_type.loc11_11: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type.loc11_11 [template = bool] // CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type.loc11_11, %.loc11_11.1 [template = bool] -// CHECK:STDOUT: %b.loc11_8.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @Not.%b: bool = bind_name b, %b.loc11_8.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %bool.make_type.loc11_20: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_20.1: type = value_of_initializer %bool.make_type.loc11_20 [template = bool] // CHECK:STDOUT: %.loc11_20.2: type = converted %bool.make_type.loc11_20, %.loc11_20.1 [template = bool] -// CHECK:STDOUT: @Not.%return: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %bool.make_type.loc15: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc15_15.1: type = value_of_initializer %bool.make_type.loc15 [template = bool] diff --git a/toolchain/check/testdata/operators/overloaded/add.carbon b/toolchain/check/testdata/operators/overloaded/add.carbon index f8b87c76e5aa8..d670d5947606a 100644 --- a/toolchain/check/testdata/operators/overloaded/add.carbon +++ b/toolchain/check/testdata/operators/overloaded/add.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_and.carbon b/toolchain/check/testdata/operators/overloaded/bit_and.carbon index 9af6facbda414..6e8ec25bd8013 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_and.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_and.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon index a4b7c31ed3cca..a74ac1b423a9e 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_complement.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_complement.carbon @@ -73,16 +73,16 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc23_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc23_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc23_11.1 -// CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc23_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -96,10 +96,10 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_23: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -113,12 +113,12 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.%self.loc18_9.2: %C]() -> @impl.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C]() -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self: %.2) { diff --git a/toolchain/check/testdata/operators/overloaded/bit_or.carbon b/toolchain/check/testdata/operators/overloaded/bit_or.carbon index 8b0e1cd77796e..8c0b323b69081 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_or.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_or.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon index 7879a95b86eb8..3c3f24801f1bc 100644 --- a/toolchain/check/testdata/operators/overloaded/bit_xor.carbon +++ b/toolchain/check/testdata/operators/overloaded/bit_xor.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/dec.carbon b/toolchain/check/testdata/operators/overloaded/dec.carbon index 53e186f5d4a31..112a6150d6715 100644 --- a/toolchain/check/testdata/operators/overloaded/dec.carbon +++ b/toolchain/check/testdata/operators/overloaded/dec.carbon @@ -74,7 +74,7 @@ fn TestOp() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } @@ -92,9 +92,9 @@ fn TestOp() { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc18_21: type = ptr_type %C [template = constants.%.3] -// CHECK:STDOUT: %self.loc18_14.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_14.3: %.3 = bind_name self, %self.loc18_14.1 -// CHECK:STDOUT: %.loc18_9: %.3 = addr_pattern %self.loc18_14.3 +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc18_9: %.3 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.6] // CHECK:STDOUT: @@ -108,7 +108,7 @@ fn TestOp() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[addr @impl.%self.loc18_14.3: %.3](); +// CHECK:STDOUT: fn @Op.1[addr %self: %.3](); // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] diff --git a/toolchain/check/testdata/operators/overloaded/div.carbon b/toolchain/check/testdata/operators/overloaded/div.carbon index ec57570e781ca..9c112c390611c 100644 --- a/toolchain/check/testdata/operators/overloaded/div.carbon +++ b/toolchain/check/testdata/operators/overloaded/div.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/eq.carbon b/toolchain/check/testdata/operators/overloaded/eq.carbon index 58d665e905ff0..dfa1076cec420 100644 --- a/toolchain/check/testdata/operators/overloaded/eq.carbon +++ b/toolchain/check/testdata/operators/overloaded/eq.carbon @@ -146,33 +146,33 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: %TestEqual.decl: %TestEqual.type = fn_decl @TestEqual [template = constants.%TestEqual] { -// CHECK:STDOUT: %C.ref.loc11_17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc11_14.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestEqual.%a: %C = bind_name a, %a.loc11_14.1 -// CHECK:STDOUT: %C.ref.loc11_23: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc11_20.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestEqual.%b: %C = bind_name b, %b.loc11_20.1 -// CHECK:STDOUT: %bool.make_type.loc11: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc11_29.1: type = value_of_initializer %bool.make_type.loc11 [template = bool] -// CHECK:STDOUT: %.loc11_29.2: type = converted %bool.make_type.loc11, %.loc11_29.1 [template = bool] -// CHECK:STDOUT: @TestEqual.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc11_17: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc11_23: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc11_29.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc11_29.2: type = converted %bool.make_type, %.loc11_29.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestNotEqual.decl: %TestNotEqual.type = fn_decl @TestNotEqual [template = constants.%TestNotEqual] { -// CHECK:STDOUT: %C.ref.loc15_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc15_17.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestNotEqual.%a: %C = bind_name a, %a.loc15_17.1 -// CHECK:STDOUT: %C.ref.loc15_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc15_23.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestNotEqual.%b: %C = bind_name b, %b.loc15_23.1 -// CHECK:STDOUT: %bool.make_type.loc15: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc15_32.1: type = value_of_initializer %bool.make_type.loc15 [template = bool] -// CHECK:STDOUT: %.loc15_32.2: type = converted %bool.make_type.loc15, %.loc15_32.1 [template = bool] -// CHECK:STDOUT: @TestNotEqual.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc15_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc15_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc15_32.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc15_32.2: type = converted %bool.make_type, %.loc15_32.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -187,27 +187,27 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %Equal.decl: %Equal.type.1 = fn_decl @Equal.1 [template = constants.%Equal.1] { // CHECK:STDOUT: %C.ref.loc7_18: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc7_12.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_12.2: %C = bind_name self, %self.loc7_12.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc7_28: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc7_21.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc7_21.2: %C = bind_name other, %other.loc7_21.1 -// CHECK:STDOUT: %bool.make_type.loc7: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc7_34.1: type = value_of_initializer %bool.make_type.loc7 [template = bool] -// CHECK:STDOUT: %.loc7_34.2: type = converted %bool.make_type.loc7, %.loc7_34.1 [template = bool] -// CHECK:STDOUT: %return.var.loc7: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc7_34.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc7_34.2: type = converted %bool.make_type, %.loc7_34.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %NotEqual.decl: %NotEqual.type.1 = fn_decl @NotEqual.1 [template = constants.%NotEqual.1] { // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc8_15.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc8_15.2: %C = bind_name self, %self.loc8_15.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc8_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc8_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc8_24.2: %C = bind_name other, %other.loc8_24.1 -// CHECK:STDOUT: %bool.make_type.loc8: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc8_37.1: type = value_of_initializer %bool.make_type.loc8 [template = bool] -// CHECK:STDOUT: %.loc8_37.2: type = converted %bool.make_type.loc8, %.loc8_37.1 [template = bool] -// CHECK:STDOUT: %return.var.loc8: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc8_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc8_37.2: type = converted %bool.make_type, %.loc8_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc6: = interface_witness (%Equal.decl, %NotEqual.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -224,9 +224,9 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Equal.1[@impl.%self.loc7_12.2: %C](@impl.%other.loc7_21.2: %C) -> bool; +// CHECK:STDOUT: fn @Equal.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @NotEqual.1[@impl.%self.loc8_15.2: %C](@impl.%other.loc8_24.2: %C) -> bool; +// CHECK:STDOUT: fn @NotEqual.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Equal.2(constants.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] @@ -341,28 +341,28 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: %TestEqual.decl: %TestEqual.type = fn_decl @TestEqual [template = constants.%TestEqual] { -// CHECK:STDOUT: %D.ref.loc6_17: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc6_14.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestEqual.%a: %D = bind_name a, %a.loc6_14.1 -// CHECK:STDOUT: %D.ref.loc6_23: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc6_20.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestEqual.%b: %D = bind_name b, %b.loc6_20.1 -// CHECK:STDOUT: %bool.make_type.loc6: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc6_29.1: type = value_of_initializer %bool.make_type.loc6 [template = bool] -// CHECK:STDOUT: %.loc6_29.2: type = converted %bool.make_type.loc6, %.loc6_29.1 [template = bool] -// CHECK:STDOUT: @TestEqual.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc6_17: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc6_23: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc6_29.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc6_29.2: type = converted %bool.make_type, %.loc6_29.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestNotEqual.decl: %TestNotEqual.type = fn_decl @TestNotEqual [template = constants.%TestNotEqual] { -// CHECK:STDOUT: %D.ref.loc14_20: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc14_17.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestNotEqual.%a: %D = bind_name a, %a.loc14_17.1 -// CHECK:STDOUT: %D.ref.loc14_26: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc14_23.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestNotEqual.%b: %D = bind_name b, %b.loc14_23.1 -// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_32.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] -// CHECK:STDOUT: %.loc14_32.2: type = converted %bool.make_type.loc14, %.loc14_32.1 [template = bool] -// CHECK:STDOUT: @TestNotEqual.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc14_20: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc14_26: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_32.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc14_32.2: type = converted %bool.make_type, %.loc14_32.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -507,33 +507,33 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc7: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: %TestRhsBad.decl: %TestRhsBad.type = fn_decl @TestRhsBad [template = constants.%TestRhsBad] { -// CHECK:STDOUT: %C.ref.loc12: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc12_15.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestRhsBad.%a: %C = bind_name a, %a.loc12_15.1 -// CHECK:STDOUT: %D.ref.loc12: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc12_21.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestRhsBad.%b: %D = bind_name b, %b.loc12_21.1 -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_30.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_30.2: type = converted %bool.make_type.loc12, %.loc12_30.1 [template = bool] -// CHECK:STDOUT: @TestRhsBad.%return: ref bool = var +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_30.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_30.2: type = converted %bool.make_type, %.loc12_30.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestLhsBad.decl: %TestLhsBad.type = fn_decl @TestLhsBad [template = constants.%TestLhsBad] { -// CHECK:STDOUT: %D.ref.loc26: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc26_15.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestLhsBad.%a: %D = bind_name a, %a.loc26_15.1 -// CHECK:STDOUT: %C.ref.loc26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_21.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestLhsBad.%b: %C = bind_name b, %b.loc26_21.1 -// CHECK:STDOUT: %bool.make_type.loc26: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc26_30.1: type = value_of_initializer %bool.make_type.loc26 [template = bool] -// CHECK:STDOUT: %.loc26_30.2: type = converted %bool.make_type.loc26, %.loc26_30.1 [template = bool] -// CHECK:STDOUT: @TestLhsBad.%return: ref bool = var +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc26_30.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc26_30.2: type = converted %bool.make_type, %.loc26_30.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -567,27 +567,27 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %Equal.decl: %Equal.type.1 = fn_decl @Equal.1 [template = constants.%Equal.1] { // CHECK:STDOUT: %C.ref.loc8_18: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc8_12.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc8_12.2: %C = bind_name self, %self.loc8_12.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc8_28: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc8_21.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc8_21.2: %C = bind_name other, %other.loc8_21.1 -// CHECK:STDOUT: %bool.make_type.loc8: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc8_34.1: type = value_of_initializer %bool.make_type.loc8 [template = bool] -// CHECK:STDOUT: %.loc8_34.2: type = converted %bool.make_type.loc8, %.loc8_34.1 [template = bool] -// CHECK:STDOUT: %return.var.loc8: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc8_34.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc8_34.2: type = converted %bool.make_type, %.loc8_34.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %NotEqual.decl: %NotEqual.type.1 = fn_decl @NotEqual.1 [template = constants.%NotEqual.1] { // CHECK:STDOUT: %C.ref.loc9_21: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc9_15.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc9_15.2: %C = bind_name self, %self.loc9_15.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc9_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc9_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc9_24.2: %C = bind_name other, %other.loc9_24.1 -// CHECK:STDOUT: %bool.make_type.loc9: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc9_37.1: type = value_of_initializer %bool.make_type.loc9 [template = bool] -// CHECK:STDOUT: %.loc9_37.2: type = converted %bool.make_type.loc9, %.loc9_37.1 [template = bool] -// CHECK:STDOUT: %return.var.loc9: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc9_37.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc9_37.2: type = converted %bool.make_type, %.loc9_37.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: = interface_witness (%Equal.decl, %NotEqual.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -609,9 +609,9 @@ fn TestLhsBad(a: D, b: C) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Equal.1[@impl.%self.loc8_12.2: %C](@impl.%other.loc8_21.2: %C) -> bool; +// CHECK:STDOUT: fn @Equal.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @NotEqual.1[@impl.%self.loc9_15.2: %C](@impl.%other.loc9_24.2: %C) -> bool; +// CHECK:STDOUT: fn @NotEqual.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Equal.2(constants.%Self.1: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.1)] 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 a9bf843052471..7be294354f46f 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_assign_non_ref.carbon @@ -109,27 +109,27 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc15: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc15: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc18: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc18: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.7] // CHECK:STDOUT: } // CHECK:STDOUT: %TestIncNonRef.decl: %TestIncNonRef.type = fn_decl @TestIncNonRef [template = constants.%TestIncNonRef] { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc22_18.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestIncNonRef.%a: %C = bind_name a, %a.loc22_18.1 +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param // CHECK:STDOUT: } // CHECK:STDOUT: %TestAddAssignNonRef.decl: %TestAddAssignNonRef.type = fn_decl @TestAddAssignNonRef [template = constants.%TestAddAssignNonRef] { -// CHECK:STDOUT: %C.ref.loc33_27: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc33_24.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestAddAssignNonRef.%a: %C = bind_name a, %a.loc33_24.1 -// CHECK:STDOUT: %C.ref.loc33_33: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc33_30.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAddAssignNonRef.%b: %C = bind_name b, %b.loc33_30.1 +// CHECK:STDOUT: %C.ref.loc33_27: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc33_33: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -151,9 +151,9 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc16_21: type = ptr_type %C [template = constants.%.3] -// CHECK:STDOUT: %self.loc16_14.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc16_14.3: %.3 = bind_name self, %self.loc16_14.1 -// CHECK:STDOUT: %.loc16_9: %.3 = addr_pattern %self.loc16_14.3 +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc16_9: %.3 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: %.loc15: = interface_witness (%Op.decl) [template = constants.%.6] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc19_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc19_21: type = ptr_type %C [template = constants.%.3] -// CHECK:STDOUT: %self.loc19_14.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc19_14.3: %.3 = bind_name self, %self.loc19_14.1 -// CHECK:STDOUT: %.loc19_9: %.3 = addr_pattern %self.loc19_14.3 +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc19_9: %.3 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc19_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc19_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc19_24.2: %C = bind_name other, %other.loc19_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc18: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,7 +185,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[addr @impl.1.%self.loc16_14.3: %.3](); +// CHECK:STDOUT: fn @Op.1[addr %self: %.3](); // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.1)] @@ -194,7 +194,7 @@ fn TestAddAssignNonRef(a: C, b: C) { // CHECK:STDOUT: fn[addr %self: @Op.2.%.2 (%.5)](); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc19_14.3: %.3](@impl.2.%other.loc19_24.2: %C); +// CHECK:STDOUT: fn @Op.3[addr %self: %.3](%other: %C); // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.4(constants.%Self.2: %.7) { // CHECK:STDOUT: %Self: %.7 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.2)] diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon index 6946c2261d3a7..2fdc7b31aed09 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon @@ -131,26 +131,26 @@ fn TestRef(b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %TestUnary.decl: %TestUnary.type = fn_decl @TestUnary [template = constants.%TestUnary] { -// CHECK:STDOUT: %C.ref.loc15_17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc15_14.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestUnary.%a: %C = bind_name a, %a.loc15_14.1 -// CHECK:STDOUT: %C.ref.loc15_23: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestUnary.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc15_17: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc15_23: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestBinary.decl: %TestBinary.type = fn_decl @TestBinary [template = constants.%TestBinary] { -// CHECK:STDOUT: %C.ref.loc23_18: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc23_15.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestBinary.%a: %C = bind_name a, %a.loc23_15.1 -// CHECK:STDOUT: %C.ref.loc23_24: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc23_21.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestBinary.%b: %C = bind_name b, %b.loc23_21.1 -// CHECK:STDOUT: %C.ref.loc23_30: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestBinary.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc23_18: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc23_24: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc23_30: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestRef.decl: %TestRef.type = fn_decl @TestRef [template = constants.%TestRef] { -// CHECK:STDOUT: %C.ref.loc31: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc31_12.1: %C = param b, runtime_param0 -// CHECK:STDOUT: @TestRef.%b: %C = bind_name b, %b.loc31_12.1 +// CHECK:STDOUT: %C.ref.loc31: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param0 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -216,7 +216,7 @@ fn TestRef(b: C) { // CHECK:STDOUT: // CHECK:STDOUT: fn @TestRef(%b: %C) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc32: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %a.var: ref %C = var a // CHECK:STDOUT: %a: ref %C = bind_name a, %a.var // CHECK:STDOUT: %.loc32_15.1: %.1 = struct_literal () 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 48b0bdb1ae8f2..9183dc209782b 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 @@ -143,29 +143,29 @@ fn TestAssign(b: D) { // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc16: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc16: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc19: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.5] // CHECK:STDOUT: } // CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [template = constants.%Test] { -// CHECK:STDOUT: %C.ref.loc23_12: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc23_9.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @Test.%a: %C = bind_name a, %a.loc23_9.1 -// CHECK:STDOUT: %D.ref.loc23: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc23_15.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @Test.%b: %D = bind_name b, %b.loc23_15.1 -// CHECK:STDOUT: %C.ref.loc23_24: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @Test.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc23_12: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc23_24: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %D.ref.loc37: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc37_15.1: %D = param b, runtime_param0 -// CHECK:STDOUT: @TestAssign.%b: %D = bind_name b, %b.loc37_15.1 +// CHECK:STDOUT: %D.ref: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param0 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -205,13 +205,13 @@ fn TestAssign(b: D) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc17_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc17_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc17_9.2: %C = bind_name self, %self.loc17_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc17_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc17_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc17_18.2: %C = bind_name other, %other.loc17_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc17_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc16: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -224,12 +224,12 @@ fn TestAssign(b: D) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc20_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc20_21: type = ptr_type %C [template = constants.%.6] -// CHECK:STDOUT: %self.loc20_14.1: %.6 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc20_14.3: %.6 = bind_name self, %self.loc20_14.1 -// CHECK:STDOUT: %.loc20_9: %.6 = addr_pattern %self.loc20_14.3 +// CHECK:STDOUT: %self.param: %.6 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.6 = bind_name self, %self.param +// CHECK:STDOUT: %.loc20_9: %.6 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc20_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc20_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc20_24.2: %C = bind_name other, %other.loc20_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc19: = interface_witness (%Op.decl) [template = constants.%.8] // CHECK:STDOUT: @@ -248,7 +248,7 @@ fn TestAssign(b: D) { // CHECK:STDOUT: .Self = constants.%D // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc17_9.2: %C](@impl.1.%other.loc17_18.2: %C) -> %C; +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %C; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.1)] @@ -256,7 +256,7 @@ fn TestAssign(b: D) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc20_14.3: %.6](@impl.2.%other.loc20_24.2: %C); +// CHECK:STDOUT: fn @Op.3[addr %self: %.6](%other: %C); // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.4(constants.%Self.2: %.5) { // CHECK:STDOUT: %Self: %.5 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self.2)] diff --git a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon index ea7ce7bdc213b..87626be19597a 100644 --- a/toolchain/check/testdata/operators/overloaded/implicit_as.carbon +++ b/toolchain/check/testdata/operators/overloaded/implicit_as.carbon @@ -113,40 +113,40 @@ fn Test() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %int.make_type_32.loc15: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32.loc15 [template = i32] -// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32.loc15, %.loc15_6.1 [template = i32] -// CHECK:STDOUT: %Core.ref.loc15: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref.loc15: %ImplicitAs.type = name_ref ImplicitAs, imports.%import_ref.2 [template = constants.%ImplicitAs] -// CHECK:STDOUT: %X.ref.loc15: type = name_ref X, %X.decl [template = constants.%X] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc15_6.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc15_6.2: type = converted %int.make_type_32, %.loc15_6.1 [template = i32] +// CHECK:STDOUT: %Core.ref: = name_ref Core, imports.%Core [template = imports.%Core] +// CHECK:STDOUT: %ImplicitAs.ref: %ImplicitAs.type = name_ref ImplicitAs, imports.%import_ref.2 [template = constants.%ImplicitAs] +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %.loc15_28: type = interface_type @ImplicitAs, @ImplicitAs(constants.%X) [template = constants.%.7] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %X.ref.loc19: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %Core.ref.loc19: = name_ref Core, imports.%Core [template = imports.%Core] -// CHECK:STDOUT: %ImplicitAs.ref.loc19: %ImplicitAs.type = name_ref ImplicitAs, imports.%import_ref.2 [template = constants.%ImplicitAs] -// CHECK:STDOUT: %int.make_type_32.loc19: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc19_26.1: type = value_of_initializer %int.make_type_32.loc19 [template = i32] -// CHECK:STDOUT: %.loc19_26.2: type = converted %int.make_type_32.loc19, %.loc19_26.1 [template = i32] +// 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 = name_ref ImplicitAs, imports.%import_ref.2 [template = constants.%ImplicitAs] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc19_26.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc19_26.2: type = converted %int.make_type_32, %.loc19_26.1 [template = i32] // CHECK:STDOUT: %.loc19_26.3: type = interface_type @ImplicitAs, @ImplicitAs(i32) [template = constants.%.12] // CHECK:STDOUT: } // CHECK:STDOUT: %Sink_i32.decl: %Sink_i32.type = fn_decl @Sink_i32 [template = constants.%Sink_i32] { -// CHECK:STDOUT: %int.make_type_32.loc25: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc25_16.1: type = value_of_initializer %int.make_type_32.loc25 [template = i32] -// CHECK:STDOUT: %.loc25_16.2: type = converted %int.make_type_32.loc25, %.loc25_16.1 [template = i32] -// CHECK:STDOUT: %n.loc25_13.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Sink_i32.%n: i32 = bind_name n, %n.loc25_13.1 +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc25_16.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc25_16.2: type = converted %int.make_type_32, %.loc25_16.1 [template = i32] +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: %Sink_X.decl: %Sink_X.type = fn_decl @Sink_X [template = constants.%Sink_X] { -// CHECK:STDOUT: %X.ref.loc26: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %x.loc26_11.1: %X = param x, runtime_param0 -// CHECK:STDOUT: @Sink_X.%x: %X = bind_name x, %x.loc26_11.1 +// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %x.param: %X = param x, runtime_param0 +// CHECK:STDOUT: %x: %X = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: %Source.decl: %Source.type = fn_decl @Source [template = constants.%Source] { -// CHECK:STDOUT: %T.loc27_11.1: type = param T, runtime_param -// CHECK:STDOUT: @Source.%T.loc27: type = bind_symbolic_name T 0, %T.loc27_11.1 [symbolic = @Source.%T.1 (constants.%T)] -// CHECK:STDOUT: %T.ref: type = name_ref T, @Source.%T.loc27 [symbolic = @Source.%T.1 (constants.%T)] -// CHECK:STDOUT: @Source.%return: ref @Source.%T.1 (%T) = var +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc27: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %T.ref: type = name_ref T, %T.loc27 [symbolic = %T.1 (constants.%T)] +// CHECK:STDOUT: %return: ref @Source.%T.1 (%T) = var // CHECK:STDOUT: } // CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [template = constants.%Test] {} // CHECK:STDOUT: } @@ -175,33 +175,33 @@ fn Test() { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc16_20.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc16_20.2: type = converted %int.make_type_32, %.loc16_20.1 [template = i32] -// CHECK:STDOUT: %self.loc16_14.1: i32 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc16_14.2: i32 = bind_name self, %self.loc16_14.1 +// CHECK:STDOUT: %self.param: i32 = param self, runtime_param0 +// CHECK:STDOUT: %self: i32 = bind_name self, %self.param // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %return.var: ref %X = var +// CHECK:STDOUT: %return: ref %X = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc15: = interface_witness (%Convert.decl) [template = constants.%.10] +// CHECK:STDOUT: %.loc15_32: = interface_witness (%Convert.decl) [template = constants.%.10] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Convert = %Convert.decl -// CHECK:STDOUT: witness = %.loc15 +// CHECK:STDOUT: witness = %.loc15_32 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.2: %X as %.12 { // CHECK:STDOUT: %Convert.decl: %Convert.type.4 = fn_decl @Convert.3 [template = constants.%Convert.4] { // CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] -// CHECK:STDOUT: %self.loc20_14.1: %X = param self, runtime_param0 -// CHECK:STDOUT: %self.loc20_14.2: %X = bind_name self, %self.loc20_14.1 +// CHECK:STDOUT: %self.param: %X = param self, runtime_param0 +// CHECK:STDOUT: %self: %X = bind_name self, %self.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc20_28.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc20_28.2: type = converted %int.make_type_32, %.loc20_28.1 [template = i32] -// CHECK:STDOUT: %return.var: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } -// CHECK:STDOUT: %.loc19: = interface_witness (%Convert.decl) [template = constants.%.15] +// CHECK:STDOUT: %.loc19_32: = interface_witness (%Convert.decl) [template = constants.%.15] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Convert = %Convert.decl -// CHECK:STDOUT: witness = %.loc19 +// CHECK:STDOUT: witness = %.loc19_32 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { @@ -225,20 +225,20 @@ fn Test() { // CHECK:STDOUT: fn[%self: @Convert.1.%Self (%Self.2)]() -> @Convert.1.%Dest (%Dest); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Convert.2[@impl.1.%self.loc16_14.2: i32]() -> @impl.1.%return.var: %X { +// CHECK:STDOUT: fn @Convert.2[%self: i32]() -> %return: %X { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: i32 = name_ref self, @impl.1.%self.loc16_14.2 +// CHECK:STDOUT: %self.ref: i32 = name_ref self, %self // CHECK:STDOUT: %.loc16_51.1: %.3 = struct_literal (%self.ref) -// CHECK:STDOUT: %.loc16_51.2: ref i32 = class_element_access @impl.1.%return.var, element0 +// CHECK:STDOUT: %.loc16_51.2: ref i32 = class_element_access %return, element0 // CHECK:STDOUT: %.loc16_51.3: init i32 = initialize_from %self.ref to %.loc16_51.2 -// CHECK:STDOUT: %.loc16_51.4: init %X = class_init (%.loc16_51.3), @impl.1.%return.var +// CHECK:STDOUT: %.loc16_51.4: init %X = class_init (%.loc16_51.3), %return // CHECK:STDOUT: %.loc16_52: init %X = converted %.loc16_51.1, %.loc16_51.4 -// CHECK:STDOUT: return %.loc16_52 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc16_52 to %return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Convert.3[@impl.2.%self.loc20_14.2: %X]() -> i32 { +// CHECK:STDOUT: fn @Convert.3[%self: %X]() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %self.ref: %X = name_ref self, @impl.2.%self.loc20_14.2 +// CHECK:STDOUT: %self.ref: %X = name_ref self, %self // CHECK:STDOUT: %n.ref: %.2 = name_ref n, @X.%.loc12_8 [template = @X.%.loc12_8] // CHECK:STDOUT: %.loc20_45.1: ref i32 = class_element_access %self.ref, element0 // CHECK:STDOUT: %.loc20_45.2: i32 = bind_value %.loc20_45.1 @@ -266,7 +266,7 @@ fn Test() { // CHECK:STDOUT: %.loc30_11.2: %.13 = specific_constant imports.%import_ref.4, @ImplicitAs(i32) [template = constants.%.14] // CHECK:STDOUT: %Convert.ref.loc30: %.13 = name_ref Convert, %.loc30_11.2 [template = constants.%.14] // CHECK:STDOUT: %.loc30_18.2: ref %X = temporary %.loc30_18.1, %Source.call.loc30 -// CHECK:STDOUT: %.loc30_11.3: %Convert.type.5 = interface_witness_access @impl.2.%.loc19, element0 [template = constants.%Convert.4] +// CHECK:STDOUT: %.loc30_11.3: %Convert.type.5 = interface_witness_access @impl.2.%.loc19_32, element0 [template = constants.%Convert.4] // CHECK:STDOUT: %.loc30_11.4: = bound_method %.loc30_18.2, %.loc30_11.3 // CHECK:STDOUT: %.loc30_18.3: %X = bind_value %.loc30_18.2 // CHECK:STDOUT: %Convert.call.loc30: init i32 = call %.loc30_11.4(%.loc30_18.3) @@ -286,7 +286,7 @@ fn Test() { // CHECK:STDOUT: %Convert.ref.loc31: %.8 = name_ref Convert, %.loc31_9.2 [template = constants.%.9] // CHECK:STDOUT: %.loc31_16.3: ref i32 = temporary_storage // CHECK:STDOUT: %.loc31_16.4: ref i32 = temporary %.loc31_16.3, %Source.call.loc31 -// CHECK:STDOUT: %.loc31_9.3: %Convert.type.3 = interface_witness_access @impl.1.%.loc15, element0 [template = constants.%Convert.2] +// CHECK:STDOUT: %.loc31_9.3: %Convert.type.3 = interface_witness_access @impl.1.%.loc15_32, element0 [template = constants.%Convert.2] // CHECK:STDOUT: %.loc31_9.4: = bound_method %.loc31_16.4, %.loc31_9.3 // CHECK:STDOUT: %.loc31_9.5: ref %X = temporary_storage // CHECK:STDOUT: %.loc31_16.5: i32 = bind_value %.loc31_16.4 diff --git a/toolchain/check/testdata/operators/overloaded/inc.carbon b/toolchain/check/testdata/operators/overloaded/inc.carbon index 41948d3954299..9f0458738f80a 100644 --- a/toolchain/check/testdata/operators/overloaded/inc.carbon +++ b/toolchain/check/testdata/operators/overloaded/inc.carbon @@ -74,7 +74,7 @@ fn TestOp() { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } @@ -92,9 +92,9 @@ fn TestOp() { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc18_21: type = ptr_type %C [template = constants.%.3] -// CHECK:STDOUT: %self.loc18_14.1: %.3 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_14.3: %.3 = bind_name self, %self.loc18_14.1 -// CHECK:STDOUT: %.loc18_9: %.3 = addr_pattern %self.loc18_14.3 +// CHECK:STDOUT: %self.param: %.3 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.3 = bind_name self, %self.param +// CHECK:STDOUT: %.loc18_9: %.3 = addr_pattern %self // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.6] // CHECK:STDOUT: @@ -108,7 +108,7 @@ fn TestOp() { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[addr @impl.%self.loc18_14.3: %.3](); +// CHECK:STDOUT: fn @Op.1[addr %self: %.3](); // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] diff --git a/toolchain/check/testdata/operators/overloaded/left_shift.carbon b/toolchain/check/testdata/operators/overloaded/left_shift.carbon index ae90f920843d8..b36719a3a36d6 100644 --- a/toolchain/check/testdata/operators/overloaded/left_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/left_shift.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/mod.carbon b/toolchain/check/testdata/operators/overloaded/mod.carbon index 93660eb06e69e..26b20275b5173 100644 --- a/toolchain/check/testdata/operators/overloaded/mod.carbon +++ b/toolchain/check/testdata/operators/overloaded/mod.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/mul.carbon b/toolchain/check/testdata/operators/overloaded/mul.carbon index 46fa4712204d7..89edcf5db1a95 100644 --- a/toolchain/check/testdata/operators/overloaded/mul.carbon +++ b/toolchain/check/testdata/operators/overloaded/mul.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/negate.carbon b/toolchain/check/testdata/operators/overloaded/negate.carbon index 227c56ef15471..fc28219921710 100644 --- a/toolchain/check/testdata/operators/overloaded/negate.carbon +++ b/toolchain/check/testdata/operators/overloaded/negate.carbon @@ -73,16 +73,16 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc23_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc23_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc23_11.1 -// CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc23_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -96,10 +96,10 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_23: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -113,12 +113,12 @@ fn TestOp(a: C) -> C { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.%self.loc18_9.2: %C]() -> @impl.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C]() -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self: %.2) { diff --git a/toolchain/check/testdata/operators/overloaded/ordered.carbon b/toolchain/check/testdata/operators/overloaded/ordered.carbon index e1312117f32c7..a237a0f13ba12 100644 --- a/toolchain/check/testdata/operators/overloaded/ordered.carbon +++ b/toolchain/check/testdata/operators/overloaded/ordered.carbon @@ -162,57 +162,57 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl { -// CHECK:STDOUT: %C.ref.loc6: type = name_ref C, %C.decl [template = constants.%C] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: %TestLess.decl: %TestLess.type = fn_decl @TestLess [template = constants.%TestLess] { -// CHECK:STDOUT: %C.ref.loc13_16: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc13_13.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestLess.%a: %C = bind_name a, %a.loc13_13.1 -// CHECK:STDOUT: %C.ref.loc13_22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc13_19.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestLess.%b: %C = bind_name b, %b.loc13_19.1 -// CHECK:STDOUT: %bool.make_type.loc13: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc13_28.1: type = value_of_initializer %bool.make_type.loc13 [template = bool] -// CHECK:STDOUT: %.loc13_28.2: type = converted %bool.make_type.loc13, %.loc13_28.1 [template = bool] -// CHECK:STDOUT: @TestLess.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc13_16: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc13_22: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc13_28.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc13_28.2: type = converted %bool.make_type, %.loc13_28.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestLessEqual.decl: %TestLessEqual.type = fn_decl @TestLessEqual [template = constants.%TestLessEqual] { -// CHECK:STDOUT: %C.ref.loc17_21: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc17_18.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestLessEqual.%a: %C = bind_name a, %a.loc17_18.1 -// CHECK:STDOUT: %C.ref.loc17_27: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc17_24.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestLessEqual.%b: %C = bind_name b, %b.loc17_24.1 -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_33.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_33.2: type = converted %bool.make_type.loc17, %.loc17_33.1 [template = bool] -// CHECK:STDOUT: @TestLessEqual.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc17_21: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc17_27: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_33.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_33.2: type = converted %bool.make_type, %.loc17_33.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestGreater.decl: %TestGreater.type = fn_decl @TestGreater [template = constants.%TestGreater] { -// CHECK:STDOUT: %C.ref.loc21_19: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc21_16.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestGreater.%a: %C = bind_name a, %a.loc21_16.1 -// CHECK:STDOUT: %C.ref.loc21_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc21_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestGreater.%b: %C = bind_name b, %b.loc21_22.1 -// CHECK:STDOUT: %bool.make_type.loc21: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc21_31.1: type = value_of_initializer %bool.make_type.loc21 [template = bool] -// CHECK:STDOUT: %.loc21_31.2: type = converted %bool.make_type.loc21, %.loc21_31.1 [template = bool] -// CHECK:STDOUT: @TestGreater.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc21_19: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc21_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc21_31.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc21_31.2: type = converted %bool.make_type, %.loc21_31.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestGreaterEqual.decl: %TestGreaterEqual.type = fn_decl @TestGreaterEqual [template = constants.%TestGreaterEqual] { -// CHECK:STDOUT: %C.ref.loc25_24: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc25_21.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestGreaterEqual.%a: %C = bind_name a, %a.loc25_21.1 -// CHECK:STDOUT: %C.ref.loc25_30: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc25_27.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestGreaterEqual.%b: %C = bind_name b, %b.loc25_27.1 -// CHECK:STDOUT: %bool.make_type.loc25: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc25_36.1: type = value_of_initializer %bool.make_type.loc25 [template = bool] -// CHECK:STDOUT: %.loc25_36.2: type = converted %bool.make_type.loc25, %.loc25_36.1 [template = bool] -// CHECK:STDOUT: @TestGreaterEqual.%return: ref bool = var +// CHECK:STDOUT: %C.ref.loc25_24: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc25_30: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc25_36.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc25_36.2: type = converted %bool.make_type, %.loc25_36.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -229,51 +229,51 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: impl @impl: %C as %.2 { // CHECK:STDOUT: %Less.decl: %Less.type.1 = fn_decl @Less.1 [template = constants.%Less.1] { // CHECK:STDOUT: %C.ref.loc7_17: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc7_11.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc7_11.2: %C = bind_name self, %self.loc7_11.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc7_27: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc7_20.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc7_20.2: %C = bind_name other, %other.loc7_20.1 -// CHECK:STDOUT: %bool.make_type.loc7: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc7_33.1: type = value_of_initializer %bool.make_type.loc7 [template = bool] -// CHECK:STDOUT: %.loc7_33.2: type = converted %bool.make_type.loc7, %.loc7_33.1 [template = bool] -// CHECK:STDOUT: %return.var.loc7: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc7_33.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc7_33.2: type = converted %bool.make_type, %.loc7_33.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %LessOrEquivalent.decl: %LessOrEquivalent.type.1 = fn_decl @LessOrEquivalent.1 [template = constants.%LessOrEquivalent.1] { // CHECK:STDOUT: %C.ref.loc8_29: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc8_23.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc8_23.2: %C = bind_name self, %self.loc8_23.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc8_39: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc8_32.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc8_32.2: %C = bind_name other, %other.loc8_32.1 -// CHECK:STDOUT: %bool.make_type.loc8: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc8_45.1: type = value_of_initializer %bool.make_type.loc8 [template = bool] -// CHECK:STDOUT: %.loc8_45.2: type = converted %bool.make_type.loc8, %.loc8_45.1 [template = bool] -// CHECK:STDOUT: %return.var.loc8: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc8_45.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc8_45.2: type = converted %bool.make_type, %.loc8_45.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %Greater.decl: %Greater.type.1 = fn_decl @Greater.1 [template = constants.%Greater.1] { // CHECK:STDOUT: %C.ref.loc9_20: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc9_14.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc9_14.2: %C = bind_name self, %self.loc9_14.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc9_30: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc9_23.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc9_23.2: %C = bind_name other, %other.loc9_23.1 -// CHECK:STDOUT: %bool.make_type.loc9: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc9_36.1: type = value_of_initializer %bool.make_type.loc9 [template = bool] -// CHECK:STDOUT: %.loc9_36.2: type = converted %bool.make_type.loc9, %.loc9_36.1 [template = bool] -// CHECK:STDOUT: %return.var.loc9: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc9_36.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc9_36.2: type = converted %bool.make_type, %.loc9_36.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %GreaterOrEquivalent.decl: %GreaterOrEquivalent.type.1 = fn_decl @GreaterOrEquivalent.1 [template = constants.%GreaterOrEquivalent.1] { // CHECK:STDOUT: %C.ref.loc10_32: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc10_26.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc10_26.2: %C = bind_name self, %self.loc10_26.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc10_42: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc10_35.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc10_35.2: %C = bind_name other, %other.loc10_35.1 -// CHECK:STDOUT: %bool.make_type.loc10: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc10_48.1: type = value_of_initializer %bool.make_type.loc10 [template = bool] -// CHECK:STDOUT: %.loc10_48.2: type = converted %bool.make_type.loc10, %.loc10_48.1 [template = bool] -// CHECK:STDOUT: %return.var.loc10: ref bool = var +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc10_48.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc10_48.2: type = converted %bool.make_type, %.loc10_48.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc6: = interface_witness (%Less.decl, %LessOrEquivalent.decl, %Greater.decl, %GreaterOrEquivalent.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -292,13 +292,13 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: // CHECK:STDOUT: fn @Bool() -> type = "bool.make_type"; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Less.1[@impl.%self.loc7_11.2: %C](@impl.%other.loc7_20.2: %C) -> bool; +// CHECK:STDOUT: fn @Less.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @LessOrEquivalent.1[@impl.%self.loc8_23.2: %C](@impl.%other.loc8_32.2: %C) -> bool; +// CHECK:STDOUT: fn @LessOrEquivalent.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @Greater.1[@impl.%self.loc9_14.2: %C](@impl.%other.loc9_23.2: %C) -> bool; +// CHECK:STDOUT: fn @Greater.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: -// CHECK:STDOUT: fn @GreaterOrEquivalent.1[@impl.%self.loc10_26.2: %C](@impl.%other.loc10_35.2: %C) -> bool; +// CHECK:STDOUT: fn @GreaterOrEquivalent.1[%self: %C](%other: %C) -> bool; // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Less.2(constants.%Self: %.2) { // CHECK:STDOUT: %Self: %.2 = bind_symbolic_name Self 0 [symbolic = %Self (constants.%Self)] @@ -487,52 +487,52 @@ fn TestGreaterEqual(a: D, b: D) -> bool { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %D.decl: type = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: %TestLess.decl: %TestLess.type = fn_decl @TestLess [template = constants.%TestLess] { -// CHECK:STDOUT: %D.ref.loc6_16: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc6_13.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestLess.%a: %D = bind_name a, %a.loc6_13.1 -// CHECK:STDOUT: %D.ref.loc6_22: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc6_19.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestLess.%b: %D = bind_name b, %b.loc6_19.1 -// CHECK:STDOUT: %bool.make_type.loc6: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc6_28.1: type = value_of_initializer %bool.make_type.loc6 [template = bool] -// CHECK:STDOUT: %.loc6_28.2: type = converted %bool.make_type.loc6, %.loc6_28.1 [template = bool] -// CHECK:STDOUT: @TestLess.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc6_16: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc6_22: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc6_28.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc6_28.2: type = converted %bool.make_type, %.loc6_28.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestLessEqual.decl: %TestLessEqual.type = fn_decl @TestLessEqual [template = constants.%TestLessEqual] { -// CHECK:STDOUT: %D.ref.loc14_21: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc14_18.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestLessEqual.%a: %D = bind_name a, %a.loc14_18.1 -// CHECK:STDOUT: %D.ref.loc14_27: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc14_24.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestLessEqual.%b: %D = bind_name b, %b.loc14_24.1 -// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_33.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] -// CHECK:STDOUT: %.loc14_33.2: type = converted %bool.make_type.loc14, %.loc14_33.1 [template = bool] -// CHECK:STDOUT: @TestLessEqual.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc14_21: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc14_27: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_33.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc14_33.2: type = converted %bool.make_type, %.loc14_33.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestGreater.decl: %TestGreater.type = fn_decl @TestGreater [template = constants.%TestGreater] { -// CHECK:STDOUT: %D.ref.loc22_19: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc22_16.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestGreater.%a: %D = bind_name a, %a.loc22_16.1 -// CHECK:STDOUT: %D.ref.loc22_25: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc22_22.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestGreater.%b: %D = bind_name b, %b.loc22_22.1 -// CHECK:STDOUT: %bool.make_type.loc22: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc22_31.1: type = value_of_initializer %bool.make_type.loc22 [template = bool] -// CHECK:STDOUT: %.loc22_31.2: type = converted %bool.make_type.loc22, %.loc22_31.1 [template = bool] -// CHECK:STDOUT: @TestGreater.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc22_19: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc22_25: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc22_31.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc22_31.2: type = converted %bool.make_type, %.loc22_31.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestGreaterEqual.decl: %TestGreaterEqual.type = fn_decl @TestGreaterEqual [template = constants.%TestGreaterEqual] { -// CHECK:STDOUT: %D.ref.loc30_24: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %a.loc30_21.1: %D = param a, runtime_param0 -// CHECK:STDOUT: @TestGreaterEqual.%a: %D = bind_name a, %a.loc30_21.1 -// CHECK:STDOUT: %D.ref.loc30_30: type = name_ref D, %D.decl [template = constants.%D] -// CHECK:STDOUT: %b.loc30_27.1: %D = param b, runtime_param1 -// CHECK:STDOUT: @TestGreaterEqual.%b: %D = bind_name b, %b.loc30_27.1 -// CHECK:STDOUT: %bool.make_type.loc30: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc30_36.1: type = value_of_initializer %bool.make_type.loc30 [template = bool] -// CHECK:STDOUT: %.loc30_36.2: type = converted %bool.make_type.loc30, %.loc30_36.1 [template = bool] -// CHECK:STDOUT: @TestGreaterEqual.%return: ref bool = var +// CHECK:STDOUT: %D.ref.loc30_24: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %a.param: %D = param a, runtime_param0 +// CHECK:STDOUT: %a: %D = bind_name a, %a.param +// CHECK:STDOUT: %D.ref.loc30_30: type = name_ref D, file.%D.decl [template = constants.%D] +// CHECK:STDOUT: %b.param: %D = param b, runtime_param1 +// CHECK:STDOUT: %b: %D = bind_name b, %b.param +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc30_36.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc30_36.2: type = converted %bool.make_type, %.loc30_36.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/overloaded/right_shift.carbon b/toolchain/check/testdata/operators/overloaded/right_shift.carbon index a73144294b7bd..f4038573f0ec1 100644 --- a/toolchain/check/testdata/operators/overloaded/right_shift.carbon +++ b/toolchain/check/testdata/operators/overloaded/right_shift.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/overloaded/sub.carbon b/toolchain/check/testdata/operators/overloaded/sub.carbon index 0b50361cf9acb..dc68be6194f7c 100644 --- a/toolchain/check/testdata/operators/overloaded/sub.carbon +++ b/toolchain/check/testdata/operators/overloaded/sub.carbon @@ -100,33 +100,33 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: impl_decl @impl.1 { -// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc17: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.1 [template = constants.%.2] // CHECK:STDOUT: } // CHECK:STDOUT: impl_decl @impl.2 { -// CHECK:STDOUT: %C.ref.loc22: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %Core.ref.loc22: = name_ref Core, imports.%Core [template = imports.%Core] +// 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.5 [template = constants.%.6] // CHECK:STDOUT: } // CHECK:STDOUT: %TestOp.decl: %TestOp.type = fn_decl @TestOp [template = constants.%TestOp] { -// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %a.loc26_11.1: %C = param a, runtime_param0 -// CHECK:STDOUT: @TestOp.%a: %C = bind_name a, %a.loc26_11.1 -// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc26_17.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestOp.%b: %C = bind_name b, %b.loc26_17.1 -// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @TestOp.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc26_14: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %a.param: %C = param a, runtime_param0 +// CHECK:STDOUT: %a: %C = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc26_20: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param +// CHECK:STDOUT: %C.ref.loc26_26: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %TestAssign.decl: %TestAssign.type = fn_decl @TestAssign [template = constants.%TestAssign] { -// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc30_18: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc30: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %a.loc30_15.1: %.7 = param a, runtime_param0 -// CHECK:STDOUT: @TestAssign.%a: %.7 = bind_name a, %a.loc30_15.1 -// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: %b.loc30_22.1: %C = param b, runtime_param1 -// CHECK:STDOUT: @TestAssign.%b: %C = bind_name b, %b.loc30_22.1 +// CHECK:STDOUT: %a.param: %.7 = param a, runtime_param0 +// CHECK:STDOUT: %a: %.7 = bind_name a, %a.param +// CHECK:STDOUT: %C.ref.loc30_25: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %b.param: %C = param b, runtime_param1 +// CHECK:STDOUT: %b: %C = bind_name b, %b.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -147,13 +147,13 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: impl @impl.1: %C as %.2 { // CHECK:STDOUT: %Op.decl: %Op.type.1 = fn_decl @Op.1 [template = constants.%Op.1] { // CHECK:STDOUT: %C.ref.loc18_15: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %self.loc18_9.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc18_9.2: %C = bind_name self, %self.loc18_9.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: %C.ref.loc18_25: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc18_18.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc18_18.2: %C = bind_name other, %other.loc18_18.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: %C.ref.loc18_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc17: = interface_witness (%Op.decl) [template = constants.%.4] // CHECK:STDOUT: @@ -166,12 +166,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: %Op.decl: %Op.type.3 = fn_decl @Op.3 [template = constants.%Op.3] { // CHECK:STDOUT: %C.ref.loc23_20: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_21: type = ptr_type %C [template = constants.%.7] -// CHECK:STDOUT: %self.loc23_14.1: %.7 = param self, runtime_param0 -// CHECK:STDOUT: %self.loc23_14.3: %.7 = bind_name self, %self.loc23_14.1 -// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self.loc23_14.3 +// CHECK:STDOUT: %self.param: %.7 = param self, runtime_param0 +// CHECK:STDOUT: %self: %.7 = bind_name self, %self.param +// CHECK:STDOUT: %.loc23_9: %.7 = addr_pattern %self // CHECK:STDOUT: %C.ref.loc23_31: type = name_ref C, file.%C.decl [template = constants.%C] -// CHECK:STDOUT: %other.loc23_24.1: %C = param other, runtime_param1 -// CHECK:STDOUT: %other.loc23_24.2: %C = bind_name other, %other.loc23_24.1 +// CHECK:STDOUT: %other.param: %C = param other, runtime_param1 +// CHECK:STDOUT: %other: %C = bind_name other, %other.param // CHECK:STDOUT: } // CHECK:STDOUT: %.loc22: = interface_witness (%Op.decl) [template = constants.%.9] // CHECK:STDOUT: @@ -185,12 +185,12 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: .Self = constants.%C // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.1[@impl.1.%self.loc18_9.2: %C](@impl.1.%other.loc18_18.2: %C) -> @impl.1.%return.var: %C { +// CHECK:STDOUT: fn @Op.1[%self: %C](%other: %C) -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc19_13.1: %.1 = struct_literal () -// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), @impl.1.%return.var [template = constants.%struct] +// CHECK:STDOUT: %.loc19_13.2: init %C = class_init (), %return [template = constants.%struct] // CHECK:STDOUT: %.loc19_14: init %C = converted %.loc19_13.1, %.loc19_13.2 [template = constants.%struct] -// CHECK:STDOUT: return %.loc19_14 to @impl.1.%return.var +// CHECK:STDOUT: return %.loc19_14 to %return // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: generic fn @Op.2(constants.%Self.1: %.2) { @@ -199,7 +199,7 @@ fn TestAssign(a: C*, b: C) { // CHECK:STDOUT: fn[%self: @Op.2.%Self (%Self.1)](%other: @Op.2.%Self (%Self.1)) -> @Op.2.%Self (%Self.1); // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Op.3[addr @impl.2.%self.loc23_14.3: %.7](@impl.2.%other.loc23_24.2: %C) { +// CHECK:STDOUT: fn @Op.3[addr %self: %.7](%other: %C) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // 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 fe950e7dbbdc8..6044f3b375b3e 100644 --- a/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon +++ b/toolchain/check/testdata/packages/no_prelude/cross_package_import.carbon @@ -270,8 +270,8 @@ fn UseF() { Other.F(); } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %.loc4_10.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc4_10.2: type = converted %.loc4_10.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %x.loc4_6.1: %.1 = param x, runtime_param0 -// CHECK:STDOUT: @F.%x: %.1 = bind_name x, %x.loc4_6.1 +// CHECK:STDOUT: %x.param: %.1 = param x, runtime_param0 +// CHECK:STDOUT: %x: %.1 = bind_name x, %x.param // CHECK:STDOUT: } // 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 5aa7aad5106a9..d5f14a8206917 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 @@ -47,33 +47,33 @@ export C2(T:! type); // CHECK:STDOUT: .C2 = %C2.decl // CHECK:STDOUT: } // CHECK:STDOUT: %C1.decl: %C1.type = class_decl @C1 [template = constants.%C1.1] { -// CHECK:STDOUT: %T.loc4_10.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc4_10.2: type = bind_symbolic_name T 0, %T.loc4_10.1 [symbolic = @C1.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc4: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: %C2.decl: %C2.type = class_decl @C2 [template = constants.%C2.1] { -// CHECK:STDOUT: %T.loc5_10.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc5_10.2: type = bind_symbolic_name T 0, %T.loc5_10.1 [symbolic = @C2.%T (constants.%T)] +// CHECK:STDOUT: %T.param: type = param T, runtime_param +// CHECK:STDOUT: %T.loc5: type = bind_symbolic_name T 0, %T.param [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C1(file.%T.loc4_10.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C1(%T.loc4: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C2(file.%T.loc5_10.2: type) { -// CHECK:STDOUT: %T: type = bind_symbolic_name T 0 [symbolic = %T (constants.%T)] +// CHECK:STDOUT: generic class @C2(%T.loc5: type) { +// CHECK:STDOUT: %T.1: type = bind_symbolic_name T 0 [symbolic = %T.1 (constants.%T)] // CHECK:STDOUT: // CHECK:STDOUT: class; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C1(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C2(constants.%T) { -// CHECK:STDOUT: %T => constants.%T +// CHECK:STDOUT: %T.1 => constants.%T // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- fail_b.carbon @@ -101,8 +101,8 @@ export C2(T:! type); // CHECK:STDOUT: } // CHECK:STDOUT: %default.import = import // CHECK:STDOUT: %C1: %C1.type = export C1, imports.%import_ref.1 [template = constants.%C1.1] -// CHECK:STDOUT: %T.loc11_11.1: type = param T, runtime_param -// CHECK:STDOUT: %T.loc11_11.2: type = bind_symbolic_name T 0, %T.loc11_11.1 [symbolic = constants.%T] +// CHECK:STDOUT: %T.param: type = param T, 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.2 [template = constants.%C2.1] // CHECK:STDOUT: } // 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 4895970356732..33a7968323aef 100644 --- a/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/no_prelude/missing_prelude.carbon @@ -136,7 +136,7 @@ var n: {} = i32; // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { // CHECK:STDOUT: %.loc4_16.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc4_16.2: type = converted %.loc4_16.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @Int32.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -203,7 +203,7 @@ var n: {} = i32; // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { // CHECK:STDOUT: %.loc8_16.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc8_16.2: type = converted %.loc8_16.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @Int32.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_9.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.1 [template = constants.%.1] @@ -247,7 +247,7 @@ var n: {} = i32; // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { // CHECK:STDOUT: %.loc7_21.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc7_21.2: type = converted %.loc7_21.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @Int32.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: %.loc9_9.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc9_9.2: type = converted %.loc9_9.1, constants.%.1 [template = constants.%.1] @@ -297,7 +297,7 @@ var n: {} = i32; // CHECK:STDOUT: %Int32.decl: %Int32.type = fn_decl @Int32 [template = constants.%Int32] { // CHECK:STDOUT: %.loc6_18.1: %.1 = struct_literal () // CHECK:STDOUT: %.loc6_18.2: type = converted %.loc6_18.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: %return.var: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 99f6cf01f48b1..8470e005b66e8 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -47,10 +47,10 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -58,9 +58,9 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32, %.loc12_10.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_10.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_10.2: type = converted %int.make_type_32.loc12, %.loc12_10.1 [template = i32] // CHECK:STDOUT: %n.var: ref i32 = var n // CHECK:STDOUT: %n: ref i32 = bind_name n, %n.var // CHECK:STDOUT: %.loc12_16: i32 = int_literal 0 [template = constants.%.2] diff --git a/toolchain/check/testdata/pointer/arrow.carbon b/toolchain/check/testdata/pointer/arrow.carbon index dd8fe0b8978f2..af4a1d29f3dba 100644 --- a/toolchain/check/testdata/pointer/arrow.carbon +++ b/toolchain/check/testdata/pointer/arrow.carbon @@ -60,18 +60,18 @@ fn Foo(ptr: C*) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %Foo.decl: %Foo.type = fn_decl @Foo [template = constants.%Foo] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc16: type = ptr_type %C [template = constants.%.2] -// CHECK:STDOUT: %ptr.loc16_8.1: %.2 = param ptr, runtime_param0 -// CHECK:STDOUT: @Foo.%ptr: %.2 = bind_name ptr, %ptr.loc16_8.1 +// CHECK:STDOUT: %ptr.param: %.2 = param ptr, runtime_param0 +// CHECK:STDOUT: %ptr: %.2 = bind_name ptr, %ptr.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { // CHECK:STDOUT: %Member.decl: %Member.type = fn_decl @Member [template = constants.%Member] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %self.loc12_13.1: %C = param self, runtime_param0 -// CHECK:STDOUT: %self.loc12_13.2: %C = bind_name self, %self.loc12_13.1 +// CHECK:STDOUT: %self.param: %C = param self, runtime_param0 +// CHECK:STDOUT: %self: %C = bind_name self, %self.param // CHECK:STDOUT: } // CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %.loc13_15: type = ptr_type %C [template = constants.%.2] @@ -83,7 +83,7 @@ fn Foo(ptr: C*) { // CHECK:STDOUT: .field = %.loc13_12 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @Member[@C.%self.loc12_13.2: %C](); +// CHECK:STDOUT: fn @Member[%self: %C](); // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%ptr: %.2) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index c3e69918762b5..daa486f846d89 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -49,10 +49,10 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 cb3e278f95747..77422f2ddd50c 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -172,17 +172,17 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_16.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_16.2: type = converted %int.make_type_32.loc13, %.loc13_16.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_16.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_16.2: type = converted %int.make_type_32, %.loc13_16.1 [template = i32] // CHECK:STDOUT: %.loc13_19: type = struct_type {.a: i32} [template = constants.%.2] -// CHECK:STDOUT: @H.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: %AddressOfLiteral.decl: %AddressOfLiteral.type = fn_decl @AddressOfLiteral [template = constants.%AddressOfLiteral] {} // CHECK:STDOUT: %AddressOfOperator.decl: %AddressOfOperator.type = fn_decl @AddressOfOperator [template = constants.%AddressOfOperator] {} @@ -193,8 +193,8 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: %int.make_type_32.loc95: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc95_26.1: type = value_of_initializer %int.make_type_32.loc95 [template = i32] // CHECK:STDOUT: %.loc95_26.2: type = converted %int.make_type_32.loc95, %.loc95_26.1 [template = i32] -// CHECK:STDOUT: %param.loc95_19.1: i32 = param param, runtime_param0 -// CHECK:STDOUT: @AddressOfParam.%param: i32 = bind_name param, %param.loc95_19.1 +// CHECK:STDOUT: %param.param: i32 = param param, runtime_param0 +// CHECK:STDOUT: %param: i32 = bind_name param, %param.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -285,9 +285,9 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: // CHECK:STDOUT: fn @AddressOfParam(%param: i32) { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc99_22.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc99_22.2: type = converted %int.make_type_32, %.loc99_22.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc99: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc99_22.1: type = value_of_initializer %int.make_type_32.loc99 [template = i32] +// CHECK:STDOUT: %.loc99_22.2: type = converted %int.make_type_32.loc99, %.loc99_22.1 [template = i32] // CHECK:STDOUT: %.loc99_22.3: type = ptr_type i32 [template = constants.%.4] // CHECK:STDOUT: %param_addr.var: ref %.4 = var param_addr // CHECK:STDOUT: %param_addr: ref %.4 = bind_name param_addr, %param_addr.var diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index cc7f660a63914..9fea3eafe79d6 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -78,8 +78,8 @@ fn Deref(n: i32) { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_13.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_13.2: type = converted %int.make_type_32, %.loc11_13.1 [template = i32] -// CHECK:STDOUT: %n.loc11_10.1: i32 = param n, runtime_param0 -// CHECK:STDOUT: @Deref.%n: i32 = bind_name n, %n.loc11_10.1 +// CHECK:STDOUT: %n.param: i32 = param n, runtime_param0 +// CHECK:STDOUT: %n: i32 = bind_name n, %n.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 0bd1b16abb54b..d89dc6ff05d06 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -78,13 +78,13 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: %.loc11_21.1: type = converted %.loc11_28, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc11_21.2: type = const_type %.1 [template = constants.%.2] // CHECK:STDOUT: %.loc11_29: type = ptr_type %.2 [template = constants.%.3] -// CHECK:STDOUT: %p.loc11_18.1: %.3 = param p, runtime_param0 -// CHECK:STDOUT: @ConstMismatch.%p: %.3 = bind_name p, %p.loc11_18.1 +// CHECK:STDOUT: %p.param: %.3 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.3 = bind_name p, %p.param // CHECK:STDOUT: %.loc11_43: %.1 = struct_literal () // CHECK:STDOUT: %.loc11_44.1: type = converted %.loc11_43, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc11_44.2: type = ptr_type %.1 [template = constants.%.4] // CHECK:STDOUT: %.loc11_35: type = const_type %.4 [template = constants.%.5] -// CHECK:STDOUT: @ConstMismatch.%return: ref %.5 = var +// CHECK:STDOUT: %return: ref %.5 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index 8c3884a20d8a5..560256dc26f9b 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -58,13 +58,13 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: %.loc12_16: type = const_type %.3 [template = constants.%.4] // CHECK:STDOUT: %.loc12_34: type = ptr_type %.4 [template = constants.%.5] // CHECK:STDOUT: %.loc12_9: type = const_type %.5 [template = constants.%.6] -// CHECK:STDOUT: %p.loc12_6.1: %.6 = param p, runtime_param0 -// CHECK:STDOUT: @F.%p: %.6 = bind_name p, %p.loc12_6.1 +// CHECK:STDOUT: %p.param: %.6 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.6 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc12_47: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc12_41.1: type = value_of_initializer %int.make_type_32.loc12_47 [template = i32] // CHECK:STDOUT: %.loc12_41.2: type = converted %int.make_type_32.loc12_47, %.loc12_41.1 [template = i32] // CHECK:STDOUT: %.loc12_41.3: type = const_type i32 [template = constants.%.2] -// CHECK:STDOUT: @F.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index f74223cce039c..895c248c0dff6 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -58,13 +58,13 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32.loc11_11 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32.loc11_11, %.loc11_14.1 [template = i32] // CHECK:STDOUT: %.loc11_14.3: type = ptr_type i32 [template = constants.%.2] -// CHECK:STDOUT: %p.loc11_8.1: %.2 = param p, runtime_param0 -// CHECK:STDOUT: @Ptr.%p: %.2 = bind_name p, %p.loc11_8.1 +// CHECK:STDOUT: %p.param: %.2 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.2 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc11_20: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_23.1: type = value_of_initializer %int.make_type_32.loc11_20 [template = i32] // CHECK:STDOUT: %.loc11_23.2: type = converted %int.make_type_32.loc11_20, %.loc11_23.1 [template = i32] // CHECK:STDOUT: %.loc11_23.3: type = ptr_type i32 [template = constants.%.2] -// CHECK:STDOUT: @Ptr.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: %ConstPtr.decl: %ConstPtr.type = fn_decl @ConstPtr [template = constants.%ConstPtr] { // CHECK:STDOUT: %int.make_type_32.loc15_22: init type = call constants.%Int32() [template = i32] @@ -72,14 +72,14 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %.loc15_16.2: type = converted %int.make_type_32.loc15_22, %.loc15_16.1 [template = i32] // CHECK:STDOUT: %.loc15_16.3: type = const_type i32 [template = constants.%.3] // CHECK:STDOUT: %.loc15_25: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: %p.loc15_13.1: %.4 = param p, runtime_param0 -// CHECK:STDOUT: @ConstPtr.%p: %.4 = bind_name p, %p.loc15_13.1 +// CHECK:STDOUT: %p.param: %.4 = param p, runtime_param0 +// CHECK:STDOUT: %p: %.4 = bind_name p, %p.param // CHECK:STDOUT: %int.make_type_32.loc15_38: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc15_32.1: type = value_of_initializer %int.make_type_32.loc15_38 [template = i32] // CHECK:STDOUT: %.loc15_32.2: type = converted %int.make_type_32.loc15_38, %.loc15_32.1 [template = i32] // CHECK:STDOUT: %.loc15_32.3: type = const_type i32 [template = constants.%.3] // CHECK:STDOUT: %.loc15_42: type = ptr_type %.3 [template = constants.%.4] -// CHECK:STDOUT: @ConstPtr.%return: ref %.4 = var +// CHECK:STDOUT: %return: ref %.4 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 2507244dbfaff..e34afde4a07f0 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -64,12 +64,12 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_9.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_9.2: type = converted %bool.make_type, %.loc11_9.1 [template = bool] -// CHECK:STDOUT: %b.loc11_6.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc11_6.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_18.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_18.2: type = converted %int.make_type_32, %.loc11_18.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 8ae46614a0172..d8436c17393da 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -52,14 +52,14 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %ReturnType.decl: %ReturnType.type = fn_decl @ReturnType [template = constants.%ReturnType] { -// CHECK:STDOUT: @ReturnType.%return: ref type = var +// CHECK:STDOUT: %return: ref type = var // CHECK:STDOUT: } // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [template = constants.%Six] { -// CHECK:STDOUT: %ReturnType.ref: %ReturnType.type = name_ref ReturnType, %ReturnType.decl [template = constants.%ReturnType] +// CHECK:STDOUT: %ReturnType.ref: %ReturnType.type = name_ref ReturnType, file.%ReturnType.decl [template = constants.%ReturnType] // CHECK:STDOUT: %ReturnType.call: init type = call %ReturnType.ref() // CHECK:STDOUT: %.loc17_24.1: type = value_of_initializer %ReturnType.call // CHECK:STDOUT: %.loc17_24.2: type = converted %ReturnType.call, %.loc17_24.1 -// CHECK:STDOUT: @Six.%return: ref = var +// CHECK:STDOUT: %return: ref = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -75,7 +75,7 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: // CHECK:STDOUT: fn @Six() -> { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc17: i32 = int_literal 6 [template = constants.%.2] +// CHECK:STDOUT: %.loc17_35: i32 = int_literal 6 [template = constants.%.2] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index 0c15bfbc81c13..96fbae73a9da4 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -42,7 +42,7 @@ fn Six() -> x; // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [template = constants.%Six] { // CHECK:STDOUT: %x.ref: = name_ref x, [template = ] -// CHECK:STDOUT: @Six.%return: ref = var +// CHECK:STDOUT: %return: ref = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 6d89af63a1071..7d59a4bd80db0 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -49,7 +49,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index 1358fb210e321..6ec61a5e04fae 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -44,7 +44,7 @@ fn F() -> () { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %.loc11_12.1: %.1 = tuple_literal () // CHECK:STDOUT: %.loc11_12.2: type = converted %.loc11_12.1, constants.%.1 [template = constants.%.1] -// CHECK:STDOUT: @F.%return: ref %.1 = var +// CHECK:STDOUT: %return: ref %.1 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 029b7becb8712..ab749ae0e4a71 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 @@ -50,7 +50,7 @@ fn Procedure() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: @Procedure.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 3ef08d9b61e4e..ecdc6c2bd0f6d 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -76,15 +76,15 @@ fn G() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32, %.loc11_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] +// CHECK:STDOUT: %.loc11_11.2: type = converted %int.make_type_32.loc11, %.loc11_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @G.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc24: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -108,9 +108,9 @@ fn G() -> C { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc12_19.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc12_19.2: type = converted %int.make_type_32, %.loc12_19.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc12: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc12_19.1: type = value_of_initializer %int.make_type_32.loc12 [template = i32] +// CHECK:STDOUT: %.loc12_19.2: type = converted %int.make_type_32.loc12, %.loc12_19.1 [template = i32] // CHECK:STDOUT: %v.var: ref i32 = var v // CHECK:STDOUT: %v: ref i32 = bind_name v, %v.var // CHECK:STDOUT: %.loc12_25: i32 = int_literal 0 [template = constants.%.2] @@ -121,7 +121,7 @@ fn G() -> C { // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %return: %C { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc25: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %c: ref %C = bind_name c, %return // CHECK:STDOUT: %.loc25_29: i32 = int_literal 1 [template = constants.%.3] // CHECK:STDOUT: %.loc25_37: i32 = int_literal 2 [template = constants.%.7] diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index 2e69a6712f1a7..3119ea8382af8 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -80,13 +80,13 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32.loc11, %.loc11_19.1 [template = i32] -// CHECK:STDOUT: @SameScope.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %DifferentScopes.decl: %DifferentScopes.type = fn_decl @DifferentScopes [template = constants.%DifferentScopes] { // CHECK:STDOUT: %int.make_type_32.loc26: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc26_25.1: type = value_of_initializer %int.make_type_32.loc26 [template = i32] // CHECK:STDOUT: %.loc26_25.2: type = converted %int.make_type_32.loc26, %.loc26_25.1 [template = i32] -// CHECK:STDOUT: @DifferentScopes.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 5a2a064b98143..fdfbaef6f4c28 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -60,7 +60,7 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_18.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_18.2: type = converted %int.make_type_32, %.loc11_18.1 [template = i32] -// CHECK:STDOUT: @Mismatch.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 025261fb2bb15..ba11d4f7cf31b 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -77,7 +77,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 54b4037d9903c..079c0654f60a3 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -53,7 +53,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 a33e06624fa15..b3fd39704de44 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -50,9 +50,9 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [template = constants.%Six] { -// CHECK:STDOUT: %x.ref: ref type = name_ref x, %x -// CHECK:STDOUT: %.loc15: type = bind_value %x.ref -// CHECK:STDOUT: @Six.%return: ref = var +// CHECK:STDOUT: %x.ref: ref type = name_ref x, file.%x +// CHECK:STDOUT: %.loc15_13: type = bind_value %x.ref +// CHECK:STDOUT: %return: ref = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -60,7 +60,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: // CHECK:STDOUT: fn @Six() -> { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %.loc15: i32 = int_literal 6 [template = constants.%.2] +// CHECK:STDOUT: %.loc15_24: i32 = int_literal 6 [template = constants.%.2] // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 1752f369c1bcc..1958ed9dd55a7 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -68,14 +68,14 @@ fn G() -> i32 { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %C.decl: type = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] -// CHECK:STDOUT: @F.%return: ref %C = var +// CHECK:STDOUT: %C.ref.loc16: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc21_11.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc21_11.2: type = converted %int.make_type_32, %.loc21_11.1 [template = i32] -// CHECK:STDOUT: @G.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc21_11.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] +// CHECK:STDOUT: %.loc21_11.2: type = converted %int.make_type_32.loc21, %.loc21_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -99,7 +99,7 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: %C { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C.decl [template = constants.%C] +// CHECK:STDOUT: %C.ref.loc17: type = name_ref C, file.%C.decl [template = constants.%C] // CHECK:STDOUT: %result: ref %C = bind_name result, %return // CHECK:STDOUT: %.loc17_34: i32 = int_literal 1 [template = constants.%.5] // CHECK:STDOUT: %.loc17_42: i32 = int_literal 2 [template = constants.%.6] @@ -116,9 +116,9 @@ fn G() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc22_24.1: type = value_of_initializer %int.make_type_32 [template = i32] -// CHECK:STDOUT: %.loc22_24.2: type = converted %int.make_type_32, %.loc22_24.1 [template = i32] +// CHECK:STDOUT: %int.make_type_32.loc22: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc22_24.1: type = value_of_initializer %int.make_type_32.loc22 [template = i32] +// CHECK:STDOUT: %.loc22_24.2: type = converted %int.make_type_32.loc22, %.loc22_24.1 [template = i32] // CHECK:STDOUT: %result.var: ref i32 = var result // CHECK:STDOUT: %result: ref i32 = bind_name result, %result.var // CHECK:STDOUT: %.loc22_30: i32 = int_literal 0 [template = constants.%.7] diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 990cd43d79195..f74438fe995da 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -72,18 +72,18 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_25.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] // CHECK:STDOUT: %.loc11_25.2: type = converted %int.make_type_32.loc11, %.loc11_25.1 [template = i32] -// CHECK:STDOUT: @UnrelatedScopes.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %EnclosingButAfter.decl: %EnclosingButAfter.type = fn_decl @EnclosingButAfter [template = constants.%EnclosingButAfter] { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc21_25.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc21_25.2: type = converted %bool.make_type, %.loc21_25.1 [template = bool] -// CHECK:STDOUT: %b.loc21_22.1: bool = param b, runtime_param0 -// CHECK:STDOUT: @EnclosingButAfter.%b: bool = bind_name b, %b.loc21_22.1 +// CHECK:STDOUT: %b.param: bool = param b, runtime_param0 +// CHECK:STDOUT: %b: bool = bind_name b, %b.param // CHECK:STDOUT: %int.make_type_32.loc21: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc21_34.1: type = value_of_initializer %int.make_type_32.loc21 [template = i32] // CHECK:STDOUT: %.loc21_34.2: type = converted %int.make_type_32.loc21, %.loc21_34.1 [template = i32] -// CHECK:STDOUT: @EnclosingButAfter.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index a9a27c0d3683b..85dcf8d329df2 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -51,7 +51,7 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: %.loc11_19.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_19.2: type = converted %int.make_type_32, %.loc11_19.1 [template = i32] // CHECK:STDOUT: %.loc11_22: type = struct_type {.a: i32} [template = constants.%.2] -// CHECK:STDOUT: @Main.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index 2a65592029e3d..790b2973873ac 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -59,7 +59,7 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: %.loc12_23.4: type = value_of_initializer %int.make_type_32.loc12_20 [template = i32] // CHECK:STDOUT: %.loc12_23.5: type = converted %int.make_type_32.loc12_20, %.loc12_23.4 [template = i32] // CHECK:STDOUT: %.loc12_23.6: type = converted %.loc12_23.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @Main.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index 245b165072207..994923a3da056 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -48,7 +48,7 @@ fn Main() -> i32 { // CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %int.make_type_32 [template = i32] // CHECK:STDOUT: %.loc11_14.2: type = converted %int.make_type_32, %.loc11_14.1 [template = i32] -// CHECK:STDOUT: @Main.%return: ref i32 = var +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index a64a60896eb87..ccb297eac86d8 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -110,7 +110,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %int.make_type_32.loc18_56: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc18_56.1: type = value_of_initializer %int.make_type_32.loc18_56 [template = i32] // CHECK:STDOUT: %.loc18_56.2: type = converted %int.make_type_32.loc18_56, %.loc18_56.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref = var +// CHECK:STDOUT: %return: ref = var // CHECK:STDOUT: } // CHECK:STDOUT: %int.make_type_32.loc27_13: init type = call constants.%Int32() [template = i32] // CHECK:STDOUT: %.loc27_13.1: type = value_of_initializer %int.make_type_32.loc27_13 [template = i32] diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index d9ae6585e4a0e..03213b4491103 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -140,23 +140,23 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: %.loc8_27.1: type = value_of_initializer %int.make_type_32.loc8_27 [template = i32] // CHECK:STDOUT: %.loc8_27.2: type = converted %int.make_type_32.loc8_27, %.loc8_27.1 [template = i32] // CHECK:STDOUT: %.loc8_30: type = struct_type {.a: i32, .b: i32} [template = constants.%.11] -// CHECK:STDOUT: %S.loc8_9.1: %.11 = param S, runtime_param -// CHECK:STDOUT: %S.loc8_9.2: %.11 = bind_symbolic_name S 0, %S.loc8_9.1 [symbolic = @C.%S (constants.%S)] +// CHECK:STDOUT: %S.param: %.11 = param S, runtime_param +// CHECK:STDOUT: %S.loc8: %.11 = bind_symbolic_name S 0, %S.param [symbolic = %S.1 (constants.%S)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc9_19: i32 = int_literal 1 [template = constants.%.13] // CHECK:STDOUT: %.loc9_27: i32 = int_literal 2 [template = constants.%.14] // CHECK:STDOUT: %.loc9_28: %.11 = struct_literal (%.loc9_19, %.loc9_27) // CHECK:STDOUT: %struct: %.11 = struct_value (%.loc9_19, %.loc9_27) [template = constants.%struct.4] // CHECK:STDOUT: %.loc9_12: %.11 = converted %.loc9_28, %struct [template = constants.%struct.4] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%struct.4) [template = constants.%C.3] -// CHECK:STDOUT: @F.%return: ref %C.3 = var +// CHECK:STDOUT: %return: ref %C.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%S.loc8_9.2: %.11) { -// CHECK:STDOUT: %S: %.11 = bind_symbolic_name S 0 [symbolic = %S (constants.%S)] +// CHECK:STDOUT: generic class @C(%S.loc8: %.11) { +// CHECK:STDOUT: %S.1: %.11 = bind_symbolic_name S 0 [symbolic = %S.1 (constants.%S)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -201,11 +201,11 @@ var c_bad: C({.a = 3, .b = 4}) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%S) { -// CHECK:STDOUT: %S => constants.%S +// CHECK:STDOUT: %S.1 => constants.%S // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%struct.4) { -// CHECK:STDOUT: %S => constants.%struct.4 +// CHECK:STDOUT: %S.1 => constants.%struct.4 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index 194cf83b8f361..6b3dbce1eb6de 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -66,13 +66,13 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc11_34.1: type = value_of_initializer %int.make_type_32.loc11_34 [template = i32] // CHECK:STDOUT: %.loc11_34.2: type = converted %int.make_type_32.loc11_34, %.loc11_34.1 [template = i32] // CHECK:STDOUT: %.loc11_37: type = struct_type {.x: i32, .y: i32, .z: i32} [template = constants.%.2] -// CHECK:STDOUT: @G.%return: ref %.2 = var +// CHECK:STDOUT: %return: ref %.2 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32.loc13, %.loc13_11.1 [template = i32] -// CHECK:STDOUT: @F.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_11.2: type = converted %int.make_type_32, %.loc13_11.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 abc350d407a5e..620ad66a987a2 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -66,7 +66,7 @@ fn G() { // CHECK:STDOUT: %.loc11_25.6: type = value_of_initializer %int.make_type_32.loc11_22 [template = i32] // CHECK:STDOUT: %.loc11_25.7: type = converted %int.make_type_32.loc11_22, %.loc11_25.6 [template = i32] // CHECK:STDOUT: %.loc11_25.8: type = converted %.loc11_25.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index 04762e5d6ea0e..7bc727b450961 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -64,17 +64,17 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %MakeI32.decl: %MakeI32.type = fn_decl @MakeI32 [template = constants.%MakeI32] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_17.1: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_17.2: type = converted %int.make_type_32.loc11, %.loc11_17.1 [template = i32] -// CHECK:STDOUT: @MakeI32.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_17.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_17.2: type = converted %int.make_type_32, %.loc11_17.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: %MakeF64.decl: %MakeF64.type = fn_decl @MakeF64 [template = constants.%MakeF64] { // CHECK:STDOUT: %.loc12_17.1: i32 = int_literal 64 [template = constants.%.2] -// CHECK:STDOUT: %float.make_type.loc12: init type = call constants.%Float(%.loc12_17.1) [template = f64] -// CHECK:STDOUT: %.loc12_17.2: type = value_of_initializer %float.make_type.loc12 [template = f64] -// CHECK:STDOUT: %.loc12_17.3: type = converted %float.make_type.loc12, %.loc12_17.2 [template = f64] -// CHECK:STDOUT: @MakeF64.%return: ref f64 = var +// CHECK:STDOUT: %float.make_type: init type = call constants.%Float(%.loc12_17.1) [template = f64] +// CHECK:STDOUT: %.loc12_17.2: type = value_of_initializer %float.make_type [template = f64] +// CHECK:STDOUT: %.loc12_17.3: type = converted %float.make_type, %.loc12_17.2 [template = f64] +// CHECK:STDOUT: %return: ref f64 = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %int.make_type_32.loc14: init type = call constants.%Int32() [template = i32] @@ -85,7 +85,7 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: %.loc14_25.2: type = value_of_initializer %float.make_type.loc14 [template = f64] // CHECK:STDOUT: %.loc14_25.3: type = converted %float.make_type.loc14, %.loc14_25.2 [template = f64] // CHECK:STDOUT: %.loc14_28: type = struct_type {.a: i32, .b: f64} [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // 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 20e93502e0e12..db7fb6cd58c6e 100644 --- a/toolchain/check/testdata/tuple/access/return_value_access.carbon +++ b/toolchain/check/testdata/tuple/access/return_value_access.carbon @@ -53,18 +53,18 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %int.make_type_32.loc11: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc11_16.1: %.2 = tuple_literal (%int.make_type_32.loc11) -// CHECK:STDOUT: %.loc11_16.2: type = value_of_initializer %int.make_type_32.loc11 [template = i32] -// CHECK:STDOUT: %.loc11_16.3: type = converted %int.make_type_32.loc11, %.loc11_16.2 [template = i32] +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc11_16.1: %.2 = tuple_literal (%int.make_type_32) +// CHECK:STDOUT: %.loc11_16.2: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc11_16.3: type = converted %int.make_type_32, %.loc11_16.2 [template = i32] // CHECK:STDOUT: %.loc11_16.4: type = converted %.loc11_16.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %Run.decl: %Run.type = fn_decl @Run [template = constants.%Run] { -// CHECK:STDOUT: %int.make_type_32.loc13: init type = call constants.%Int32() [template = i32] -// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32.loc13 [template = i32] -// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32.loc13, %.loc13_13.1 [template = i32] -// CHECK:STDOUT: @Run.%return: ref i32 = var +// CHECK:STDOUT: %int.make_type_32: init type = call constants.%Int32() [template = i32] +// CHECK:STDOUT: %.loc13_13.1: type = value_of_initializer %int.make_type_32 [template = i32] +// CHECK:STDOUT: %.loc13_13.2: type = converted %int.make_type_32, %.loc13_13.1 [template = i32] +// CHECK:STDOUT: %return: ref i32 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuple/import.carbon b/toolchain/check/testdata/tuple/import.carbon index 575e799dd6dd6..9a6f4421d1453 100644 --- a/toolchain/check/testdata/tuple/import.carbon +++ b/toolchain/check/testdata/tuple/import.carbon @@ -154,23 +154,23 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: %.loc7_22.4: type = value_of_initializer %int.make_type_32.loc7_19 [template = i32] // CHECK:STDOUT: %.loc7_22.5: type = converted %int.make_type_32.loc7_19, %.loc7_22.4 [template = i32] // CHECK:STDOUT: %.loc7_22.6: type = converted %.loc7_22.1, constants.%.9 [template = constants.%.9] -// CHECK:STDOUT: %X.loc7_9.1: %.9 = param X, runtime_param -// CHECK:STDOUT: %X.loc7_9.2: %.9 = bind_symbolic_name X 0, %X.loc7_9.1 [symbolic = @C.%X (constants.%X)] +// CHECK:STDOUT: %X.param: %.9 = param X, runtime_param +// CHECK:STDOUT: %X.loc7: %.9 = bind_symbolic_name X 0, %X.param [symbolic = %X.1 (constants.%X)] // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %C.ref: %C.type = name_ref C, %C.decl [template = constants.%C.1] +// CHECK:STDOUT: %C.ref: %C.type = name_ref C, file.%C.decl [template = constants.%C.1] // CHECK:STDOUT: %.loc9_14: i32 = int_literal 1 [template = constants.%.15] // CHECK:STDOUT: %.loc9_17: i32 = int_literal 2 [template = constants.%.16] // CHECK:STDOUT: %.loc9_18: %.9 = tuple_literal (%.loc9_14, %.loc9_17) // CHECK:STDOUT: %tuple: %.9 = tuple_value (%.loc9_14, %.loc9_17) [template = constants.%tuple.5] // CHECK:STDOUT: %.loc9_12: %.9 = converted %.loc9_18, %tuple [template = constants.%tuple.5] // CHECK:STDOUT: %C: type = class_type @C, @C(constants.%tuple.5) [template = constants.%C.3] -// CHECK:STDOUT: @F.%return: ref %C.3 = var +// CHECK:STDOUT: %return: ref %C.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: generic class @C(file.%X.loc7_9.2: %.9) { -// CHECK:STDOUT: %X: %.9 = bind_symbolic_name X 0 [symbolic = %X (constants.%X)] +// CHECK:STDOUT: generic class @C(%X.loc7: %.9) { +// CHECK:STDOUT: %X.1: %.9 = bind_symbolic_name X 0 [symbolic = %X.1 (constants.%X)] // CHECK:STDOUT: // CHECK:STDOUT: !definition: // CHECK:STDOUT: @@ -222,11 +222,11 @@ var c_bad: C((3, 4)) = F(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%X) { -// CHECK:STDOUT: %X => constants.%X +// CHECK:STDOUT: %X.1 => constants.%X // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: specific @C(constants.%tuple.5) { -// CHECK:STDOUT: %X => constants.%tuple.5 +// CHECK:STDOUT: %X.1 => constants.%tuple.5 // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon diff --git a/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon index f59ec488f32bf..6d576234f0d9a 100644 --- a/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuple/nested_tuple_in_place.carbon @@ -80,7 +80,7 @@ fn H() { // CHECK:STDOUT: %.loc11_25.6: type = value_of_initializer %int.make_type_32.loc11_22 [template = i32] // CHECK:STDOUT: %.loc11_25.7: type = converted %int.make_type_32.loc11_22, %.loc11_25.6 [template = i32] // CHECK:STDOUT: %.loc11_25.8: type = converted %.loc11_25.1, constants.%.3 [template = constants.%.3] -// CHECK:STDOUT: @F.%return: ref %.3 = var +// CHECK:STDOUT: %return: ref %.3 = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] {} diff --git a/toolchain/check/testdata/var/fail_not_copyable.carbon b/toolchain/check/testdata/var/fail_not_copyable.carbon index 912777698f094..255e80c94fa8b 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -62,9 +62,9 @@ fn F(x: X) { // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %X.decl: type = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %X.ref: type = name_ref X, %X.decl [template = constants.%X] -// CHECK:STDOUT: %x.loc14_6.1: %X = param x, runtime_param0 -// CHECK:STDOUT: @F.%x: %X = bind_name x, %x.loc14_6.1 +// CHECK:STDOUT: %X.ref.loc14: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %x.param: %X = param x, runtime_param0 +// CHECK:STDOUT: %x: %X = bind_name x, %x.param // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: @@ -79,7 +79,7 @@ fn F(x: X) { // CHECK:STDOUT: %s: ref String = bind_name s, %s.var // CHECK:STDOUT: %.loc21: String = string_literal "hello" [template = constants.%.5] // CHECK:STDOUT: assign %s.var, -// CHECK:STDOUT: %X.ref: type = name_ref X, file.%X.decl [template = constants.%X] +// CHECK:STDOUT: %X.ref.loc27: type = name_ref X, file.%X.decl [template = constants.%X] // CHECK:STDOUT: %y.var: ref %X = var y // CHECK:STDOUT: %y: ref %X = bind_name y, %y.var // CHECK:STDOUT: %x.ref: %X = name_ref x, %x diff --git a/toolchain/check/testdata/where_expr/no_prelude/fail_designator.carbon b/toolchain/check/testdata/where_expr/no_prelude/fail_designator.carbon index e63f7939c33cc..d4922d225c8f2 100644 --- a/toolchain/check/testdata/where_expr/no_prelude/fail_designator.carbon +++ b/toolchain/check/testdata/where_expr/no_prelude/fail_designator.carbon @@ -100,7 +100,7 @@ class D { // CHECK:STDOUT: class @C { // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] -// CHECK:STDOUT: %return.var: ref %C = var +// CHECK:STDOUT: %return: ref %C = var // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -108,7 +108,7 @@ class D { // CHECK:STDOUT: .F = %F.decl // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @F() -> @C.%return.var: %C { +// CHECK:STDOUT: fn @F() -> %return: %C { // CHECK:STDOUT: !entry: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index bcdbf37a95cbd..dfc74e26d6c07 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -86,52 +86,52 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: %Core.import = import Core // CHECK:STDOUT: %A.decl: %A.type = fn_decl @A [template = constants.%A] { -// CHECK:STDOUT: %bool.make_type.loc11: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type.loc11 [template = bool] -// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type.loc11, %.loc11_11.1 [template = bool] -// CHECK:STDOUT: @A.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc11_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc11_11.2: type = converted %bool.make_type, %.loc11_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %B.decl: %B.type = fn_decl @B [template = constants.%B] { -// CHECK:STDOUT: %bool.make_type.loc12: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type.loc12 [template = bool] -// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type.loc12, %.loc12_11.1 [template = bool] -// CHECK:STDOUT: @B.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc12_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc12_11.2: type = converted %bool.make_type, %.loc12_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %C.decl: %C.type = fn_decl @C [template = constants.%C] { -// CHECK:STDOUT: %bool.make_type.loc13: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %bool.make_type.loc13 [template = bool] -// CHECK:STDOUT: %.loc13_11.2: type = converted %bool.make_type.loc13, %.loc13_11.1 [template = bool] -// CHECK:STDOUT: @C.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc13_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc13_11.2: type = converted %bool.make_type, %.loc13_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %D.decl: %D.type = fn_decl @D [template = constants.%D] { -// CHECK:STDOUT: %bool.make_type.loc14: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %bool.make_type.loc14 [template = bool] -// CHECK:STDOUT: %.loc14_11.2: type = converted %bool.make_type.loc14, %.loc14_11.1 [template = bool] -// CHECK:STDOUT: @D.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc14_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc14_11.2: type = converted %bool.make_type, %.loc14_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %E.decl: %E.type = fn_decl @E [template = constants.%E] { -// CHECK:STDOUT: %bool.make_type.loc15: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc15_11.1: type = value_of_initializer %bool.make_type.loc15 [template = bool] -// CHECK:STDOUT: %.loc15_11.2: type = converted %bool.make_type.loc15, %.loc15_11.1 [template = bool] -// CHECK:STDOUT: @E.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc15_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc15_11.2: type = converted %bool.make_type, %.loc15_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] { -// CHECK:STDOUT: %bool.make_type.loc16: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %bool.make_type.loc16 [template = bool] -// CHECK:STDOUT: %.loc16_11.2: type = converted %bool.make_type.loc16, %.loc16_11.1 [template = bool] -// CHECK:STDOUT: @F.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc16_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc16_11.2: type = converted %bool.make_type, %.loc16_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] { -// CHECK:STDOUT: %bool.make_type.loc17: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc17_11.1: type = value_of_initializer %bool.make_type.loc17 [template = bool] -// CHECK:STDOUT: %.loc17_11.2: type = converted %bool.make_type.loc17, %.loc17_11.1 [template = bool] -// CHECK:STDOUT: @G.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc17_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc17_11.2: type = converted %bool.make_type, %.loc17_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %H.decl: %H.type = fn_decl @H [template = constants.%H] { -// CHECK:STDOUT: %bool.make_type.loc18: init type = call constants.%Bool() [template = bool] -// CHECK:STDOUT: %.loc18_11.1: type = value_of_initializer %bool.make_type.loc18 [template = bool] -// CHECK:STDOUT: %.loc18_11.2: type = converted %bool.make_type.loc18, %.loc18_11.1 [template = bool] -// CHECK:STDOUT: @H.%return: ref bool = var +// CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] +// CHECK:STDOUT: %.loc18_11.1: type = value_of_initializer %bool.make_type [template = bool] +// CHECK:STDOUT: %.loc18_11.2: type = converted %bool.make_type, %.loc18_11.1 [template = bool] +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %While.decl: %While.type = fn_decl @While [template = constants.%While] {} // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index 696339a913938..b7f470b0f42bd 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -70,7 +70,7 @@ fn While() { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_14.2: type = converted %bool.make_type, %.loc11_14.1 [template = bool] -// CHECK:STDOUT: @Cond.%return: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index d1390d7aefc7c..4be3c19363a64 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -69,7 +69,7 @@ fn While() { // CHECK:STDOUT: %bool.make_type: init type = call constants.%Bool() [template = bool] // CHECK:STDOUT: %.loc11_14.1: type = value_of_initializer %bool.make_type [template = bool] // CHECK:STDOUT: %.loc11_14.2: type = converted %bool.make_type, %.loc11_14.1 [template = bool] -// CHECK:STDOUT: @Cond.%return: ref bool = var +// CHECK:STDOUT: %return: ref bool = var // CHECK:STDOUT: } // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [template = constants.%F] {} // CHECK:STDOUT: %G.decl: %G.type = fn_decl @G [template = constants.%G] {} diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index 9c35e139d48f5..593a45ac24194 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -797,21 +797,29 @@ class FormatterImpl { auto FormatInstRHS(FunctionDecl inst) -> void { FormatArgs(inst.function_id); + llvm::SaveAndRestore class_scope( + scope_, inst_namer_->GetScopeFor(inst.function_id)); FormatTrailingBlock(inst.decl_block_id); } auto FormatInstRHS(ClassDecl inst) -> void { FormatArgs(inst.class_id); + llvm::SaveAndRestore class_scope(scope_, + inst_namer_->GetScopeFor(inst.class_id)); FormatTrailingBlock(inst.decl_block_id); } auto FormatInstRHS(ImplDecl inst) -> void { FormatArgs(inst.impl_id); + llvm::SaveAndRestore class_scope(scope_, + inst_namer_->GetScopeFor(inst.impl_id)); FormatTrailingBlock(inst.decl_block_id); } auto FormatInstRHS(InterfaceDecl inst) -> void { FormatArgs(inst.interface_id); + llvm::SaveAndRestore class_scope( + scope_, inst_namer_->GetScopeFor(inst.interface_id)); FormatTrailingBlock(inst.decl_block_id); } diff --git a/toolchain/sem_ir/inst_namer.cpp b/toolchain/sem_ir/inst_namer.cpp index 022ab102d6701..355a0c7a0b814 100644 --- a/toolchain/sem_ir/inst_namer.cpp +++ b/toolchain/sem_ir/inst_namer.cpp @@ -22,7 +22,7 @@ InstNamer::InstNamer(const Lex::TokenizedBuffer& tokenized_buffer, : tokenized_buffer_(tokenized_buffer), parse_tree_(parse_tree), sem_ir_(sem_ir) { - insts_.resize(sem_ir.insts().size()); + insts_.resize(sem_ir.insts().size(), {ScopeId::None, Namespace::Name()}); labels_.resize(sem_ir.inst_blocks().size()); scopes_.resize(static_cast(GetScopeFor(NumberOfScopesTag()))); generic_scopes_.resize(sem_ir.generics().size(), ScopeId::None); @@ -381,9 +381,15 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, auto untyped_inst = sem_ir_.insts().Get(inst_id); auto add_inst_name = [&](std::string name) { - insts_[inst_id.index] = { - scope_id, scope.insts.AllocateName( - *this, sem_ir_.insts().GetLocId(inst_id), name)}; + ScopeId old_scope_id = insts_[inst_id.index].first; + if (old_scope_id == ScopeId::None) { + insts_[inst_id.index] = { + scope_id, scope.insts.AllocateName( + *this, sem_ir_.insts().GetLocId(inst_id), name)}; + } else { + CARBON_CHECK(old_scope_id == scope_id, + "Attempting to name inst in multiple scopes"); + } }; auto add_inst_name_id = [&](NameId name_id, llvm::StringRef suffix = "") { add_inst_name( @@ -438,7 +444,7 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, } case CARBON_KIND(ClassDecl inst): { add_inst_name_id(sem_ir_.classes().Get(inst.class_id).name_id, ".decl"); - CollectNamesInBlock(scope_id, inst.decl_block_id); + CollectNamesInBlock(GetScopeFor(inst.class_id), inst.decl_block_id); continue; } case CARBON_KIND(ClassType inst): { @@ -448,7 +454,7 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, case CARBON_KIND(FunctionDecl inst): { add_inst_name_id(sem_ir_.functions().Get(inst.function_id).name_id, ".decl"); - CollectNamesInBlock(scope_id, inst.decl_block_id); + CollectNamesInBlock(GetScopeFor(inst.function_id), inst.decl_block_id); continue; } case CARBON_KIND(FunctionType inst): { @@ -466,7 +472,7 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, continue; } case CARBON_KIND(ImplDecl inst): { - CollectNamesInBlock(scope_id, inst.decl_block_id); + CollectNamesInBlock(GetScopeFor(inst.impl_id), inst.decl_block_id); break; } case CARBON_KIND(ImportDecl inst): { @@ -495,7 +501,7 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, case CARBON_KIND(InterfaceDecl inst): { add_inst_name_id(sem_ir_.interfaces().Get(inst.interface_id).name_id, ".decl"); - CollectNamesInBlock(scope_id, inst.decl_block_id); + CollectNamesInBlock(GetScopeFor(inst.interface_id), inst.decl_block_id); continue; } case CARBON_KIND(NameRef inst): { @@ -508,7 +514,7 @@ auto InstNamer::CollectNamesInBlock(ScopeId scope_id, continue; } case CARBON_KIND(Param inst): { - add_inst_name_id(inst.name_id); + add_inst_name_id(inst.name_id, ".param"); continue; } case CARBON_KIND(SpliceBlock inst): {