From 0460f6b7ba731c871f5ad2465d54e6982202205c Mon Sep 17 00:00:00 2001 From: Geoff Romer Date: Wed, 1 Jul 2026 18:02:19 -0700 Subject: [PATCH] Label `VarStorage` as `var_storage` instead of `var` (#7447) This makes the textual format clearer and more self-explanatory, and avoids ambiguity about whether this inst refers to the storage or the pattern. --- .../check/testdata/alias/export_name.carbon | 8 +-- toolchain/check/testdata/alias/import.carbon | 16 ++--- .../check/testdata/alias/import_access.carbon | 6 +- .../check/testdata/alias/import_order.carbon | 42 ++++++------ toolchain/check/testdata/array/basics.carbon | 12 ++-- .../array/init_dependent_bound.carbon | 4 +- .../testdata/as/adapter_conversion.carbon | 4 +- toolchain/check/testdata/as/basics.carbon | 4 +- toolchain/check/testdata/as/const.carbon | 16 ++--- .../check/testdata/as/maybe_unformed.carbon | 14 ++-- toolchain/check/testdata/as/partial.carbon | 20 +++--- toolchain/check/testdata/as/var_init.carbon | 2 +- .../testdata/basics/dump_sem_ir_ranges.carbon | 2 +- .../basics/duplicate_name_same_line.carbon | 4 +- toolchain/check/testdata/basics/parens.carbon | 4 +- .../check/testdata/builtins/bool/eq.carbon | 4 +- .../check/testdata/builtins/bool/neq.carbon | 4 +- .../check/testdata/builtins/no_op.carbon | 2 +- .../testdata/class/abstract/abstract.carbon | 2 +- .../abstract/fail_abstract_in_struct.carbon | 10 +-- .../abstract/fail_abstract_in_tuple.carbon | 10 +-- .../class/access/import_access.carbon | 12 ++-- .../testdata/class/adapter/adapt_copy.carbon | 16 ++--- .../testdata/class/adapter/init_adapt.carbon | 8 +-- .../class/cross_package_import.carbon | 8 +-- .../check/testdata/class/destroy_calls.carbon | 16 ++--- .../check/testdata/class/export_name.carbon | 2 +- .../testdata/class/field/field_access.carbon | 6 +- .../class/field/field_access_in_value.carbon | 6 +- .../class/field/field_initializer.carbon | 2 +- .../check/testdata/class/field/static.carbon | 4 +- .../check/testdata/class/generic/call.carbon | 10 +-- .../class/generic/generic_vs_params.carbon | 10 +-- .../testdata/class/generic/import.carbon | 6 +- .../check/testdata/class/generic/init.carbon | 4 +- .../testdata/class/generic/member_type.carbon | 4 +- .../check/testdata/class/generic/self.carbon | 4 +- .../testdata/class/generic/stringify.carbon | 12 ++-- toolchain/check/testdata/class/import.carbon | 10 +-- .../testdata/class/import_indirect.carbon | 24 +++---- .../testdata/class/import_member_cycle.carbon | 2 +- .../testdata/class/import_struct_cycle.carbon | 10 +-- .../class/indirect_import_member.carbon | 10 +-- .../class/inheritance/import_base.carbon | 2 +- toolchain/check/testdata/class/init_as.carbon | 2 +- .../check/testdata/class/method/method.carbon | 2 +- .../class/method/static_method.carbon | 2 +- .../testdata/class/method/virtual.carbon | 8 +-- toolchain/check/testdata/class/nested.carbon | 12 ++-- .../check/testdata/class/nested_name.carbon | 2 +- .../testdata/class/reorder_qualified.carbon | 8 +-- toolchain/check/testdata/class/scope.carbon | 4 +- .../testdata/class/self/raw_self_type.carbon | 4 +- toolchain/check/testdata/const/import.carbon | 8 +-- toolchain/check/testdata/deduce/array.carbon | 12 ++-- .../check/testdata/eval/aggregates.carbon | 30 ++++----- toolchain/check/testdata/eval/branch.carbon | 8 +-- toolchain/check/testdata/eval/call.carbon | 4 +- toolchain/check/testdata/for/actual.carbon | 4 +- toolchain/check/testdata/for/basic.carbon | 2 +- toolchain/check/testdata/for/pattern.carbon | 10 +-- .../function/builtin/adapted_type.carbon | 2 +- .../testdata/function/builtin/call.carbon | 2 +- .../builtin/call_from_operator.carbon | 2 +- .../testdata/function/builtin/import.carbon | 2 +- .../testdata/function/builtin/method.carbon | 2 +- .../check/testdata/function/call/alias.carbon | 2 +- .../call/fail_return_type_mismatch.carbon | 2 +- .../check/testdata/function/call/form.carbon | 10 +-- .../check/testdata/function/call/i32.carbon | 2 +- .../function/call/more_param_ir.carbon | 2 +- .../check/testdata/function/call/ref.carbon | 4 +- .../function/call/return_implicit.carbon | 2 +- .../function/declaration/export_name.carbon | 2 +- .../function/declaration/extern.carbon | 2 +- .../function/declaration/import.carbon | 50 +++++++------- .../function/definition/import.carbon | 6 +- .../function/definition/import_access.carbon | 18 ++--- .../function/generic/resolve_used.carbon | 2 +- .../function/generic/return_slot.carbon | 6 +- .../function/generic/type_param.carbon | 2 +- .../testdata/generic/dependent_param.carbon | 2 +- toolchain/check/testdata/generic/local.carbon | 2 +- .../generic/template/unimplemented.carbon | 4 +- .../check/testdata/generic/var_param.carbon | 2 +- toolchain/check/testdata/global/basics.carbon | 10 +-- toolchain/check/testdata/if_expr/basic.carbon | 2 +- .../if_expr/constant_condition.carbon | 8 +-- .../if_expr/fail_partial_constant.carbon | 6 +- .../check/testdata/if_expr/struct.carbon | 2 +- .../testdata/impl/extend_impl_generic.carbon | 2 +- toolchain/check/testdata/impl/impl_as.carbon | 2 +- .../testdata/impl/import_builtin_call.carbon | 4 +- .../testdata/impl/import_use_generic.carbon | 2 +- .../check/testdata/impl/lookup/import.carbon | 8 +-- .../index/array_element_access.carbon | 8 +-- .../check/testdata/index/expr_category.carbon | 6 +- .../index/fail_array_large_index.carbon | 6 +- .../index/fail_array_non_int_indexing.carbon | 4 +- .../fail_array_out_of_bound_access.carbon | 4 +- .../testdata/index/fail_expr_category.carbon | 4 +- .../testdata/index/fail_invalid_base.carbon | 8 +-- .../testdata/index/fail_name_not_found.carbon | 2 +- .../index/fail_negative_indexing.carbon | 4 +- .../testdata/interface/as_type_of_type.carbon | 2 +- .../testdata/interface/default_fn.carbon | 2 +- .../interface/fail_member_lookup.carbon | 2 +- .../testdata/interface/generic_method.carbon | 4 +- .../check/testdata/interface/import.carbon | 12 ++-- .../interop/cpp/basics/import/import.carbon | 2 +- .../interop/cpp/basics/import/indirect.carbon | 2 +- .../interop/cpp/class/import/access.carbon | 6 +- .../interop/cpp/class/import/class.carbon | 2 +- .../cpp/class/import/constructor.carbon | 8 +-- .../interop/cpp/class/import/method.carbon | 8 +-- .../interop/cpp/class/import/template.carbon | 4 +- .../interop/cpp/class/import/union.carbon | 2 +- .../testdata/interop/cpp/enum/copy.carbon | 2 +- .../interop/cpp/function/import/class.carbon | 4 +- .../cpp/function/import/decayed_param.carbon | 4 +- .../cpp/function/import/extern_c.carbon | 2 +- .../cpp/function/import/pointer.carbon | 28 ++++---- .../function/import/qualified_param.carbon | 2 +- .../cpp/function/import/reference.carbon | 18 ++--- .../interop/cpp/function/import/return.carbon | 4 +- .../interop/cpp/function/import/struct.carbon | 4 +- .../interop/cpp/function/import/union.carbon | 4 +- .../cpp/function/import/void_pointer.carbon | 4 +- .../testdata/interop/cpp/impls/destroy.carbon | 8 +-- .../testdata/interop/cpp/macros/macros.carbon | 26 ++++---- .../interop/cpp/operators/operators.carbon | 20 +++--- .../cpp/primitive_types/arithmetic.carbon | 2 +- .../long_and_long_long.llp64.carbon | 28 ++++---- .../long_and_long_long.lp64.carbon | 28 ++++---- .../testdata/interop/cpp/range_for.carbon | 32 ++++----- .../cpp/template/alias_template.carbon | 8 +-- .../cpp/template/argument_count.carbon | 10 +-- .../cpp/template/class_template.carbon | 2 +- .../interop/cpp/template/concept.carbon | 4 +- .../cpp/template/non_type_param.carbon | 8 +-- .../template/template_template_param.carbon | 4 +- .../interop/cpp/template/type_param.carbon | 4 +- .../interop/cpp/template/var_template.carbon | 24 +++---- .../interop/cpp/type_alias/import.carbon | 8 +-- .../interop/cpp/var/import/global.carbon | 8 +-- .../interop/cpp/var/import/namespace.carbon | 2 +- .../check/testdata/let/generic_import.carbon | 4 +- .../testdata/namespace/add_to_import.carbon | 2 +- .../check/testdata/namespace/imported.carbon | 8 +-- .../namespace/imported_indirect.carbon | 2 +- .../merging_with_indirections.carbon | 2 +- .../check/testdata/namespace/shadow.carbon | 2 +- .../testdata/operators/builtin/and.carbon | 10 +-- .../operators/builtin/assignment.carbon | 8 +-- .../fail_and_or_partial_constant.carbon | 8 +-- .../fail_assignment_to_non_assignable.carbon | 4 +- .../fail_redundant_compound_access.carbon | 2 +- .../builtin/fail_type_mismatch.carbon | 2 +- .../fail_type_mismatch_assignment.carbon | 2 +- .../testdata/operators/builtin/or.carbon | 10 +-- .../operators/builtin/unary_op.carbon | 4 +- .../operators/overloaded/fail_no_impl.carbon | 2 +- .../check/testdata/package_expr/syntax.carbon | 10 +-- .../packages/cross_package_export.carbon | 42 ++++++------ .../testdata/packages/export_import.carbon | 60 ++++++++--------- .../testdata/packages/export_mixed.carbon | 38 +++++------ .../testdata/packages/export_name.carbon | 66 +++++++++---------- .../fail_conflict_no_namespaces.carbon | 2 +- .../packages/fail_import_type_error.carbon | 16 ++--- .../fail_name_with_import_failure.carbon | 2 +- .../packages/implicit_imports_entities.carbon | 14 ++-- .../packages/implicit_imports_prelude.carbon | 6 +- .../testdata/packages/loaded_global.carbon | 8 +-- .../testdata/packages/missing_prelude.carbon | 4 +- .../check/testdata/packages/raw_core.carbon | 6 +- .../check/testdata/patterns/underscore.carbon | 4 +- .../testdata/pointer/address_of_deref.carbon | 2 +- .../testdata/pointer/address_of_lvalue.carbon | 14 ++-- toolchain/check/testdata/pointer/basic.carbon | 4 +- .../testdata/pointer/fail_deref_type.carbon | 4 +- .../check/testdata/pointer/import.carbon | 12 ++-- .../testdata/primitives/type_literals.carbon | 26 ++++---- .../fail_return_with_returned_var.carbon | 2 +- .../fail_returned_var_no_return_type.carbon | 4 +- .../return/fail_returned_var_shadow.carbon | 8 +-- .../return/fail_returned_var_type.carbon | 2 +- .../testdata/return/fail_var_in_type.carbon | 2 +- .../check/testdata/return/returned_var.carbon | 2 +- .../testdata/return/returned_var_scope.carbon | 8 +-- toolchain/check/testdata/struct/empty.carbon | 4 +- .../testdata/struct/fail_assign_empty.carbon | 2 +- .../testdata/struct/fail_assign_nested.carbon | 2 +- .../struct/fail_assign_to_empty.carbon | 2 +- .../struct/fail_duplicate_name.carbon | 4 +- .../struct/fail_field_name_mismatch.carbon | 16 ++--- .../struct/fail_field_type_mismatch.carbon | 2 +- .../struct/fail_member_access_type.carbon | 4 +- .../struct/fail_nested_incomplete.carbon | 4 +- .../struct/fail_non_member_access.carbon | 4 +- .../struct/fail_too_few_values.carbon | 6 +- .../testdata/struct/fail_type_assign.carbon | 2 +- .../testdata/struct/fail_value_as_type.carbon | 2 +- toolchain/check/testdata/struct/import.carbon | 50 +++++++------- .../testdata/struct/member_access.carbon | 16 ++--- .../struct/nested_struct_in_place.carbon | 2 +- .../check/testdata/struct/one_entry.carbon | 8 +-- .../testdata/struct/tuple_as_element.carbon | 28 ++++---- .../check/testdata/struct/two_entries.carbon | 24 +++---- toolchain/check/testdata/tuple/basics.carbon | 60 ++++++++--------- .../testdata/tuple/element_access.carbon | 12 ++-- toolchain/check/testdata/tuple/import.carbon | 66 +++++++++---------- .../testdata/tuple/in_place_tuple_init.carbon | 6 +- .../check/testdata/tuple/tuple_pattern.carbon | 12 ++-- .../check/testdata/var/export_name.carbon | 8 +-- .../testdata/var/fail_duplicate_decl.carbon | 4 +- .../var/fail_init_type_mismatch.carbon | 2 +- .../testdata/var/fail_init_with_self.carbon | 2 +- .../var/fail_storage_is_literal.carbon | 2 +- .../check/testdata/var/global_decl.carbon | 6 +- .../testdata/var/global_decl_import.carbon | 6 +- .../testdata/var/global_decl_with_init.carbon | 10 +-- .../check/testdata/var/global_lookup.carbon | 14 ++-- .../var/global_lookup_in_scope.carbon | 10 +-- toolchain/check/testdata/var/import.carbon | 6 +- .../check/testdata/var/import_access.carbon | 10 +-- .../check/testdata/var/initialization.carbon | 4 +- toolchain/check/testdata/var/lookup.carbon | 2 +- toolchain/check/testdata/var/shadowing.carbon | 6 +- .../check/testdata/var/var_pattern.carbon | 20 +++--- toolchain/sem_ir/typed_insts.h | 2 +- 230 files changed, 987 insertions(+), 987 deletions(-) diff --git a/toolchain/check/testdata/alias/export_name.carbon b/toolchain/check/testdata/alias/export_name.carbon index 3a74553b08a2..dd406b3062dc 100644 --- a/toolchain/check/testdata/alias/export_name.carbon +++ b/toolchain/check/testdata/alias/export_name.carbon @@ -216,7 +216,7 @@ var d: D* = &c; // CHECK:STDOUT: %d.patt: %pattern_type = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %C = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %C = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %d: ref %C = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } @@ -265,7 +265,7 @@ var d: D* = &c; // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %C.ref: = name_ref C, [concrete = ] // CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } @@ -337,14 +337,14 @@ var d: D* = &c; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.fcb = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.fcb = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %ptr.6b6 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %ptr.6b6 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] diff --git a/toolchain/check/testdata/alias/import.carbon b/toolchain/check/testdata/alias/import.carbon index 5872b661d554..5f14ec74ecfd 100644 --- a/toolchain/check/testdata/alias/import.carbon +++ b/toolchain/check/testdata/alias/import.carbon @@ -112,7 +112,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %a.patt: %pattern_type.fcb = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.fcb = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %ptr = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %ptr = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %C.ref.loc8 [concrete = constants.%ptr] @@ -194,7 +194,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %b.patt: %pattern_type.fcb = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.fcb = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %ptr = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %ptr = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %c_alias.ref.loc8: type = name_ref c_alias, imports.%Main.c_alias [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %c_alias.ref.loc8 [concrete = constants.%ptr] @@ -270,7 +270,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %c.patt: %pattern_type.fcb = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.fcb = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %ptr = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %ptr = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %c_alias_alias.ref: type = name_ref c_alias_alias, imports.%Main.c_alias_alias [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %c_alias_alias.ref [concrete = constants.%ptr] @@ -325,7 +325,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -363,7 +363,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var constants.%a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage constants.%a.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -382,7 +382,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %b.patt: %pattern_type = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc8_9.1: type = splice_block %.loc8_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc8_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_9.3: type = converted %.loc8_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -418,7 +418,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var constants.%a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage constants.%a.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -434,7 +434,7 @@ var c: () = a_alias_alias; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/alias/import_access.carbon b/toolchain/check/testdata/alias/import_access.carbon index 914fb5575865..9e4615106756 100644 --- a/toolchain/check/testdata/alias/import_access.carbon +++ b/toolchain/check/testdata/alias/import_access.carbon @@ -114,7 +114,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: %inst.patt: %pattern_type = ref_binding_pattern inst [concrete = constants.%inst.patt] // CHECK:STDOUT: %inst.var_patt: %pattern_type = var_pattern %inst.patt [concrete = constants.%inst.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.var: ref %C = var %inst.var_patt [concrete] +// CHECK:STDOUT: %inst.var: ref %C = var_storage %inst.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%Test.A [concrete = constants.%C] // CHECK:STDOUT: %inst: ref %C = wrapper_binding inst, %inst.var [concrete = %inst.var] // CHECK:STDOUT: } @@ -157,7 +157,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: %inst.patt: = ref_binding_pattern inst [concrete = ] // CHECK:STDOUT: %inst.var_patt: = var_pattern %inst.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.var: ref = var %inst.var_patt [concrete = ] +// CHECK:STDOUT: %inst.var: ref = var_storage %inst.var_patt [concrete = ] // CHECK:STDOUT: %A.ref: = name_ref A, [concrete = ] // CHECK:STDOUT: %inst: = wrapper_binding inst, [concrete = ] // CHECK:STDOUT: } @@ -193,7 +193,7 @@ var inst: Test.A = {}; // CHECK:STDOUT: %inst.patt: = ref_binding_pattern inst [concrete = ] // CHECK:STDOUT: %inst.var_patt: = var_pattern %inst.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %inst.var: ref = var %inst.var_patt [concrete = ] +// CHECK:STDOUT: %inst.var: ref = var_storage %inst.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %A.ref: = name_ref A, [concrete = ] diff --git a/toolchain/check/testdata/alias/import_order.carbon b/toolchain/check/testdata/alias/import_order.carbon index 4e9e6ad5510a..dad986875c72 100644 --- a/toolchain/check/testdata/alias/import_order.carbon +++ b/toolchain/check/testdata/alias/import_order.carbon @@ -84,21 +84,21 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %d_val.var_patt: %pattern_type = var_pattern %d_val.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.5f2: %struct_type.v = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.30c: ref %empty_tuple.type = class_element_access file.%d_val.var, element0 [concrete] +// CHECK:STDOUT: %.4c6: ref %empty_tuple.type = class_element_access file.%d_val.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %c_val.patt: %pattern_type = ref_binding_pattern c_val [concrete] // CHECK:STDOUT: %c_val.var_patt: %pattern_type = var_pattern %c_val.patt [concrete] // CHECK:STDOUT: %C.elem: type = unbound_element_type %C, %empty_tuple.type [concrete] -// CHECK:STDOUT: %struct.1dc: %struct_type.v = struct_value (%.30c) [concrete] -// CHECK:STDOUT: %.0bf: ref %empty_tuple.type = class_element_access file.%c_val.var, element0 [concrete] +// CHECK:STDOUT: %struct.898: %struct_type.v = struct_value (%.4c6) [concrete] +// CHECK:STDOUT: %.f57: ref %empty_tuple.type = class_element_access file.%c_val.var, element0 [concrete] // CHECK:STDOUT: %b_val.patt: %pattern_type = ref_binding_pattern b_val [concrete] // CHECK:STDOUT: %b_val.var_patt: %pattern_type = var_pattern %b_val.patt [concrete] -// CHECK:STDOUT: %struct.2e7: %struct_type.v = struct_value (%.0bf) [concrete] -// CHECK:STDOUT: %.9b2: ref %empty_tuple.type = class_element_access file.%b_val.var, element0 [concrete] +// CHECK:STDOUT: %struct.2ea: %struct_type.v = struct_value (%.f57) [concrete] +// CHECK:STDOUT: %.db9: ref %empty_tuple.type = class_element_access file.%b_val.var, element0 [concrete] // CHECK:STDOUT: %a_val.patt: %pattern_type = ref_binding_pattern a_val [concrete] // CHECK:STDOUT: %a_val.var_patt: %pattern_type = var_pattern %a_val.patt [concrete] -// CHECK:STDOUT: %struct.8ba: %struct_type.v = struct_value (%.9b2) [concrete] -// CHECK:STDOUT: %.028: ref %empty_tuple.type = class_element_access file.%a_val.var, element0 [concrete] +// CHECK:STDOUT: %struct.da5: %struct_type.v = struct_value (%.db9) [concrete] +// CHECK:STDOUT: %.5b1: ref %empty_tuple.type = class_element_access file.%a_val.var, element0 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { @@ -130,28 +130,28 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: %d_val.patt: %pattern_type = ref_binding_pattern d_val [concrete = constants.%d_val.patt] // CHECK:STDOUT: %d_val.var_patt: %pattern_type = var_pattern %d_val.patt [concrete = constants.%d_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d_val.var: ref %C = var %d_val.var_patt [concrete] +// CHECK:STDOUT: %d_val.var: ref %C = var_storage %d_val.var_patt [concrete] // CHECK:STDOUT: %d.ref: type = name_ref d, imports.%Main.d [concrete = constants.%C] // CHECK:STDOUT: %d_val: ref %C = wrapper_binding d_val, %d_val.var [concrete = %d_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_val.patt: %pattern_type = ref_binding_pattern c_val [concrete = constants.%c_val.patt] // CHECK:STDOUT: %c_val.var_patt: %pattern_type = var_pattern %c_val.patt [concrete = constants.%c_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_val.var: ref %C = var %c_val.var_patt [concrete] +// CHECK:STDOUT: %c_val.var: ref %C = var_storage %c_val.var_patt [concrete] // CHECK:STDOUT: %c.ref: type = name_ref c, imports.%Main.c [concrete = constants.%C] // CHECK:STDOUT: %c_val: ref %C = wrapper_binding c_val, %c_val.var [concrete = %c_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_val.patt: %pattern_type = ref_binding_pattern b_val [concrete = constants.%b_val.patt] // CHECK:STDOUT: %b_val.var_patt: %pattern_type = var_pattern %b_val.patt [concrete = constants.%b_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_val.var: ref %C = var %b_val.var_patt [concrete] +// CHECK:STDOUT: %b_val.var: ref %C = var_storage %b_val.var_patt [concrete] // CHECK:STDOUT: %b.ref: type = name_ref b, imports.%Main.b [concrete = constants.%C] // CHECK:STDOUT: %b_val: ref %C = wrapper_binding b_val, %b_val.var [concrete = %b_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a_val.patt: %pattern_type = ref_binding_pattern a_val [concrete = constants.%a_val.patt] // CHECK:STDOUT: %a_val.var_patt: %pattern_type = var_pattern %a_val.patt [concrete = constants.%a_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_val.var: ref %C = var %a_val.var_patt [concrete] +// CHECK:STDOUT: %a_val.var: ref %C = var_storage %a_val.var_patt [concrete] // CHECK:STDOUT: %a.ref: type = name_ref a, imports.%Main.a [concrete = constants.%C] // CHECK:STDOUT: %a_val: ref %C = wrapper_binding a_val, %a_val.var [concrete = %a_val.var] // CHECK:STDOUT: } @@ -168,7 +168,7 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_23.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_24.1: %struct_type.v = struct_literal (%.loc7_23.1) [concrete = constants.%struct.5f2] -// CHECK:STDOUT: %.loc7_24.2: ref %empty_tuple.type = class_element_access file.%d_val.var, element0 [concrete = constants.%.30c] +// CHECK:STDOUT: %.loc7_24.2: ref %empty_tuple.type = class_element_access file.%d_val.var, element0 [concrete = constants.%.4c6] // CHECK:STDOUT: %.loc7_23.2: init %empty_tuple.type to %.loc7_24.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_24.3: init %empty_tuple.type = converted %.loc7_23.1, %.loc7_23.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_24.4: init %empty_tuple.type to %.loc7_24.2 = in_place_init %.loc7_24.3 [concrete = constants.%empty_tuple] @@ -177,9 +177,9 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: assign file.%d_val.var, %.loc7_1 // CHECK:STDOUT: %d_val.ref: ref %C = name_ref d_val, file.%d_val [concrete = file.%d_val.var] // CHECK:STDOUT: %v.ref.loc8: %C.elem = name_ref v, imports.%Main.import_ref.0c6 [concrete = imports.%.a44] -// CHECK:STDOUT: %.loc8_27.1: ref %empty_tuple.type = class_element_access %d_val.ref, element0 [concrete = constants.%.30c] -// CHECK:STDOUT: %.loc8_29.1: %struct_type.v = struct_literal (%.loc8_27.1) [concrete = constants.%struct.1dc] -// CHECK:STDOUT: %.loc8_29.2: ref %empty_tuple.type = class_element_access file.%c_val.var, element0 [concrete = constants.%.0bf] +// CHECK:STDOUT: %.loc8_27.1: ref %empty_tuple.type = class_element_access %d_val.ref, element0 [concrete = constants.%.4c6] +// CHECK:STDOUT: %.loc8_29.1: %struct_type.v = struct_literal (%.loc8_27.1) [concrete = constants.%struct.898] +// CHECK:STDOUT: %.loc8_29.2: ref %empty_tuple.type = class_element_access file.%c_val.var, element0 [concrete = constants.%.f57] // CHECK:STDOUT: %.loc8_27.2: init %empty_tuple.type to %.loc8_29.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_29.3: init %empty_tuple.type = converted %.loc8_27.1, %.loc8_27.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_29.4: init %empty_tuple.type to %.loc8_29.2 = in_place_init %.loc8_29.3 [concrete = constants.%empty_tuple] @@ -188,9 +188,9 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: assign file.%c_val.var, %.loc8_1 // CHECK:STDOUT: %c_val.ref: ref %C = name_ref c_val, file.%c_val [concrete = file.%c_val.var] // CHECK:STDOUT: %v.ref.loc9: %C.elem = name_ref v, imports.%Main.import_ref.0c6 [concrete = imports.%.a44] -// CHECK:STDOUT: %.loc9_27.1: ref %empty_tuple.type = class_element_access %c_val.ref, element0 [concrete = constants.%.0bf] -// CHECK:STDOUT: %.loc9_29.1: %struct_type.v = struct_literal (%.loc9_27.1) [concrete = constants.%struct.2e7] -// CHECK:STDOUT: %.loc9_29.2: ref %empty_tuple.type = class_element_access file.%b_val.var, element0 [concrete = constants.%.9b2] +// CHECK:STDOUT: %.loc9_27.1: ref %empty_tuple.type = class_element_access %c_val.ref, element0 [concrete = constants.%.f57] +// CHECK:STDOUT: %.loc9_29.1: %struct_type.v = struct_literal (%.loc9_27.1) [concrete = constants.%struct.2ea] +// CHECK:STDOUT: %.loc9_29.2: ref %empty_tuple.type = class_element_access file.%b_val.var, element0 [concrete = constants.%.db9] // CHECK:STDOUT: %.loc9_27.2: init %empty_tuple.type to %.loc9_29.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_29.3: init %empty_tuple.type = converted %.loc9_27.1, %.loc9_27.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_29.4: init %empty_tuple.type to %.loc9_29.2 = in_place_init %.loc9_29.3 [concrete = constants.%empty_tuple] @@ -199,9 +199,9 @@ var a_val: a = {.v = b_val.v}; // CHECK:STDOUT: assign file.%b_val.var, %.loc9_1 // CHECK:STDOUT: %b_val.ref: ref %C = name_ref b_val, file.%b_val [concrete = file.%b_val.var] // CHECK:STDOUT: %v.ref.loc10: %C.elem = name_ref v, imports.%Main.import_ref.0c6 [concrete = imports.%.a44] -// CHECK:STDOUT: %.loc10_27.1: ref %empty_tuple.type = class_element_access %b_val.ref, element0 [concrete = constants.%.9b2] -// CHECK:STDOUT: %.loc10_29.1: %struct_type.v = struct_literal (%.loc10_27.1) [concrete = constants.%struct.8ba] -// CHECK:STDOUT: %.loc10_29.2: ref %empty_tuple.type = class_element_access file.%a_val.var, element0 [concrete = constants.%.028] +// CHECK:STDOUT: %.loc10_27.1: ref %empty_tuple.type = class_element_access %b_val.ref, element0 [concrete = constants.%.db9] +// CHECK:STDOUT: %.loc10_29.1: %struct_type.v = struct_literal (%.loc10_27.1) [concrete = constants.%struct.da5] +// CHECK:STDOUT: %.loc10_29.2: ref %empty_tuple.type = class_element_access file.%a_val.var, element0 [concrete = constants.%.5b1] // CHECK:STDOUT: %.loc10_27.2: init %empty_tuple.type to %.loc10_29.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_29.3: init %empty_tuple.type = converted %.loc10_27.1, %.loc10_27.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_29.4: init %empty_tuple.type to %.loc10_29.2 = in_place_init %.loc10_29.3 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/array/basics.carbon b/toolchain/check/testdata/array/basics.carbon index 5ad4b71d3129..fc89a82677e7 100644 --- a/toolchain/check/testdata/array/basics.carbon +++ b/toolchain/check/testdata/array/basics.carbon @@ -130,7 +130,7 @@ var a: array(1, 1); // CHECK:STDOUT: %b.patt: %pattern_type.035 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.035 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %array_type = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %array_type = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc6_19: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %.loc6_15.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3] @@ -197,7 +197,7 @@ var a: array(1, 1); // CHECK:STDOUT: %v.patt: %pattern_type.c3e = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.c3e = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %array_type = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %array_type = var_storage %v.var_patt // CHECK:STDOUT: %F.ref.loc10_40: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc10_48.1: ref %tuple.type.a8c = splice_block %.loc10_48.6 { // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] @@ -286,7 +286,7 @@ var a: array(1, 1); // CHECK:STDOUT: %a.patt: %pattern_type.035 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.035 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc7: %DefaultOrUnformed.type = facet_value constants.%array_type, (constants.%DefaultOrUnformed.impl_witness.3c6) [concrete = constants.%DefaultOrUnformed.facet.b2c] // CHECK:STDOUT: %.loc7_29.1: %DefaultOrUnformed.type = converted constants.%array_type, %DefaultOrUnformed.facet.loc7 [concrete = constants.%DefaultOrUnformed.facet.b2c] // CHECK:STDOUT: %as_type.loc7: type = facet_access_type %.loc7_29.1 [concrete = constants.%array_type] @@ -306,7 +306,7 @@ var a: array(1, 1); // CHECK:STDOUT: %b.patt: %pattern_type.8c1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.8c1 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %tuple.type = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %tuple.type = var_storage %b.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc8: %DefaultOrUnformed.type = facet_value constants.%tuple.type, (constants.%DefaultOrUnformed.impl_witness.762) [concrete = constants.%DefaultOrUnformed.facet.38b] // CHECK:STDOUT: %.loc8_29.1: %DefaultOrUnformed.type = converted constants.%tuple.type, %DefaultOrUnformed.facet.loc8 [concrete = constants.%DefaultOrUnformed.facet.38b] // CHECK:STDOUT: %as_type.loc8: type = facet_access_type %.loc8_29.1 [concrete = constants.%tuple.type] @@ -372,7 +372,7 @@ var a: array(1, 1); // CHECK:STDOUT: %t.patt: %pattern_type.fe8 = ref_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: %t.var_patt: %pattern_type.fe8 = var_pattern %t.patt [concrete = constants.%t.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t.var: ref %array_type = var %t.var_patt +// CHECK:STDOUT: %t.var: ref %array_type = var_storage %t.var_patt // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: init %tuple.type = call %F.ref() // CHECK:STDOUT: %.loc8_34.1: ref %tuple.type = temporary_storage @@ -449,7 +449,7 @@ var a: array(1, 1); // CHECK:STDOUT: %b.patt: %pattern_type.3db = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.3db = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %array_type = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %array_type = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc9_19: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %.loc9_15.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %int_9: Core.IntLiteral = int_value 9 [concrete = constants.%int_9] diff --git a/toolchain/check/testdata/array/init_dependent_bound.carbon b/toolchain/check/testdata/array/init_dependent_bound.carbon index c0b10caa9077..b9cd169062e6 100644 --- a/toolchain/check/testdata/array/init_dependent_bound.carbon +++ b/toolchain/check/testdata/array/init_dependent_bound.carbon @@ -117,7 +117,7 @@ fn H() { G(3); } // CHECK:STDOUT: %arr.patt.loc7_17.1: @G.%pattern_type (%pattern_type.bd6) = ref_binding_pattern arr [symbolic = %arr.patt.loc7_17.2 (constants.%arr.patt.770)] // CHECK:STDOUT: %arr.var_patt.loc7_3.1: @G.%pattern_type (%pattern_type.bd6) = var_pattern %arr.patt.loc7_17.1 [symbolic = %arr.var_patt.loc7_3.2 (constants.%arr.var_patt.5fc)] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref @G.%array_type.loc7_29.2 (%array_type.1b3) = var %arr.var_patt.loc7_3.1 +// CHECK:STDOUT: %arr.var: ref @G.%array_type.loc7_29.2 (%array_type.1b3) = var_storage %arr.var_patt.loc7_3.1 // CHECK:STDOUT: %.loc7_34.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_34.2: init @G.%array_type.loc7_29.2 (%array_type.1b3) to %arr.var = array_init () [symbolic = %array (constants.%array.ca4)] // CHECK:STDOUT: %.loc7_3.1: init @G.%array_type.loc7_29.2 (%array_type.1b3) = converted %.loc7_34.1, %.loc7_34.2 [symbolic = %array (constants.%array.ca4)] @@ -224,7 +224,7 @@ fn H() { G(3); } // CHECK:STDOUT: %arr.patt: = ref_binding_pattern arr [concrete = ] // CHECK:STDOUT: %arr.var_patt: = var_pattern %arr.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref = var %arr.var_patt [concrete = ] +// CHECK:STDOUT: %arr.var: ref = var_storage %arr.var_patt [concrete = ] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] diff --git a/toolchain/check/testdata/as/adapter_conversion.carbon b/toolchain/check/testdata/as/adapter_conversion.carbon index 0d81069c94ff..80b1453f580f 100644 --- a/toolchain/check/testdata/as/adapter_conversion.carbon +++ b/toolchain/check/testdata/as/adapter_conversion.carbon @@ -182,7 +182,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %ptr.432: type = ptr_type %B [concrete] // CHECK:STDOUT: %pattern_type.3c8: type = pattern_type %ptr.432 [concrete] // CHECK:STDOUT: %b_ptr.patt: %pattern_type.3c8 = value_binding_pattern b_ptr [concrete] -// CHECK:STDOUT: %a_ref.var: ref %B = var file.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %B = var_storage file.%a_ref.var_patt [concrete] // CHECK:STDOUT: %addr: %ptr.432 = addr_of %a_ref.var [concrete] // CHECK:STDOUT: %b_factory.patt: %pattern_type.e39 = ref_binding_pattern b_factory [concrete] // CHECK:STDOUT: %b_factory.var_patt: %pattern_type.e39 = var_pattern %b_factory.patt [concrete] @@ -206,7 +206,7 @@ var b: B = {.x = ()} as B; // CHECK:STDOUT: %b_factory.patt: %pattern_type.e39 = ref_binding_pattern b_factory [concrete = constants.%b_factory.patt] // CHECK:STDOUT: %b_factory.var_patt: %pattern_type.e39 = var_pattern %b_factory.patt [concrete = constants.%b_factory.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_factory.var: ref %B = var %b_factory.var_patt [concrete] +// CHECK:STDOUT: %b_factory.var: ref %B = var_storage %b_factory.var_patt [concrete] // CHECK:STDOUT: %B.ref.loc25: type = name_ref B, %B.decl [concrete = constants.%B] // CHECK:STDOUT: %b_factory: ref %B = wrapper_binding b_factory, %b_factory.var [concrete = %b_factory.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/as/basics.carbon b/toolchain/check/testdata/as/basics.carbon index cd00fb55c58f..7d54989eee67 100644 --- a/toolchain/check/testdata/as/basics.carbon +++ b/toolchain/check/testdata/as/basics.carbon @@ -271,7 +271,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %b.patt: %pattern_type.3ee = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.3ee = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %tuple.type.359 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %tuple.type.359 = var_storage %b.var_patt // CHECK:STDOUT: %Make.ref.loc20_27: %Make.type = name_ref Make, file.%Make.decl [concrete = constants.%Make] // CHECK:STDOUT: %tuple.elem0: ref %X = tuple_access %b.var, element0 // CHECK:STDOUT: %Make.call.loc20_32: init %X to %tuple.elem0 = call %Make.ref.loc20_27() @@ -357,7 +357,7 @@ let n: {.x: ()} = {.x = ()} as {.x = ()}; // CHECK:STDOUT: %x.patt: %pattern_type.6cb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6cb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %X = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %X = var_storage %x.var_patt // CHECK:STDOUT: %Make.ref: %Make.type = name_ref Make, file.%Make.decl [concrete = constants.%Make] // CHECK:STDOUT: %.loc24: ref %X = splice_block %x.var {} // CHECK:STDOUT: %Make.call: init %X to %.loc24 = call %Make.ref() diff --git a/toolchain/check/testdata/as/const.carbon b/toolchain/check/testdata/as/const.carbon index b40b70135029..4401b2c17b19 100644 --- a/toolchain/check/testdata/as/const.carbon +++ b/toolchain/check/testdata/as/const.carbon @@ -109,8 +109,8 @@ fn Use() { // CHECK:STDOUT: %ptr.faf: type = ptr_type %const [concrete] // CHECK:STDOUT: %pattern_type.7f7: type = pattern_type %ptr.faf [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.7f7 = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %const = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.c2d: %ptr.faf = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %const = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.daa: %ptr.faf = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.7f7 = value_binding_pattern b [concrete] // CHECK:STDOUT: %Destroy.Op.type.1d8f74.3: type = fn_type @Destroy.Op.loc14_3.3 [concrete] // CHECK:STDOUT: %Destroy.Op.1a2547.3: %Destroy.Op.type.1d8f74.3 = struct_value () [concrete] @@ -122,7 +122,7 @@ fn Use() { // CHECK:STDOUT: %i.patt: %pattern_type.dfd = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.dfd = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %const = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %const = var_storage %i.var_patt // CHECK:STDOUT: %Init.ref: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc14_3: ref %const = splice_block %i.var {} // CHECK:STDOUT: %Init.call: init %X to %.loc14_3 = call %Init.ref() @@ -157,7 +157,7 @@ fn Use() { // CHECK:STDOUT: %const.loc16_43: type = const_type %X.ref.loc16_49 [concrete = constants.%const] // CHECK:STDOUT: %.loc16_40.1: ref %const = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc16_40.2: ref %const = converted %reference.ref, %.loc16_40.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.faf = addr_of %.loc16_40.2 [concrete = constants.%addr.c2d] +// CHECK:STDOUT: %addr: %ptr.faf = addr_of %.loc16_40.2 [concrete = constants.%addr.daa] // CHECK:STDOUT: %.loc16_24: type = splice_block %ptr.loc16 [concrete = constants.%ptr.faf] { // CHECK:STDOUT: %X.ref.loc16_23: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %const.loc16_17: type = const_type %X.ref.loc16_23 [concrete = constants.%const] @@ -224,7 +224,7 @@ fn Use() { // CHECK:STDOUT: %i.patt: %pattern_type.6cb = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.6cb = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %X = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %X = var_storage %i.var_patt // CHECK:STDOUT: %Init.ref: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc12_3: ref %X = splice_block %i.var {} // CHECK:STDOUT: %Init.call: init %const to %.loc12_3 = call %Init.ref() @@ -269,8 +269,8 @@ fn Use() { // CHECK:STDOUT: %ptr.db8: type = ptr_type %X [concrete] // CHECK:STDOUT: %pattern_type.990: type = pattern_type %ptr.db8 [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.990 = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %X = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.c0f: %ptr.db8 = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %X = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.0f1: %ptr.db8 = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -283,7 +283,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc11_44: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc11_41.1: ref %X = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc11_41.2: ref %X = converted %reference.ref, %.loc11_41.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc11_41.2 [concrete = constants.%addr.c0f] +// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc11_41.2 [concrete = constants.%addr.0f1] // CHECK:STDOUT: %.loc11_18: type = splice_block %ptr.loc11 [concrete = constants.%ptr.db8] { // CHECK:STDOUT: %X.ref.loc11_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc11: type = ptr_type %X.ref.loc11_17 [concrete = constants.%ptr.db8] diff --git a/toolchain/check/testdata/as/maybe_unformed.carbon b/toolchain/check/testdata/as/maybe_unformed.carbon index f7fc71bb9c92..91f6d8db6564 100644 --- a/toolchain/check/testdata/as/maybe_unformed.carbon +++ b/toolchain/check/testdata/as/maybe_unformed.carbon @@ -145,8 +145,8 @@ fn Use() { // CHECK:STDOUT: %ptr.b8c: type = ptr_type %MaybeUnformed.198 [concrete] // CHECK:STDOUT: %pattern_type.abe: type = pattern_type %ptr.b8c [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.abe = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %MaybeUnformed.198 = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.d37: %ptr.b8c = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %MaybeUnformed.198 = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.1d8: %ptr.b8c = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.abe = value_binding_pattern b [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -173,7 +173,7 @@ fn Use() { // CHECK:STDOUT: %MaybeUnformed.loc12_77: type = class_type @MaybeUnformed, @MaybeUnformed(constants.%X) [concrete = constants.%MaybeUnformed.198] // CHECK:STDOUT: %.loc12_54.1: ref %MaybeUnformed.198 = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc12_54.2: ref %MaybeUnformed.198 = converted %reference.ref, %.loc12_54.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.b8c = addr_of %.loc12_54.2 [concrete = constants.%addr.d37] +// CHECK:STDOUT: %addr: %ptr.b8c = addr_of %.loc12_54.2 [concrete = constants.%addr.1d8] // CHECK:STDOUT: %.loc12_38: type = splice_block %ptr.loc12 [concrete = constants.%ptr.b8c] { // CHECK:STDOUT: %Core.ref.loc12_17: = name_ref Core, imports.%Core [concrete = imports.%Core] // CHECK:STDOUT: %MaybeUnformed.ref.loc12_21: %MaybeUnformed.type = name_ref MaybeUnformed, imports.%Core.MaybeUnformed [concrete = constants.%MaybeUnformed.generic] @@ -251,7 +251,7 @@ fn Use() { // CHECK:STDOUT: %i.patt: %pattern_type.009 = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.009 = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %MaybeUnformed.198 = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %MaybeUnformed.198 = var_storage %i.var_patt // CHECK:STDOUT: %Init.ref: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc19_46: ref %X = temporary_storage // CHECK:STDOUT: %Init.call: init %X to %.loc19_46 = call %Init.ref() @@ -322,8 +322,8 @@ fn Use() { // CHECK:STDOUT: %ptr.db8: type = ptr_type %X [concrete] // CHECK:STDOUT: %pattern_type.990: type = pattern_type %ptr.db8 [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.990 = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %X = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.8ef: %ptr.db8 = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %X = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.5ed: %ptr.db8 = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -345,7 +345,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc14_44: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc14_41.1: ref %X = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc14_41.2: ref %X = converted %reference.ref, %.loc14_41.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc14_41.2 [concrete = constants.%addr.8ef] +// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc14_41.2 [concrete = constants.%addr.5ed] // CHECK:STDOUT: %.loc14_18: type = splice_block %ptr.loc14 [concrete = constants.%ptr.db8] { // CHECK:STDOUT: %X.ref.loc14_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc14: type = ptr_type %X.ref.loc14_17 [concrete = constants.%ptr.db8] diff --git a/toolchain/check/testdata/as/partial.carbon b/toolchain/check/testdata/as/partial.carbon index 40c815cba738..567cbce69d36 100644 --- a/toolchain/check/testdata/as/partial.carbon +++ b/toolchain/check/testdata/as/partial.carbon @@ -123,8 +123,8 @@ fn Use() { // CHECK:STDOUT: %ptr.44a: type = ptr_type %.d74 [concrete] // CHECK:STDOUT: %pattern_type.12c: type = pattern_type %ptr.44a [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.12c = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %.d74 = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.b93: %ptr.44a = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %.d74 = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.3a0: %ptr.44a = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.12c = value_binding_pattern b [concrete] // CHECK:STDOUT: %Destroy.Op.type.1d8f74.2: type = fn_type @Destroy.Op.loc14_3.2 [concrete] // CHECK:STDOUT: %Destroy.Op.1a2547.2: %Destroy.Op.type.1d8f74.2 = struct_value () [concrete] @@ -136,7 +136,7 @@ fn Use() { // CHECK:STDOUT: %i.patt: %pattern_type.53b = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.53b = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %.d74 = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %.d74 = var_storage %i.var_patt // CHECK:STDOUT: %Init.ref: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc14_3: ref %.d74 = splice_block %i.var {} // CHECK:STDOUT: %Init.call: init %X to %.loc14_3 = call %Init.ref() @@ -171,7 +171,7 @@ fn Use() { // CHECK:STDOUT: %.loc16_45: type = partial_type %X.ref.loc16_53 [concrete = constants.%.d74] // CHECK:STDOUT: %.loc16_42.1: ref %.d74 = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc16_42.2: ref %.d74 = converted %reference.ref, %.loc16_42.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.44a = addr_of %.loc16_42.2 [concrete = constants.%addr.b93] +// CHECK:STDOUT: %addr: %ptr.44a = addr_of %.loc16_42.2 [concrete = constants.%addr.3a0] // CHECK:STDOUT: %.loc16_26: type = splice_block %ptr.loc16 [concrete = constants.%ptr.44a] { // CHECK:STDOUT: %X.ref.loc16_25: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc16_17: type = partial_type %X.ref.loc16_25 [concrete = constants.%.d74] @@ -236,7 +236,7 @@ fn Use() { // CHECK:STDOUT: %i.patt: %pattern_type.6cb = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.6cb = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %X = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %X = var_storage %i.var_patt // CHECK:STDOUT: %Init.ref.loc10: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc10_3.1: ref %X = splice_block %i.var {} // CHECK:STDOUT: %Init.call.loc10: init %.d74 to %.loc10_3.1 = call %Init.ref.loc10() @@ -249,7 +249,7 @@ fn Use() { // CHECK:STDOUT: %j.patt: %pattern_type.6cb = ref_binding_pattern j [concrete = constants.%j.patt] // CHECK:STDOUT: %j.var_patt: %pattern_type.6cb = var_pattern %j.patt [concrete = constants.%j.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %j.var: ref %X = var %j.var_patt +// CHECK:STDOUT: %j.var: ref %X = var_storage %j.var_patt // CHECK:STDOUT: %Init.ref.loc11: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc11_3: ref %X = splice_block %j.var {} // CHECK:STDOUT: %Init.call.loc11: init %.d74 to %.loc11_3 = call %Init.ref.loc11() @@ -263,7 +263,7 @@ fn Use() { // CHECK:STDOUT: %k.patt: %pattern_type.6cb = ref_binding_pattern k [concrete = constants.%k.patt] // CHECK:STDOUT: %k.var_patt: %pattern_type.6cb = var_pattern %k.patt [concrete = constants.%k.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %k.var: ref %X = var %k.var_patt +// CHECK:STDOUT: %k.var: ref %X = var_storage %k.var_patt // CHECK:STDOUT: %Init.ref.loc12: %Init.type = name_ref Init, file.%Init.decl [concrete = constants.%Init] // CHECK:STDOUT: %.loc12_3: ref %X = splice_block %k.var {} // CHECK:STDOUT: %Init.call.loc12: init %.d74 to %.loc12_3 = call %Init.ref.loc12() @@ -300,8 +300,8 @@ fn Use() { // CHECK:STDOUT: %ptr.db8: type = ptr_type %X [concrete] // CHECK:STDOUT: %pattern_type.990: type = pattern_type %ptr.db8 [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.990 = value_binding_pattern a [concrete] -// CHECK:STDOUT: %reference.var: ref %X = var file.%reference.var_patt [concrete] -// CHECK:STDOUT: %addr.433: %ptr.db8 = addr_of %reference.var [concrete] +// CHECK:STDOUT: %reference.var: ref %X = var_storage file.%reference.var_patt [concrete] +// CHECK:STDOUT: %addr.fd9: %ptr.db8 = addr_of %reference.var [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.990 = value_binding_pattern b [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -323,7 +323,7 @@ fn Use() { // CHECK:STDOUT: %X.ref.loc15_44: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %.loc15_41.1: ref %X = as_compatible %reference.ref [concrete = constants.%reference.var] // CHECK:STDOUT: %.loc15_41.2: ref %X = converted %reference.ref, %.loc15_41.1 [concrete = constants.%reference.var] -// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc15_41.2 [concrete = constants.%addr.433] +// CHECK:STDOUT: %addr: %ptr.db8 = addr_of %.loc15_41.2 [concrete = constants.%addr.fd9] // CHECK:STDOUT: %.loc15_18: type = splice_block %ptr.loc15 [concrete = constants.%ptr.db8] { // CHECK:STDOUT: %X.ref.loc15_17: type = name_ref X, file.%X.decl [concrete = constants.%X] // CHECK:STDOUT: %ptr.loc15: type = ptr_type %X.ref.loc15_17 [concrete = constants.%ptr.db8] diff --git a/toolchain/check/testdata/as/var_init.carbon b/toolchain/check/testdata/as/var_init.carbon index ade1015be8b2..a125223cd021 100644 --- a/toolchain/check/testdata/as/var_init.carbon +++ b/toolchain/check/testdata/as/var_init.carbon @@ -55,7 +55,7 @@ fn Convert(unused t: ()) { // CHECK:STDOUT: %x.patt: %pattern_type.6cb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6cb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %X = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %X = var_storage %x.var_patt // CHECK:STDOUT: %.loc12_22.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %impl.elem0: %.ce8 = impl_witness_access constants.%ImplicitAs.impl_witness, element0 [concrete = constants.%empty_tuple.type.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method: = bound_method %.loc12_22.1, %impl.elem0 [concrete = constants.%empty_tuple.type.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon index fd06f6c3c906..8498d65beee6 100644 --- a/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon +++ b/toolchain/check/testdata/basics/dump_sem_ir_ranges.carbon @@ -147,7 +147,7 @@ library "[[@TEST_NAME]]"; // CHECK:STDOUT: %c.patt: %pattern_type.cb1 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.cb1 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var_storage %c.var_patt // CHECK:STDOUT: %.loc18_16.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_16.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_3: init %empty_tuple.type = converted %.loc18_16.1, %.loc18_16.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon index eae42d00ce6b..54365b3bf5af 100644 --- a/toolchain/check/testdata/basics/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/basics/duplicate_name_same_line.carbon @@ -43,7 +43,7 @@ fn A() { // CHECK:STDOUT: %n.patt.loc18_17: %pattern_type.cb1 = ref_binding_pattern n [concrete = constants.%n.patt.785a0d.1] // CHECK:STDOUT: %n.var_patt.loc18_5: %pattern_type.cb1 = var_pattern %n.patt.loc18_17 [concrete = constants.%n.var_patt.961036.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var.loc18_5: ref %empty_tuple.type = var %n.var_patt.loc18_5 +// CHECK:STDOUT: %n.var.loc18_5: ref %empty_tuple.type = var_storage %n.var_patt.loc18_5 // CHECK:STDOUT: %.loc18_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_25.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_5: init %empty_tuple.type = converted %.loc18_25.1, %.loc18_25.2 [concrete = constants.%empty_tuple] @@ -60,7 +60,7 @@ fn A() { // CHECK:STDOUT: %n.patt.loc18_49: %pattern_type.cb1 = ref_binding_pattern n [concrete = constants.%n.patt.785a0d.2] // CHECK:STDOUT: %n.var_patt.loc18_37: %pattern_type.cb1 = var_pattern %n.patt.loc18_49 [concrete = constants.%n.var_patt.961036.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var.loc18_37: ref %empty_tuple.type = var %n.var_patt.loc18_37 +// CHECK:STDOUT: %n.var.loc18_37: ref %empty_tuple.type = var_storage %n.var_patt.loc18_37 // CHECK:STDOUT: %.loc18_57.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_57.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc18_37: init %empty_tuple.type = converted %.loc18_57.1, %.loc18_57.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index deef98d4c127..b63d234c13cf 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -73,14 +73,14 @@ var b: i32 = ((2)); // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc14: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/builtins/bool/eq.carbon b/toolchain/check/testdata/builtins/bool/eq.carbon index b75f883e98b4..c929564f8af1 100644 --- a/toolchain/check/testdata/builtins/bool/eq.carbon +++ b/toolchain/check/testdata/builtins/bool/eq.carbon @@ -65,7 +65,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: %a.patt: %pattern_type.2ef = ref_binding_pattern a [concrete = constants.%a.patt.8de] // CHECK:STDOUT: %a.var_patt: %pattern_type.2ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %C.ac4 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %C.ac4 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc12_24.1: type = splice_block %C.loc12 [concrete = constants.%C.ac4] { // CHECK:STDOUT: %C.ref.loc12: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %Eq.ref.loc12: %Eq.type = name_ref Eq, %Eq.decl [concrete = constants.%Eq] @@ -121,7 +121,7 @@ var d: C(false == false) = True(); // CHECK:STDOUT: %a.patt: %pattern_type.2ef = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.2ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %C.ac4 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %C.ac4 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc10_22.1: type = splice_block %C.loc10 [concrete = constants.%C.ac4] { // CHECK:STDOUT: %C.ref.loc10: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %true.loc10_10: bool = bool_literal true [concrete = constants.%true] diff --git a/toolchain/check/testdata/builtins/bool/neq.carbon b/toolchain/check/testdata/builtins/bool/neq.carbon index 882b37fc2899..3a84db3266af 100644 --- a/toolchain/check/testdata/builtins/bool/neq.carbon +++ b/toolchain/check/testdata/builtins/bool/neq.carbon @@ -66,7 +66,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: %a.patt: %pattern_type.794 = ref_binding_pattern a [concrete = constants.%a.patt.c70] // CHECK:STDOUT: %a.var_patt: %pattern_type.794 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %C.4b2 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %C.4b2 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc12_25.1: type = splice_block %C.loc12 [concrete = constants.%C.4b2] { // CHECK:STDOUT: %C.ref.loc12: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %Neq.ref.loc12: %Neq.type = name_ref Neq, %Neq.decl [concrete = constants.%Neq] @@ -123,7 +123,7 @@ var d: C(false != false) = False(); // CHECK:STDOUT: %a.patt: %pattern_type.794 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.794 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %C.4b2 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %C.4b2 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc10_22.1: type = splice_block %C.loc10 [concrete = constants.%C.4b2] { // CHECK:STDOUT: %C.ref.loc10: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %true.loc10_10: bool = bool_literal true [concrete = constants.%true] diff --git a/toolchain/check/testdata/builtins/no_op.carbon b/toolchain/check/testdata/builtins/no_op.carbon index 4c7a4604c24a..4cc83d44920e 100644 --- a/toolchain/check/testdata/builtins/no_op.carbon +++ b/toolchain/check/testdata/builtins/no_op.carbon @@ -134,7 +134,7 @@ fn NoOp() -> {} = "no_op"; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc7_9.1: type = splice_block %.loc7_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc7_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_9.3: type = converted %.loc7_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/class/abstract/abstract.carbon b/toolchain/check/testdata/class/abstract/abstract.carbon index f60b13b7661f..73a87c4cef8a 100644 --- a/toolchain/check/testdata/class/abstract/abstract.carbon +++ b/toolchain/check/testdata/class/abstract/abstract.carbon @@ -330,7 +330,7 @@ fn Assign(ref a: Abstract) { // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [concrete = constants.%Abstract] // CHECK:STDOUT: %v: = wrapper_binding v, [concrete = ] diff --git a/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon b/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon index 27a1f885f9eb..e396f70b3a04 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_struct.carbon @@ -171,7 +171,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: %.loc12: type = splice_block %struct_type.m2 [concrete = constants.%struct_type.m2.bb3] { // CHECK:STDOUT: %Abstract2.ref: type = name_ref Abstract2, %Abstract2.decl [concrete = constants.%Abstract2] // CHECK:STDOUT: %struct_type.m2: type = struct_type {.m2: %Abstract2} [concrete = constants.%struct_type.m2.bb3] @@ -272,7 +272,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %v2.patt: = ref_binding_pattern v2 [concrete = ] // CHECK:STDOUT: %v2.var_patt: = var_pattern %v2.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2.var: ref = var %v2.var_patt [concrete = ] +// CHECK:STDOUT: %v2.var: ref = var_storage %v2.var_patt [concrete = ] // CHECK:STDOUT: %.loc13: type = splice_block %struct_type.m4.m5 [concrete = constants.%struct_type.m4.m5.5e1] { // CHECK:STDOUT: %Abstract4.ref: type = name_ref Abstract4, %Abstract4.decl [concrete = constants.%Abstract4] // CHECK:STDOUT: %Abstract5.ref: type = name_ref Abstract5, %Abstract5.decl [concrete = constants.%Abstract5] @@ -324,7 +324,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %v3.patt: = ref_binding_pattern v3 [concrete = ] // CHECK:STDOUT: %v3.var_patt: = var_pattern %v3.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v3.var: ref = var %v3.var_patt [concrete = ] +// CHECK:STDOUT: %v3.var: ref = var_storage %v3.var_patt [concrete = ] // CHECK:STDOUT: %.loc12_33: type = splice_block %struct_type.m6.c1 [concrete = constants.%struct_type.m6.c1.a63] { // CHECK:STDOUT: %Abstract6.ref: type = name_ref Abstract6, %Abstract6.decl [concrete = constants.%Abstract6] // CHECK:STDOUT: %.loc12_32.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -369,7 +369,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %v4.patt: = ref_binding_pattern v4 [concrete = ] // CHECK:STDOUT: %v4.var_patt: = var_pattern %v4.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v4.var: ref = var %v4.var_patt [concrete = ] +// CHECK:STDOUT: %v4.var: ref = var_storage %v4.var_patt [concrete = ] // CHECK:STDOUT: %.loc12_33: type = splice_block %struct_type.c2.m7 [concrete = constants.%struct_type.c2.m7.518] { // CHECK:STDOUT: %.loc12_16.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_16.2: type = converted %.loc12_16.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -441,7 +441,7 @@ var v5: {.m: Abstract}; // CHECK:STDOUT: %v5.patt: = ref_binding_pattern v5 [concrete = ] // CHECK:STDOUT: %v5.var_patt: = var_pattern %v5.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v5.var: ref = var %v5.var_patt [concrete = ] +// CHECK:STDOUT: %v5.var: ref = var_storage %v5.var_patt [concrete = ] // CHECK:STDOUT: %.loc13: type = splice_block %struct_type.m [concrete = constants.%struct_type.m.b92] { // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, imports.%Main.Abstract [concrete = constants.%Abstract] // CHECK:STDOUT: %struct_type.m: type = struct_type {.m: %Abstract} [concrete = constants.%struct_type.m.b92] diff --git a/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon b/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon index 214cb20c9108..a90805f11a48 100644 --- a/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon +++ b/toolchain/check/testdata/class/abstract/fail_abstract_in_tuple.carbon @@ -219,7 +219,7 @@ fn Var5() { // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: %.loc13_28.1: type = splice_block %.loc13_28.3 [concrete = constants.%tuple.type.ea9] { // CHECK:STDOUT: %Abstract2.ref: type = name_ref Abstract2, file.%Abstract2.decl [concrete = constants.%Abstract2] @@ -358,7 +358,7 @@ fn Var5() { // CHECK:STDOUT: %v2.patt: = ref_binding_pattern v2 [concrete = ] // CHECK:STDOUT: %v2.var_patt: = var_pattern %v2.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2.var: ref = var %v2.var_patt [concrete = ] +// CHECK:STDOUT: %v2.var: ref = var_storage %v2.var_patt [concrete = ] // CHECK:STDOUT: assign %v2.var, // CHECK:STDOUT: %.loc14_39.1: type = splice_block %.loc14_39.3 [concrete = constants.%tuple.type.417] { // CHECK:STDOUT: %Abstract4.ref: type = name_ref Abstract4, file.%Abstract4.decl [concrete = constants.%Abstract4] @@ -419,7 +419,7 @@ fn Var5() { // CHECK:STDOUT: %v3.patt: = ref_binding_pattern v3 [concrete = ] // CHECK:STDOUT: %v3.var_patt: = var_pattern %v3.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v3.var: ref = var %v3.var_patt [concrete = ] +// CHECK:STDOUT: %v3.var: ref = var_storage %v3.var_patt [concrete = ] // CHECK:STDOUT: assign %v3.var, // CHECK:STDOUT: %.loc13_32.1: type = splice_block %.loc13_32.4 [concrete = constants.%tuple.type.427] { // CHECK:STDOUT: %Abstract6.ref: type = name_ref Abstract6, file.%Abstract6.decl [concrete = constants.%Abstract6] @@ -481,7 +481,7 @@ fn Var5() { // CHECK:STDOUT: %v4.patt: = ref_binding_pattern v4 [concrete = ] // CHECK:STDOUT: %v4.var_patt: = var_pattern %v4.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v4.var: ref = var %v4.var_patt [concrete = ] +// CHECK:STDOUT: %v4.var: ref = var_storage %v4.var_patt [concrete = ] // CHECK:STDOUT: assign %v4.var, // CHECK:STDOUT: %.loc13_32.1: type = splice_block %.loc13_32.4 [concrete = constants.%tuple.type.9db] { // CHECK:STDOUT: %.loc13_20: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -576,7 +576,7 @@ fn Var5() { // CHECK:STDOUT: %v5.patt: = ref_binding_pattern v5 [concrete = ] // CHECK:STDOUT: %v5.var_patt: = var_pattern %v5.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v5.var: ref = var %v5.var_patt [concrete = ] +// CHECK:STDOUT: %v5.var: ref = var_storage %v5.var_patt [concrete = ] // CHECK:STDOUT: assign %v5.var, // CHECK:STDOUT: %.loc14_28.1: type = splice_block %.loc14_28.3 [concrete = constants.%tuple.type.763] { // CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, imports.%Main.Abstract [concrete = constants.%Abstract] diff --git a/toolchain/check/testdata/class/access/import_access.carbon b/toolchain/check/testdata/class/access/import_access.carbon index 0079649ab87a..8bd896277a3a 100644 --- a/toolchain/check/testdata/class/access/import_access.carbon +++ b/toolchain/check/testdata/class/access/import_access.carbon @@ -232,7 +232,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Def = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %Def = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %Def.ref: type = name_ref Def, imports.%Test.Def [concrete = constants.%Def] // CHECK:STDOUT: %c: ref %Def = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -270,7 +270,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] // CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } @@ -306,7 +306,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %Def.ref: = name_ref Def, [concrete = ] @@ -351,7 +351,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %ForwardWithDef = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %ForwardWithDef = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %ForwardWithDef.ref: type = name_ref ForwardWithDef, imports.%Test.ForwardWithDef [concrete = constants.%ForwardWithDef] // CHECK:STDOUT: %c: ref %ForwardWithDef = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -389,7 +389,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] // CHECK:STDOUT: %c: = wrapper_binding c, [concrete = ] // CHECK:STDOUT: } @@ -425,7 +425,7 @@ private class Redecl {} // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Test.ref: = name_ref Test, imports.%Test [concrete = imports.%Test] // CHECK:STDOUT: %ForwardWithDef.ref: = name_ref ForwardWithDef, [concrete = ] diff --git a/toolchain/check/testdata/class/adapter/adapt_copy.carbon b/toolchain/check/testdata/class/adapter/adapt_copy.carbon index 10c0d8c42edd..0334c3f4d68a 100644 --- a/toolchain/check/testdata/class/adapter/adapt_copy.carbon +++ b/toolchain/check/testdata/class/adapter/adapt_copy.carbon @@ -289,7 +289,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %d.patt: %pattern_type.3b9 = ref_binding_pattern d [concrete = constants.%d.patt.467] // CHECK:STDOUT: %d.var_patt: %pattern_type.3b9 = var_pattern %d.patt [concrete = constants.%d.var_patt.b13] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %AdaptCopyable = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %AdaptCopyable = var_storage %d.var_patt // CHECK:STDOUT: %c.ref: %AdaptCopyable = name_ref c, %c // CHECK:STDOUT: assign %d.var, // CHECK:STDOUT: %AdaptCopyable.ref.loc16: type = name_ref AdaptCopyable, file.%AdaptCopyable.decl [concrete = constants.%AdaptCopyable] @@ -319,7 +319,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %d.patt: %pattern_type.c42 = ref_binding_pattern d [concrete = constants.%d.patt.e01] // CHECK:STDOUT: %d.var_patt: %pattern_type.c42 = var_pattern %d.patt [concrete = constants.%d.var_patt.d22] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %tuple.type.28f = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %tuple.type.28f = var_storage %d.var_patt // CHECK:STDOUT: %c.ref: %tuple.type.28f = name_ref c, %c // CHECK:STDOUT: %tuple.elem0.loc35: %AdaptCopyable = tuple_access %c.ref, element0 // CHECK:STDOUT: assign %d.var, @@ -502,7 +502,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %d.patt: %pattern_type.ea1 = ref_binding_pattern d [concrete = constants.%d.patt.bc4] // CHECK:STDOUT: %d.var_patt: %pattern_type.ea1 = var_pattern %d.patt [concrete = constants.%d.var_patt.69e] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %AdaptTuple = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %AdaptTuple = var_storage %d.var_patt // CHECK:STDOUT: %c.ref: %AdaptTuple = name_ref c, %c // CHECK:STDOUT: %.loc9_3.1: %tuple.type.e55 = as_compatible %c.ref // CHECK:STDOUT: %tuple.elem0.loc9_3.1: %i32 = tuple_access %.loc9_3.1, element0 @@ -580,7 +580,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %d.patt: %pattern_type.996 = ref_binding_pattern d [concrete = constants.%d.patt.be1] // CHECK:STDOUT: %d.var_patt: %pattern_type.996 = var_pattern %d.patt [concrete = constants.%d.var_patt.898] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %tuple.type.e88 = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %tuple.type.e88 = var_storage %d.var_patt // CHECK:STDOUT: %c.ref: %tuple.type.e88 = name_ref c, %c // CHECK:STDOUT: %tuple.elem0.loc14_30.1: %AdaptTuple = tuple_access %c.ref, element0 // CHECK:STDOUT: %.loc14_30.1: %tuple.type.e55 = as_compatible %tuple.elem0.loc14_30.1 @@ -763,7 +763,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %b.patt: %pattern_type.d14 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.d14 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %AdaptNoncopyable = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %AdaptNoncopyable = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: %AdaptNoncopyable = name_ref a, %a // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: %AdaptNoncopyable.ref.loc20: type = name_ref AdaptNoncopyable, file.%AdaptNoncopyable.decl [concrete = constants.%AdaptNoncopyable] @@ -900,7 +900,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %b.patt: %pattern_type.be3 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.be3 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %AdaptNoncopyableIndirect = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %AdaptNoncopyableIndirect = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: %AdaptNoncopyableIndirect = name_ref a, %a // CHECK:STDOUT: %.loc23_3.1: %tuple.type.227 = as_compatible %a.ref // CHECK:STDOUT: %tuple.elem0.loc23_3.1: %i32 = tuple_access %.loc23_3.1, element0 @@ -1109,7 +1109,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %h.patt: %pattern_type.27f = ref_binding_pattern h [concrete = constants.%h.patt] // CHECK:STDOUT: %h.var_patt: %pattern_type.27f = var_pattern %h.patt [concrete = constants.%h.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %h.var: ref %AdaptStruct = var %h.var_patt +// CHECK:STDOUT: %h.var: ref %AdaptStruct = var_storage %h.var_patt // CHECK:STDOUT: %g.ref: %AdaptStruct = name_ref g, %g // CHECK:STDOUT: %.loc9_3.1: %struct_type.e.f = as_compatible %g.ref // CHECK:STDOUT: %.loc9_3.2: %i32 = struct_access %.loc9_3.1, element0 @@ -1187,7 +1187,7 @@ fn InTuple(c: (AdaptStruct, u32)) -> (AdaptStruct, u32) { // CHECK:STDOUT: %d.patt: %pattern_type.418 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.418 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %tuple.type.e00 = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %tuple.type.e00 = var_storage %d.var_patt // CHECK:STDOUT: %c.ref: %tuple.type.e00 = name_ref c, %c // CHECK:STDOUT: %tuple.elem0.loc14_31.1: %AdaptStruct = tuple_access %c.ref, element0 // CHECK:STDOUT: %.loc14_31.1: %struct_type.e.f = as_compatible %tuple.elem0.loc14_31.1 diff --git a/toolchain/check/testdata/class/adapter/init_adapt.carbon b/toolchain/check/testdata/class/adapter/init_adapt.carbon index 2d1b76ee2508..d6f2fe48157f 100644 --- a/toolchain/check/testdata/class/adapter/init_adapt.carbon +++ b/toolchain/check/testdata/class/adapter/init_adapt.carbon @@ -241,14 +241,14 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %d.patt: %pattern_type.720 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.720 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %AdaptC = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %AdaptC = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %AdaptC.ref.loc23: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] // CHECK:STDOUT: %d: ref %AdaptC = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.98b = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.98b = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %C = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %C = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc25: type = name_ref C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: %e: ref %C = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } @@ -457,14 +457,14 @@ var e: C = MakeAdaptC(); // CHECK:STDOUT: %d.patt: %pattern_type.720 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.720 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %AdaptC = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %AdaptC = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %AdaptC.ref.loc46: type = name_ref AdaptC, %AdaptC.decl [concrete = constants.%AdaptC] // CHECK:STDOUT: %d: ref %AdaptC = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %e.patt: %pattern_type.98b = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.98b = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %C = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %C = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc55: type = name_ref C, %C.decl [concrete = constants.%C] // CHECK:STDOUT: %e: ref %C = wrapper_binding e, %e.var [concrete = %e.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/cross_package_import.carbon b/toolchain/check/testdata/class/cross_package_import.carbon index 60cefddeda27..628a5dc10478 100644 --- a/toolchain/check/testdata/class/cross_package_import.carbon +++ b/toolchain/check/testdata/class/cross_package_import.carbon @@ -227,7 +227,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -283,7 +283,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: %.loc14: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -340,7 +340,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -404,7 +404,7 @@ var c: Other.C = {}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] diff --git a/toolchain/check/testdata/class/destroy_calls.carbon b/toolchain/check/testdata/class/destroy_calls.carbon index aef9f151ba13..be1805c6f371 100644 --- a/toolchain/check/testdata/class/destroy_calls.carbon +++ b/toolchain/check/testdata/class/destroy_calls.carbon @@ -130,7 +130,7 @@ fn G() { F({}); } // CHECK:STDOUT: %a.patt: %pattern_type.9ef = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.9ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt // CHECK:STDOUT: %.loc10_22.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_22.2: init %A to %a.var = class_init () [concrete = constants.%A.val] // CHECK:STDOUT: %.loc10_3: init %A = converted %.loc10_22.1, %.loc10_22.2 [concrete = constants.%A.val] @@ -141,7 +141,7 @@ fn G() { F({}); } // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %B = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %B = var_storage %b.var_patt // CHECK:STDOUT: %.loc11_22.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc11_22.2: init %B to %b.var = class_init () [concrete = constants.%B.val] // CHECK:STDOUT: %.loc11_3: init %B = converted %.loc11_22.1, %.loc11_22.2 [concrete = constants.%B.val] @@ -152,7 +152,7 @@ fn G() { F({}); } // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %.loc12_22.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc12_22.2: init %C to %c.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc12_3: init %C = converted %.loc12_22.1, %.loc12_22.2 [concrete = constants.%C.val] @@ -227,7 +227,7 @@ fn G() { F({}); } // CHECK:STDOUT: %a.patt: %pattern_type.9ef = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.9ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt // CHECK:STDOUT: %.loc10_22.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_22.2: init %A to %a.var = class_init () [concrete = constants.%A.val] // CHECK:STDOUT: %.loc10_3: init %A = converted %.loc10_22.1, %.loc10_22.2 [concrete = constants.%A.val] @@ -238,7 +238,7 @@ fn G() { F({}); } // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %B = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %B = var_storage %b.var_patt // CHECK:STDOUT: %.loc11_22.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc11_22.2: init %B to %b.var = class_init () [concrete = constants.%B.val] // CHECK:STDOUT: %.loc11_3: init %B = converted %.loc11_22.1, %.loc11_22.2 [concrete = constants.%B.val] @@ -253,7 +253,7 @@ fn G() { F({}); } // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %.loc13_24.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc13_24.2: init %C to %c.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc13_5: init %C = converted %.loc13_24.1, %.loc13_24.2 [concrete = constants.%C.val] @@ -390,7 +390,7 @@ fn G() { F({}); } // CHECK:STDOUT: %a.patt: %pattern_type.6fa = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6fa = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %D.dee = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %D.dee = var_storage %a.var_patt // CHECK:STDOUT: %.loc9_25.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_25.2: init %D.dee to %a.var = class_init () [concrete = constants.%D.val] // CHECK:STDOUT: %.loc9_3: init %D.dee = converted %.loc9_25.1, %.loc9_25.2 [concrete = constants.%D.val] @@ -491,7 +491,7 @@ fn G() { F({}); } // CHECK:STDOUT: %v.patt.loc7_15.1: @F.%pattern_type (%pattern_type.ebe) = ref_binding_pattern v [template = %v.patt.loc7_15.2 (constants.%v.patt.f9d)] // CHECK:STDOUT: %v.var_patt.loc7_3.1: @F.%pattern_type (%pattern_type.ebe) = var_pattern %v.patt.loc7_15.1 [template = %v.var_patt.loc7_3.2 (constants.%v.var_patt.ca3)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref @F.%C.loc7_20.2 (%C.1d0) = var %v.var_patt.loc7_3.1 +// CHECK:STDOUT: %v.var: ref @F.%C.loc7_20.2 (%C.1d0) = var_storage %v.var_patt.loc7_3.1 // CHECK:STDOUT: %.loc7_25.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_25.2: init @F.%C.loc7_20.2 (%C.1d0) to %v.var = class_init () [template = %C.val (constants.%C.val.d4f)] // CHECK:STDOUT: %.loc7_3.1: init @F.%C.loc7_20.2 (%C.1d0) = converted %.loc7_25.1, %.loc7_25.2 [template = %C.val (constants.%C.val.d4f)] diff --git a/toolchain/check/testdata/class/export_name.carbon b/toolchain/check/testdata/class/export_name.carbon index 1399d1950d06..8068dd242e4a 100644 --- a/toolchain/check/testdata/class/export_name.carbon +++ b/toolchain/check/testdata/class/export_name.carbon @@ -123,7 +123,7 @@ var c: C = {}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field/field_access.carbon b/toolchain/check/testdata/class/field/field_access.carbon index 21938baa08f4..3abe4cf4ae2a 100644 --- a/toolchain/check/testdata/class/field/field_access.carbon +++ b/toolchain/check/testdata/class/field/field_access.carbon @@ -148,7 +148,7 @@ fn Run() { // CHECK:STDOUT: %c.patt: %pattern_type.f15 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.f15 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Class = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %Class = var_storage %c.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Class, (constants.%DefaultOrUnformed.impl_witness.4e8) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc21_15.1: %DefaultOrUnformed.type = converted constants.%Class, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc21_15.1 [concrete = constants.%Class] @@ -185,7 +185,7 @@ fn Run() { // CHECK:STDOUT: %cj.patt: %pattern_type.6b6 = ref_binding_pattern cj [concrete = constants.%cj.patt] // CHECK:STDOUT: %cj.var_patt: %pattern_type.6b6 = var_pattern %cj.patt [concrete = constants.%cj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %cj.var: ref %i32 = var %cj.var_patt +// CHECK:STDOUT: %cj.var: ref %i32 = var_storage %cj.var_patt // CHECK:STDOUT: %c.ref.loc24: ref %Class = name_ref c, %c // CHECK:STDOUT: %j.ref.loc24: %Class.elem = name_ref j, @Class.%.loc16 [concrete = @Class.%.loc16] // CHECK:STDOUT: %.loc24_25.1: ref %i32 = class_element_access %c.ref.loc24, element0 @@ -202,7 +202,7 @@ fn Run() { // CHECK:STDOUT: %ck.patt: %pattern_type.6b6 = ref_binding_pattern ck [concrete = constants.%ck.patt] // CHECK:STDOUT: %ck.var_patt: %pattern_type.6b6 = var_pattern %ck.patt [concrete = constants.%ck.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ck.var: ref %i32 = var %ck.var_patt +// CHECK:STDOUT: %ck.var: ref %i32 = var_storage %ck.var_patt // CHECK:STDOUT: %c.ref.loc25: ref %Class = name_ref c, %c // CHECK:STDOUT: %k.ref.loc25: %Class.elem = name_ref k, @Class.%.loc17 [concrete = @Class.%.loc17] // CHECK:STDOUT: %.loc25_25.1: ref %i32 = class_element_access %c.ref.loc25, element1 diff --git a/toolchain/check/testdata/class/field/field_access_in_value.carbon b/toolchain/check/testdata/class/field/field_access_in_value.carbon index 3263c60066f6..ab1870561e60 100644 --- a/toolchain/check/testdata/class/field/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field/field_access_in_value.carbon @@ -150,7 +150,7 @@ fn Test() { // CHECK:STDOUT: %cv.patt: %pattern_type.f15 = ref_binding_pattern cv [concrete = constants.%cv.patt] // CHECK:STDOUT: %cv.var_patt: %pattern_type.f15 = var_pattern %cv.patt [concrete = constants.%cv.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %cv.var: ref %Class = var %cv.var_patt +// CHECK:STDOUT: %cv.var: ref %Class = var_storage %cv.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Class, (constants.%DefaultOrUnformed.impl_witness.4e8) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc21_16.1: %DefaultOrUnformed.type = converted constants.%Class, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc21_16.1 [concrete = constants.%Class] @@ -194,7 +194,7 @@ fn Test() { // CHECK:STDOUT: %cj.patt: %pattern_type.6b6 = ref_binding_pattern cj [concrete = constants.%cj.patt] // CHECK:STDOUT: %cj.var_patt: %pattern_type.6b6 = var_pattern %cj.patt [concrete = constants.%cj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %cj.var: ref %i32 = var %cj.var_patt +// CHECK:STDOUT: %cj.var: ref %i32 = var_storage %cj.var_patt // CHECK:STDOUT: %c.ref.loc25: %Class = name_ref c, %c // CHECK:STDOUT: %j.ref.loc25: %Class.elem = name_ref j, @Class.%.loc16 [concrete = @Class.%.loc16] // CHECK:STDOUT: %.loc25_25.1: ref %i32 = class_element_access %c.ref.loc25, element0 @@ -211,7 +211,7 @@ fn Test() { // CHECK:STDOUT: %ck.patt: %pattern_type.6b6 = ref_binding_pattern ck [concrete = constants.%ck.patt] // CHECK:STDOUT: %ck.var_patt: %pattern_type.6b6 = var_pattern %ck.patt [concrete = constants.%ck.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ck.var: ref %i32 = var %ck.var_patt +// CHECK:STDOUT: %ck.var: ref %i32 = var_storage %ck.var_patt // CHECK:STDOUT: %c.ref.loc26: %Class = name_ref c, %c // CHECK:STDOUT: %k.ref.loc26: %Class.elem = name_ref k, @Class.%.loc17 [concrete = @Class.%.loc17] // CHECK:STDOUT: %.loc26_25.1: ref %i32 = class_element_access %c.ref.loc26, element1 diff --git a/toolchain/check/testdata/class/field/field_initializer.carbon b/toolchain/check/testdata/class/field/field_initializer.carbon index 3708c17a0a7e..26b01cec7391 100644 --- a/toolchain/check/testdata/class/field/field_initializer.carbon +++ b/toolchain/check/testdata/class/field/field_initializer.carbon @@ -127,7 +127,7 @@ var C: Class = {}; // CHECK:STDOUT: %C.patt: %pattern_type.f15 = ref_binding_pattern C [concrete = constants.%C.patt] // CHECK:STDOUT: %C.var_patt: %pattern_type.f15 = var_pattern %C.patt [concrete = constants.%C.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %C.var: ref %Class = var %C.var_patt [concrete] +// CHECK:STDOUT: %C.var: ref %Class = var_storage %C.var_patt [concrete] // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %C: ref %Class = wrapper_binding C, %C.var [concrete = %C.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field/static.carbon b/toolchain/check/testdata/class/field/static.carbon index f1ab693646c4..80a628187dab 100644 --- a/toolchain/check/testdata/class/field/static.carbon +++ b/toolchain/check/testdata/class/field/static.carbon @@ -112,14 +112,14 @@ fn F() { // CHECK:STDOUT: %static_field.patt: %pattern_type.6b6 = ref_binding_pattern static_field [concrete = constants.%static_field.patt] // CHECK:STDOUT: %static_field.var_patt: %pattern_type.6b6 = var_pattern %static_field.patt [concrete = constants.%static_field.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %static_field.var: ref %i32 = var %static_field.var_patt [concrete] +// CHECK:STDOUT: %static_field.var: ref %i32 = var_storage %static_field.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %static_field: ref %i32 = wrapper_binding static_field, %static_field.var [concrete = %static_field.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %static_field_with_init.patt: %pattern_type.6b6 = ref_binding_pattern static_field_with_init [concrete = constants.%static_field_with_init.patt] // CHECK:STDOUT: %static_field_with_init.var_patt: %pattern_type.6b6 = var_pattern %static_field_with_init.patt [concrete = constants.%static_field_with_init.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %static_field_with_init.var: ref %i32 = var %static_field_with_init.var_patt [concrete] +// CHECK:STDOUT: %static_field_with_init.var: ref %i32 = var_storage %static_field_with_init.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %static_field_with_init: ref %i32 = wrapper_binding static_field_with_init, %static_field_with_init.var [concrete = %static_field_with_init.var] // CHECK:STDOUT: %complete_type: = complete_type_witness constants.%empty_struct_type [concrete = constants.%complete_type.357] diff --git a/toolchain/check/testdata/class/generic/call.carbon b/toolchain/check/testdata/class/generic/call.carbon index 1230e7e64760..4ee43b3af955 100644 --- a/toolchain/check/testdata/class/generic/call.carbon +++ b/toolchain/check/testdata/class/generic/call.carbon @@ -201,7 +201,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %a.patt: %pattern_type.081 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.081 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Class.4f7 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %Class.4f7 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6_21.1: type = splice_block %Class.loc6 [concrete = constants.%Class.4f7] { // CHECK:STDOUT: %Class.ref.loc6: %Class.type = name_ref Class, %Class.decl [concrete = constants.%Class.generic] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -221,7 +221,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %b.patt: %pattern_type.a95 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.a95 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Class.958 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %Class.958 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc9_19.1: type = splice_block %Class.loc9 [concrete = constants.%Class.958] { // CHECK:STDOUT: %Class.ref.loc9: %Class.type = name_ref Class, %Class.decl [concrete = constants.%Class.generic] // CHECK:STDOUT: %.loc9_15: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -360,7 +360,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [concrete = constants.%Class.generic] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -459,7 +459,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [concrete = constants.%Class.generic] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -563,7 +563,7 @@ class Outer(T:! type) { // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Class.ref: %Class.type = name_ref Class, %Class.decl [concrete = constants.%Class.generic] // CHECK:STDOUT: %int_5: Core.IntLiteral = int_value 5 [concrete = constants.%int_5] diff --git a/toolchain/check/testdata/class/generic/generic_vs_params.carbon b/toolchain/check/testdata/class/generic/generic_vs_params.carbon index b8fac4086102..fe331694a867 100644 --- a/toolchain/check/testdata/class/generic/generic_vs_params.carbon +++ b/toolchain/check/testdata/class/generic/generic_vs_params.carbon @@ -172,14 +172,14 @@ class Foo[T:! type]; // CHECK:STDOUT: %a.patt: %pattern_type.2dc = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.2dc = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %NotGenericNoParams = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %NotGenericNoParams = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %NotGenericNoParams.ref: type = name_ref NotGenericNoParams, %NotGenericNoParams.decl [concrete = constants.%NotGenericNoParams] // CHECK:STDOUT: %a: ref %NotGenericNoParams = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.8e7 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.8e7 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %NotGenericButParams = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %NotGenericButParams = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc16: type = splice_block %NotGenericButParams [concrete = constants.%NotGenericButParams] { // CHECK:STDOUT: %NotGenericButParams.ref: %NotGenericButParams.type = name_ref NotGenericButParams, %NotGenericButParams.decl [concrete = constants.%NotGenericButParams.generic] // CHECK:STDOUT: %NotGenericButParams: type = class_type @NotGenericButParams [concrete = constants.%NotGenericButParams] @@ -189,7 +189,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %c.patt: %pattern_type.053 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.053 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %GenericAndParams.421 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %GenericAndParams.421 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc17: type = splice_block %GenericAndParams.loc17 [concrete = constants.%GenericAndParams.421] { // CHECK:STDOUT: %GenericAndParams.ref.loc17: %GenericAndParams.type.aa5 = name_ref GenericAndParams, %GenericAndParams.decl [concrete = constants.%GenericAndParams.generic.128] // CHECK:STDOUT: %X.ref.loc17: type = name_ref X, %X.decl [concrete = constants.%X] @@ -200,7 +200,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %d.patt: %pattern_type.a4a = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.a4a = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %GenericNoParams.ee8 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %GenericNoParams.ee8 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc18_12.1: type = splice_block %GenericNoParams.ref [concrete = constants.%GenericNoParams.ee8] { // CHECK:STDOUT: %C.ref.loc18: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %X.ref.loc18: type = name_ref X, %X.decl [concrete = constants.%X] @@ -213,7 +213,7 @@ class Foo[T:! type]; // CHECK:STDOUT: %e.patt: %pattern_type.4e2 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.4e2 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %GenericAndParams.353 = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %GenericAndParams.353 = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc19_31: type = splice_block %GenericAndParams.loc19 [concrete = constants.%GenericAndParams.353] { // CHECK:STDOUT: %C.ref.loc19: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %X.ref.loc19_10: type = name_ref X, %X.decl [concrete = constants.%X] diff --git a/toolchain/check/testdata/class/generic/import.carbon b/toolchain/check/testdata/class/generic/import.carbon index 2635c8bc2371..990a51120246 100644 --- a/toolchain/check/testdata/class/generic/import.carbon +++ b/toolchain/check/testdata/class/generic/import.carbon @@ -618,7 +618,7 @@ class Class(U:! type) { // CHECK:STDOUT: %v.patt: %pattern_type.97d = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.97d = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %CompleteClass.d55 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %CompleteClass.d55 = var_storage %v.var_patt // CHECK:STDOUT: %F.ref.loc6: %F.type = name_ref F, imports.%Main.F [concrete = constants.%F] // CHECK:STDOUT: %.loc6_3: ref %CompleteClass.d55 = splice_block %v.var {} // CHECK:STDOUT: %F.call: init %CompleteClass.d55 to %.loc6_3 = call %F.ref.loc6() @@ -670,7 +670,7 @@ class Class(U:! type) { // CHECK:STDOUT: %v.patt: %pattern_type.97d = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.97d = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %CompleteClass.d55 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %CompleteClass.d55 = var_storage %v.var_patt // CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [concrete = constants.%F] // CHECK:STDOUT: %.loc11_3: ref %CompleteClass.d55 = splice_block %v.var {} // CHECK:STDOUT: %F.call: init %CompleteClass.d55 to %.loc11_3 = call %F.ref() @@ -827,7 +827,7 @@ class Class(U:! type) { // CHECK:STDOUT: %v.patt: %pattern_type.ff3 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.ff3 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %CompleteClass.22b = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %CompleteClass.22b = var_storage %v.var_patt // CHECK:STDOUT: %F.ref: %F.type = name_ref F, imports.%Main.F [concrete = constants.%F] // CHECK:STDOUT: %.loc13_41: ref %CompleteClass.d55 = temporary_storage // CHECK:STDOUT: %F.call: init %CompleteClass.d55 to %.loc13_41 = call %F.ref() diff --git a/toolchain/check/testdata/class/generic/init.carbon b/toolchain/check/testdata/class/generic/init.carbon index e40b03711351..2e34bfa0514f 100644 --- a/toolchain/check/testdata/class/generic/init.carbon +++ b/toolchain/check/testdata/class/generic/init.carbon @@ -252,7 +252,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %v.patt.loc10_8.1: @InitFromStructGeneric.%pattern_type.loc10 (%pattern_type.0b6) = ref_binding_pattern v [symbolic = %v.patt.loc10_8.2 (constants.%v.patt.ef6)] // CHECK:STDOUT: %v.var_patt.loc10_3.1: @InitFromStructGeneric.%pattern_type.loc10 (%pattern_type.0b6) = var_pattern %v.patt.loc10_8.1 [symbolic = %v.var_patt.loc10_3.2 (constants.%v.var_patt.8cf)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref @InitFromStructGeneric.%Class.loc10_17.2 (%Class.55b) = var %v.var_patt.loc10_3.1 +// CHECK:STDOUT: %v.var: ref @InitFromStructGeneric.%Class.loc10_17.2 (%Class.55b) = var_storage %v.var_patt.loc10_3.1 // CHECK:STDOUT: %x.ref: @InitFromStructGeneric.%T.as_type.loc9_59.1 (%T.as_type.74b) = name_ref x, %x // CHECK:STDOUT: %.loc10_28.1: @InitFromStructGeneric.%struct_type.k (%struct_type.k.aa4) = struct_literal (%x.ref) // CHECK:STDOUT: %impl.elem0.loc10_27.1: @InitFromStructGeneric.%.loc10_27.3 (%.018) = impl_witness_access constants.%Copy.lookup_impl_witness.4df, element0 [symbolic = %impl.elem0.loc10_27.2 (constants.%impl.elem0.170)] @@ -311,7 +311,7 @@ fn InitFromAdaptedSpecific(x: i32) -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.82c = ref_binding_pattern v [concrete = constants.%v.patt.675] // CHECK:STDOUT: %v.var_patt: %pattern_type.82c = var_pattern %v.patt [concrete = constants.%v.var_patt.68c] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %Class.a32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %Class.a32 = var_storage %v.var_patt // CHECK:STDOUT: %x.ref: %i32 = name_ref x, %x // CHECK:STDOUT: %.loc15_30.1: %struct_type.k.e7c = struct_literal (%x.ref) // CHECK:STDOUT: %impl.elem0.loc15: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] diff --git a/toolchain/check/testdata/class/generic/member_type.carbon b/toolchain/check/testdata/class/generic/member_type.carbon index 4b492b0136fe..14d55c656e07 100644 --- a/toolchain/check/testdata/class/generic/member_type.carbon +++ b/toolchain/check/testdata/class/generic/member_type.carbon @@ -318,7 +318,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %c.patt: %pattern_type.1e8 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.1e8 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Inner.096 = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %Inner.096 = var_storage %c.var_patt // CHECK:STDOUT: %Outer.ref.loc13_29: %Outer.type = name_ref Outer, file.%Outer.decl [concrete = constants.%Outer.generic] // CHECK:STDOUT: %i32.loc13_35: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Copy.facet.loc13_38: %Copy.type = facet_value %i32.loc13_35, (constants.%Copy.impl_witness.0e0) [concrete = constants.%Copy.facet.987] @@ -846,7 +846,7 @@ fn Test() -> i32 { // CHECK:STDOUT: %c.patt: %pattern_type.9d0 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.9d0 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C.b7f = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C.b7f = var_storage %c.var_patt // CHECK:STDOUT: %.loc23_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc23_26.2: init %C.b7f to %c.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc23_3: init %C.b7f = converted %.loc23_26.1, %.loc23_26.2 [concrete = constants.%C.val] diff --git a/toolchain/check/testdata/class/generic/self.carbon b/toolchain/check/testdata/class/generic/self.carbon index e2e958f62a99..c211419e624a 100644 --- a/toolchain/check/testdata/class/generic/self.carbon +++ b/toolchain/check/testdata/class/generic/self.carbon @@ -211,7 +211,7 @@ class Class(T:! type) { // CHECK:STDOUT: %c.patt.loc21_17.1: @Class.F.%pattern_type (%pattern_type.36e) = ref_binding_pattern c [symbolic = %c.patt.loc21_17.2 (constants.%c.patt)] // CHECK:STDOUT: %c.var_patt.loc21_5.1: @Class.F.%pattern_type (%pattern_type.36e) = var_pattern %c.patt.loc21_17.1 [symbolic = %c.var_patt.loc21_5.2 (constants.%c.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref @Class.F.%Class.loc21_26.2 (%Class) = var %c.var_patt.loc21_5.1 +// CHECK:STDOUT: %c.var: ref @Class.F.%Class.loc21_26.2 (%Class) = var_storage %c.var_patt.loc21_5.1 // CHECK:STDOUT: %.loc21_30: @Class.F.%Class.MakeSelf.type (%Class.MakeSelf.type) = specific_constant @Class.%Class.MakeSelf.decl, @Class(constants.%T) [symbolic = %Class.MakeSelf (constants.%Class.MakeSelf)] // CHECK:STDOUT: %MakeSelf.ref: @Class.F.%Class.MakeSelf.type (%Class.MakeSelf.type) = name_ref MakeSelf, %.loc21_30 [symbolic = %Class.MakeSelf (constants.%Class.MakeSelf)] // CHECK:STDOUT: %Class.MakeSelf.specific_fn.loc21_30.1: = specific_function %MakeSelf.ref, @Class.MakeSelf(constants.%T) [symbolic = %Class.MakeSelf.specific_fn.loc21_30.2 (constants.%Class.MakeSelf.specific_fn)] @@ -228,7 +228,7 @@ class Class(T:! type) { // CHECK:STDOUT: %s.patt.loc22_17.1: @Class.F.%pattern_type (%pattern_type.36e) = ref_binding_pattern s [symbolic = %s.patt.loc22_17.2 (constants.%s.patt)] // CHECK:STDOUT: %s.var_patt.loc22_5.1: @Class.F.%pattern_type (%pattern_type.36e) = var_pattern %s.patt.loc22_17.1 [symbolic = %s.var_patt.loc22_5.2 (constants.%s.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref @Class.F.%Class.loc21_26.2 (%Class) = var %s.var_patt.loc22_5.1 +// CHECK:STDOUT: %s.var: ref @Class.F.%Class.loc21_26.2 (%Class) = var_storage %s.var_patt.loc22_5.1 // CHECK:STDOUT: %.loc22_26: @Class.F.%Class.MakeClass.type (%Class.MakeClass.type) = specific_constant @Class.%Class.MakeClass.decl, @Class(constants.%T) [symbolic = %Class.MakeClass (constants.%Class.MakeClass)] // CHECK:STDOUT: %MakeClass.ref: @Class.F.%Class.MakeClass.type (%Class.MakeClass.type) = name_ref MakeClass, %.loc22_26 [symbolic = %Class.MakeClass (constants.%Class.MakeClass)] // CHECK:STDOUT: %Class.MakeClass.specific_fn.loc22_26.1: = specific_function %MakeClass.ref, @Class.MakeClass(constants.%T) [symbolic = %Class.MakeClass.specific_fn.loc22_26.2 (constants.%Class.MakeClass.specific_fn)] diff --git a/toolchain/check/testdata/class/generic/stringify.carbon b/toolchain/check/testdata/class/generic/stringify.carbon index 332d6bf4c2a8..13110983e842 100644 --- a/toolchain/check/testdata/class/generic/stringify.carbon +++ b/toolchain/check/testdata/class/generic/stringify.carbon @@ -141,14 +141,14 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %v.patt: %pattern_type.c07 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.c07 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %NoParams = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %NoParams = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %NoParams.ref: type = name_ref NoParams, %NoParams.decl [concrete = constants.%NoParams] // CHECK:STDOUT: %v: ref %NoParams = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %w.patt: %pattern_type.c83 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.c83 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %EmptyParams = var %w.var_patt [concrete] +// CHECK:STDOUT: %w.var: ref %EmptyParams = var_storage %w.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %EmptyParams [concrete = constants.%EmptyParams] { // CHECK:STDOUT: %EmptyParams.ref: %EmptyParams.type = name_ref EmptyParams, %EmptyParams.decl [concrete = constants.%EmptyParams.generic] // CHECK:STDOUT: %EmptyParams: type = class_type @EmptyParams [concrete = constants.%EmptyParams] @@ -272,7 +272,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %v.patt: %pattern_type.e03 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.e03 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %Outer.2d6 = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %Outer.2d6 = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %.loc9_17: type = splice_block %Outer.loc9 [concrete = constants.%Outer.2d6] { // CHECK:STDOUT: %Outer.ref.loc9: %Outer.type = name_ref Outer, %Outer.decl [concrete = constants.%Outer.generic] // CHECK:STDOUT: %.loc9_15: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -285,7 +285,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %w.patt: %pattern_type.85f = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.85f = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %Inner.61f = var %w.var_patt [concrete] +// CHECK:STDOUT: %w.var: ref %Inner.61f = var_storage %w.var_patt [concrete] // CHECK:STDOUT: %.loc19_35: type = splice_block %Inner [concrete = constants.%Inner.61f] { // CHECK:STDOUT: %Outer.ref.loc19: %Outer.type = name_ref Outer, %Outer.decl [concrete = constants.%Outer.generic] // CHECK:STDOUT: %.loc19_15: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -461,7 +461,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %v.patt: %pattern_type.b05 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.b05 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %C.ece = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %C.ece = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %.loc13_13.1: type = splice_block %C [concrete = constants.%C.ece] { // CHECK:STDOUT: %C.ref: %C.type = name_ref C, %C.decl [concrete = constants.%C.generic] // CHECK:STDOUT: %int_123: Core.IntLiteral = int_value 123 [concrete = constants.%int_123.fff] @@ -613,7 +613,7 @@ var g: E({.a = 1, .b = 2}) = {} as E({.a = 3, .b = 4} as D); // CHECK:STDOUT: %g.patt: %pattern_type.e71 = ref_binding_pattern g [concrete = constants.%g.patt] // CHECK:STDOUT: %g.var_patt: %pattern_type.e71 = var_pattern %g.patt [concrete = constants.%g.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %g.var: ref %E.7b7 = var %g.var_patt [concrete] +// CHECK:STDOUT: %g.var: ref %E.7b7 = var_storage %g.var_patt [concrete] // CHECK:STDOUT: %.loc18_26.1: type = splice_block %E [concrete = constants.%E.7b7] { // CHECK:STDOUT: %E.ref: %E.type = name_ref E, %E.decl [concrete = constants.%E.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 3d1db80ddd33..382a62035530 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -348,7 +348,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.47a = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.47a = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Empty = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Empty = var_storage %a.var_patt // CHECK:STDOUT: %.loc7_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc7_26.2: init %Empty to %a.var = class_init () [concrete = constants.%Empty.val] // CHECK:STDOUT: %.loc7_3: init %Empty = converted %.loc7_26.1, %.loc7_26.2 [concrete = constants.%Empty.val] @@ -359,7 +359,7 @@ fn Run() { // CHECK:STDOUT: %b.patt: %pattern_type.f17 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.f17 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Field = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Field = var_storage %b.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc9_25.1: %struct_type.x.c96 = struct_literal (%int_1) [concrete = constants.%struct] // CHECK:STDOUT: %impl.elem0.loc9: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -390,7 +390,7 @@ fn Run() { // CHECK:STDOUT: %c.patt: %pattern_type.bdf = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.bdf = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %ForwardDeclared.08bd4c.1 = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %ForwardDeclared.08bd4c.1 = var_storage %c.var_patt // CHECK:STDOUT: %.loc12_29.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc12_29.2: init %ForwardDeclared.08bd4c.1 to %c.var = class_init () [concrete = constants.%ForwardDeclared.val] // CHECK:STDOUT: %.loc12_3: init %ForwardDeclared.08bd4c.1 = converted %.loc12_29.1, %.loc12_29.2 [concrete = constants.%ForwardDeclared.val] @@ -410,7 +410,7 @@ fn Run() { // CHECK:STDOUT: %d.patt: %pattern_type.8cd = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.8cd = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %ptr.11e = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %ptr.11e = var_storage %d.var_patt // CHECK:STDOUT: %c.ref.loc16: ref %ForwardDeclared.08bd4c.1 = name_ref c, %c // CHECK:STDOUT: %addr: %ptr.11e = addr_of %c.ref.loc16 // CHECK:STDOUT: %impl.elem0.loc16: %.882 = impl_witness_access constants.%Copy.impl_witness.966, element0 [concrete = constants.%ptr.as.Copy.impl.Op.5aa] @@ -428,7 +428,7 @@ fn Run() { // CHECK:STDOUT: %e.patt: %pattern_type.bae = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.bae = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %ptr.06d = var %e.var_patt +// CHECK:STDOUT: %e.var: ref %ptr.06d = var_storage %e.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%ptr.06d, (constants.%DefaultOrUnformed.impl_witness.3a6) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc18_28.1: %DefaultOrUnformed.type = converted constants.%ptr.06d, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc18_28.1 [concrete = constants.%ptr.06d] diff --git a/toolchain/check/testdata/class/import_indirect.carbon b/toolchain/check/testdata/class/import_indirect.carbon index 6e9aa411fbca..ca37ef1901c0 100644 --- a/toolchain/check/testdata/class/import_indirect.carbon +++ b/toolchain/check/testdata/class/import_indirect.carbon @@ -197,14 +197,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %b_val.patt: %pattern_type.98b = ref_binding_pattern b_val [concrete = constants.%b_val.patt] // CHECK:STDOUT: %b_val.var_patt: %pattern_type.98b = var_pattern %b_val.patt [concrete = constants.%b_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_val.var: ref %C = var %b_val.var_patt [concrete] +// CHECK:STDOUT: %b_val.var: ref %C = var_storage %b_val.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %b_val: ref %C = wrapper_binding b_val, %b_val.var [concrete = %b_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ptr.patt: %pattern_type.fcb = ref_binding_pattern b_ptr [concrete = constants.%b_ptr.patt] // CHECK:STDOUT: %b_ptr.var_patt: %pattern_type.fcb = var_pattern %b_ptr.patt [concrete = constants.%b_ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_ptr.var: ref %ptr.6b6 = var %b_ptr.var_patt [concrete] +// CHECK:STDOUT: %b_ptr.var: ref %ptr.6b6 = var_storage %b_ptr.var_patt [concrete] // CHECK:STDOUT: %.loc9: type = splice_block %ptr [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %D.ref: type = name_ref D, %D [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] @@ -297,14 +297,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %c_val.patt: %pattern_type.98b = ref_binding_pattern c_val [concrete = constants.%c_val.patt] // CHECK:STDOUT: %c_val.var_patt: %pattern_type.98b = var_pattern %c_val.patt [concrete = constants.%c_val.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_val.var: ref %C = var %c_val.var_patt [concrete] +// CHECK:STDOUT: %c_val.var: ref %C = var_storage %c_val.var_patt [concrete] // CHECK:STDOUT: %C.ref.loc8: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c_val: ref %C = wrapper_binding c_val, %c_val.var [concrete = %c_val.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c_ptr.patt: %pattern_type.fcb = ref_binding_pattern c_ptr [concrete = constants.%c_ptr.patt] // CHECK:STDOUT: %c_ptr.var_patt: %pattern_type.fcb = var_pattern %c_ptr.patt [concrete = constants.%c_ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_ptr.var: ref %ptr.6b6 = var %c_ptr.var_patt [concrete] +// CHECK:STDOUT: %c_ptr.var: ref %ptr.6b6 = var_storage %c_ptr.var_patt [concrete] // CHECK:STDOUT: %.loc9: type = splice_block %ptr [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %E.ref: type = name_ref E, %E [concrete = constants.%C] // CHECK:STDOUT: %ptr: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] @@ -400,14 +400,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %value.patt: %pattern_type.98b = ref_binding_pattern value [concrete = constants.%value.patt] // CHECK:STDOUT: %value.var_patt: %pattern_type.98b = var_pattern %value.patt [concrete = constants.%value.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] +// CHECK:STDOUT: %value.var: ref %C = var_storage %value.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var %ptr.var_patt [concrete] +// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var_storage %ptr.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr.loc8_11 [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] @@ -503,14 +503,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %value.patt: %pattern_type.98b = ref_binding_pattern value [concrete = constants.%value.patt] // CHECK:STDOUT: %value.var_patt: %pattern_type.98b = var_pattern %value.patt [concrete = constants.%value.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] +// CHECK:STDOUT: %value.var: ref %C = var_storage %value.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var %ptr.var_patt [concrete] +// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var_storage %ptr.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr.loc8_11 [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %D.ref [concrete = constants.%ptr.6b6] @@ -610,14 +610,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %value.patt: %pattern_type.98b = ref_binding_pattern value [concrete = constants.%value.patt] // CHECK:STDOUT: %value.var_patt: %pattern_type.98b = var_pattern %value.patt [concrete = constants.%value.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] +// CHECK:STDOUT: %value.var: ref %C = var_storage %value.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var %ptr.var_patt [concrete] +// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var_storage %ptr.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr.loc8_11 [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] @@ -717,14 +717,14 @@ var ptr: E* = &value; // CHECK:STDOUT: %value.patt: %pattern_type.98b = ref_binding_pattern value [concrete = constants.%value.patt] // CHECK:STDOUT: %value.var_patt: %pattern_type.98b = var_pattern %value.patt [concrete = constants.%value.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %value.var: ref %C = var %value.var_patt [concrete] +// CHECK:STDOUT: %value.var: ref %C = var_storage %value.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%C] // CHECK:STDOUT: %value: ref %C = wrapper_binding value, %value.var [concrete = %value.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %ptr.patt: %pattern_type.fcb = ref_binding_pattern ptr [concrete = constants.%ptr.patt] // CHECK:STDOUT: %ptr.var_patt: %pattern_type.fcb = var_pattern %ptr.patt [concrete = constants.%ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var %ptr.var_patt [concrete] +// CHECK:STDOUT: %ptr.var: ref %ptr.6b6 = var_storage %ptr.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %ptr.loc8_11 [concrete = constants.%ptr.6b6] { // CHECK:STDOUT: %E.ref: type = name_ref E, imports.%Main.E [concrete = constants.%C] // CHECK:STDOUT: %ptr.loc8_11: type = ptr_type %E.ref [concrete = constants.%ptr.6b6] diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index 4a6fed419872..d7f1baeeb9a1 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -136,7 +136,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.c3e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.c3e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %ptr = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %ptr = var_storage %a.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%ptr, (constants.%DefaultOrUnformed.impl_witness.961) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc7_23.1: %DefaultOrUnformed.type = converted constants.%ptr, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc7_23.1 [concrete = constants.%ptr] diff --git a/toolchain/check/testdata/class/import_struct_cycle.carbon b/toolchain/check/testdata/class/import_struct_cycle.carbon index 6310c80a1885..e72a181a3e50 100644 --- a/toolchain/check/testdata/class/import_struct_cycle.carbon +++ b/toolchain/check/testdata/class/import_struct_cycle.carbon @@ -81,7 +81,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.38c = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.38c = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %struct_type.b = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %struct_type.b = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %struct_type.b [concrete = constants.%struct_type.b] { // CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, %Cycle.decl.loc4 [concrete = constants.%Cycle] // CHECK:STDOUT: %ptr: type = ptr_type %Cycle.ref [concrete = constants.%ptr] @@ -127,7 +127,7 @@ fn Run() { // CHECK:STDOUT: %pattern_type.38c: type = pattern_type %struct_type.b [concrete] // CHECK:STDOUT: %a.patt: %pattern_type.38c = ref_binding_pattern a [concrete] // CHECK:STDOUT: %a.var_patt: %pattern_type.38c = var_pattern %a.patt [concrete] -// CHECK:STDOUT: %.d98: ref %ptr.5cd = struct_access imports.%a.var, element0 [concrete] +// CHECK:STDOUT: %.4d3: ref %ptr.5cd = struct_access imports.%a.var, element0 [concrete] // CHECK:STDOUT: %Cycle.elem: type = unbound_element_type %Cycle, %struct_type.b [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %T.67d: type = symbolic_binding T, 0 [symbolic] @@ -153,7 +153,7 @@ fn Run() { // CHECK:STDOUT: %Main.import_ref.281: = import_ref Main//a, loc11_1, loaded [concrete = constants.%complete_type.663] // CHECK:STDOUT: %Main.import_ref.3b0 = import_ref Main//a, inst{{[0-9A-F]+}} [no loc], unloaded // CHECK:STDOUT: %Main.import_ref.697: %Cycle.elem = import_ref Main//a, loc10_8, loaded [concrete = %.ec0] -// CHECK:STDOUT: %a.var: ref %struct_type.b = var constants.%a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %struct_type.b = var_storage constants.%a.var_patt [concrete] // CHECK:STDOUT: %.ec0: %Cycle.elem = field_decl c, element0 [concrete] // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.e5f: @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op.type (%ptr.as.Copy.impl.Op.type.ff5) = import_ref Core//prelude/parts/copy, loc{{\d+_\d+}}, loaded [symbolic = @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op (constants.%ptr.as.Copy.impl.Op.ce9)] @@ -183,9 +183,9 @@ fn Run() { // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a.ref.loc7_3: ref %struct_type.b = name_ref a, imports.%Main.a [concrete = imports.%a.var] -// CHECK:STDOUT: %.loc7_4: ref %ptr.5cd = struct_access %a.ref.loc7_3, element0 [concrete = constants.%.d98] +// CHECK:STDOUT: %.loc7_4: ref %ptr.5cd = struct_access %a.ref.loc7_3, element0 [concrete = constants.%.4d3] // CHECK:STDOUT: %a.ref.loc7_11: ref %struct_type.b = name_ref a, imports.%Main.a [concrete = imports.%a.var] -// CHECK:STDOUT: %.loc7_12.1: ref %ptr.5cd = struct_access %a.ref.loc7_11, element0 [concrete = constants.%.d98] +// CHECK:STDOUT: %.loc7_12.1: ref %ptr.5cd = struct_access %a.ref.loc7_11, element0 [concrete = constants.%.4d3] // CHECK:STDOUT: %.loc7_12.2: %ptr.5cd = acquire_value %.loc7_12.1 // CHECK:STDOUT: %.loc7_10: ref %Cycle = deref %.loc7_12.2 // CHECK:STDOUT: %c.ref: %Cycle.elem = name_ref c, imports.%Main.import_ref.697 [concrete = imports.%.ec0] diff --git a/toolchain/check/testdata/class/indirect_import_member.carbon b/toolchain/check/testdata/class/indirect_import_member.carbon index 44033d31ffab..767c6bb50704 100644 --- a/toolchain/check/testdata/class/indirect_import_member.carbon +++ b/toolchain/check/testdata/class/indirect_import_member.carbon @@ -283,7 +283,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -342,7 +342,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -401,7 +401,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -464,7 +464,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -536,7 +536,7 @@ var x: () = D.C.F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/class/inheritance/import_base.carbon b/toolchain/check/testdata/class/inheritance/import_base.carbon index 36d602173fd6..89cd9d205f8e 100644 --- a/toolchain/check/testdata/class/inheritance/import_base.carbon +++ b/toolchain/check/testdata/class/inheritance/import_base.carbon @@ -257,7 +257,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.860 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.860 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Child = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Child = var_storage %a.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc7_49.1: %struct_type.x.unused_y.76a = struct_literal (%int_0, %int_1) [concrete = constants.%struct.0bf] diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index 9b99fa7d3a92..fcbc0c29dc82 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -149,7 +149,7 @@ fn G() -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.f15 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.f15 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %Class = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %Class = var_storage %v.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc26_33.1: %struct_type.a.b.cfd = struct_literal (%int_1, %int_2) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/class/method/method.carbon b/toolchain/check/testdata/class/method/method.carbon index c63dc874c89d..036c75a408dc 100644 --- a/toolchain/check/testdata/class/method/method.carbon +++ b/toolchain/check/testdata/class/method/method.carbon @@ -452,7 +452,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %c.patt: %pattern_type.f15 = ref_binding_pattern c [concrete = constants.%c.patt.345] // CHECK:STDOUT: %c.var_patt: %pattern_type.f15 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Class = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %Class = var_storage %c.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Class, (constants.%DefaultOrUnformed.impl_witness.4e8) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc43_15.1: %DefaultOrUnformed.type = converted constants.%Class, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc43_15.1 [concrete = constants.%Class] diff --git a/toolchain/check/testdata/class/method/static_method.carbon b/toolchain/check/testdata/class/method/static_method.carbon index e3aac78dbc00..a95f8b142304 100644 --- a/toolchain/check/testdata/class/method/static_method.carbon +++ b/toolchain/check/testdata/class/method/static_method.carbon @@ -117,7 +117,7 @@ fn Run() -> i32 { // CHECK:STDOUT: %c.patt: %pattern_type.f15 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.f15 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Class = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %Class = var_storage %c.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Class, (constants.%DefaultOrUnformed.impl_witness.4e8) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc20_15.1: %DefaultOrUnformed.type = converted constants.%Class, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc20_15.1 [concrete = constants.%Class] diff --git a/toolchain/check/testdata/class/method/virtual.carbon b/toolchain/check/testdata/class/method/virtual.carbon index 6016f28ac5e0..88a9a6459fcb 100644 --- a/toolchain/check/testdata/class/method/virtual.carbon +++ b/toolchain/check/testdata/class/method/virtual.carbon @@ -740,7 +740,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %d.patt: %pattern_type.746 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.746 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %Derived = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %Derived = var_storage %d.var_patt // CHECK:STDOUT: %.loc15_37.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc15_38.1: %struct_type.base.f5e = struct_literal (%.loc15_37.1) [concrete = constants.%struct.6b1] // CHECK:STDOUT: %.loc15_38.2: ref %.f93 = class_element_access %d.var, element0 @@ -825,7 +825,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %v.patt: %pattern_type.b8d = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.b8d = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %Base = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %Base = var_storage %v.var_patt // CHECK:STDOUT: %.loc8_35.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_35.2: ref %ptr.454 = class_element_access %v.var, element0 // CHECK:STDOUT: %Base.vtable_ptr: ref %ptr.454 = vtable_ptr @Base.vtable [concrete = constants.%Base.vtable_ptr] @@ -927,7 +927,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %b1.patt: %pattern_type.912 = ref_binding_pattern b1 [concrete = constants.%b1.patt] // CHECK:STDOUT: %b1.var_patt: %pattern_type.912 = var_pattern %b1.patt [concrete = constants.%b1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b1.var: ref %Base = var %b1.var_patt +// CHECK:STDOUT: %b1.var: ref %Base = var_storage %b1.var_patt // CHECK:STDOUT: %i.ref.loc14_25: ref %i32 = name_ref i, %i // CHECK:STDOUT: %i.ref.loc14_34: ref %i32 = name_ref i, %i // CHECK:STDOUT: %.loc14_35.1: %struct_type.m2.m1.810 = struct_literal (%i.ref.loc14_25, %i.ref.loc14_34) @@ -959,7 +959,7 @@ class T2(G2:! type) { // CHECK:STDOUT: %b2.patt: %pattern_type.912 = ref_binding_pattern b2 [concrete = constants.%b2.patt] // CHECK:STDOUT: %b2.var_patt: %pattern_type.912 = var_pattern %b2.patt [concrete = constants.%b2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b2.var: ref %Base = var %b2.var_patt +// CHECK:STDOUT: %b2.var: ref %Base = var_storage %b2.var_patt // CHECK:STDOUT: %int_3.loc15: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %int_5: Core.IntLiteral = int_value 5 [concrete = constants.%int_5.64b] // CHECK:STDOUT: %.loc15_42.1: %struct_type.m2.m1.5f2 = struct_literal (%int_3.loc15, %int_5) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index f33eec5b13f2..7a9f67020218 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -217,7 +217,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %o.patt: %pattern_type.d6c = ref_binding_pattern o [concrete = constants.%o.patt.a05f50.1] // CHECK:STDOUT: %o.var_patt: %pattern_type.d6c = var_pattern %o.patt [concrete = constants.%o.var_patt.6496fb.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %o.var: ref %Outer = var %o.var_patt +// CHECK:STDOUT: %o.var: ref %Outer = var_storage %o.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc18: %DefaultOrUnformed.type = facet_value constants.%Outer, (constants.%DefaultOrUnformed.impl_witness.474) [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %.loc18_24.1: %DefaultOrUnformed.type = converted constants.%Outer, %DefaultOrUnformed.facet.loc18 [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %as_type.loc18: type = facet_access_type %.loc18_24.1 [concrete = constants.%Outer] @@ -232,7 +232,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.1] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %Inner = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %Inner = var_storage %i.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc19: %DefaultOrUnformed.type = facet_value constants.%Inner, (constants.%DefaultOrUnformed.impl_witness.b1a) [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %.loc19_24.1: %DefaultOrUnformed.type = converted constants.%Inner, %DefaultOrUnformed.facet.loc19 [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %as_type.loc19: type = facet_access_type %.loc19_24.1 [concrete = constants.%Inner] @@ -256,7 +256,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %o.patt: %pattern_type.d6c = ref_binding_pattern o [concrete = constants.%o.patt.a05f50.2] // CHECK:STDOUT: %o.var_patt: %pattern_type.d6c = var_pattern %o.patt [concrete = constants.%o.var_patt.6496fb.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %o.var: ref %Outer = var %o.var_patt +// CHECK:STDOUT: %o.var: ref %Outer = var_storage %o.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc29: %DefaultOrUnformed.type = facet_value constants.%Outer, (constants.%DefaultOrUnformed.impl_witness.474) [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %.loc29_26.1: %DefaultOrUnformed.type = converted constants.%Outer, %DefaultOrUnformed.facet.loc29 [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %as_type.loc29: type = facet_access_type %.loc29_26.1 [concrete = constants.%Outer] @@ -271,7 +271,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.2] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %Inner = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %Inner = var_storage %i.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc30: %DefaultOrUnformed.type = facet_value constants.%Inner, (constants.%DefaultOrUnformed.impl_witness.b1a) [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %.loc30_26.1: %DefaultOrUnformed.type = converted constants.%Inner, %DefaultOrUnformed.facet.loc30 [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %as_type.loc30: type = facet_access_type %.loc30_26.1 [concrete = constants.%Inner] @@ -295,7 +295,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %o.patt: %pattern_type.d6c = ref_binding_pattern o [concrete = constants.%o.patt.a05f50.3] // CHECK:STDOUT: %o.var_patt: %pattern_type.d6c = var_pattern %o.patt [concrete = constants.%o.var_patt.6496fb.3] // CHECK:STDOUT: } -// CHECK:STDOUT: %o.var: ref %Outer = var %o.var_patt +// CHECK:STDOUT: %o.var: ref %Outer = var_storage %o.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc36: %DefaultOrUnformed.type = facet_value constants.%Outer, (constants.%DefaultOrUnformed.impl_witness.474) [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %.loc36_24.1: %DefaultOrUnformed.type = converted constants.%Outer, %DefaultOrUnformed.facet.loc36 [concrete = constants.%DefaultOrUnformed.facet.1fd] // CHECK:STDOUT: %as_type.loc36: type = facet_access_type %.loc36_24.1 [concrete = constants.%Outer] @@ -310,7 +310,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt.539460.3] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt.15311d.3] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %Inner = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %Inner = var_storage %i.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc37: %DefaultOrUnformed.type = facet_value constants.%Inner, (constants.%DefaultOrUnformed.impl_witness.b1a) [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %.loc37_24.1: %DefaultOrUnformed.type = converted constants.%Inner, %DefaultOrUnformed.facet.loc37 [concrete = constants.%DefaultOrUnformed.facet.eb3] // CHECK:STDOUT: %as_type.loc37: type = facet_access_type %.loc37_24.1 [concrete = constants.%Inner] diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index c83bb1d47d66..13b278482a91 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -178,7 +178,7 @@ fn G(o: Outer) { // CHECK:STDOUT: %i.patt: %pattern_type.dc4 = ref_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: %i.var_patt: %pattern_type.dc4 = var_pattern %i.patt [concrete = constants.%i.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %i.var: ref %Inner = var %i.var_patt +// CHECK:STDOUT: %i.var: ref %Inner = var_storage %i.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Inner, (constants.%DefaultOrUnformed.impl_witness.b1a) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc26_24.1: %DefaultOrUnformed.type = converted constants.%Inner, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc26_24.1 [concrete = constants.%Inner] diff --git a/toolchain/check/testdata/class/reorder_qualified.carbon b/toolchain/check/testdata/class/reorder_qualified.carbon index 35a983ac510f..918c70b0c5bd 100644 --- a/toolchain/check/testdata/class/reorder_qualified.carbon +++ b/toolchain/check/testdata/class/reorder_qualified.carbon @@ -257,7 +257,7 @@ class A { // CHECK:STDOUT: %a.patt: %pattern_type.9ef = ref_binding_pattern a [concrete = constants.%a.patt.17c] // CHECK:STDOUT: %a.var_patt: %pattern_type.9ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc33_32.1: %struct_type.a.a6c = struct_literal (%int_1) [concrete = constants.%struct.48c] // CHECK:STDOUT: %impl.elem0.loc33: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -277,7 +277,7 @@ class A { // CHECK:STDOUT: %b.patt: %pattern_type.e78 = ref_binding_pattern b [concrete = constants.%b.patt.245] // CHECK:STDOUT: %b.var_patt: %pattern_type.e78 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %B = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %B = var_storage %b.var_patt // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc34_32.1: %struct_type.b.a15 = struct_literal (%int_2) [concrete = constants.%struct.26f] // CHECK:STDOUT: %impl.elem0.loc34: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -297,7 +297,7 @@ class A { // CHECK:STDOUT: %c.patt: %pattern_type.ca8 = ref_binding_pattern c [concrete = constants.%c.patt.a75] // CHECK:STDOUT: %c.var_patt: %pattern_type.ca8 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %.loc35_32.1: %struct_type.c.5b8 = struct_literal (%int_3) [concrete = constants.%struct.d98] // CHECK:STDOUT: %impl.elem0.loc35: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -317,7 +317,7 @@ class A { // CHECK:STDOUT: %d.patt: %pattern_type.a0b = ref_binding_pattern d [concrete = constants.%d.patt.60f] // CHECK:STDOUT: %d.var_patt: %pattern_type.a0b = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %D = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %D = var_storage %d.var_patt // CHECK:STDOUT: %int_4: Core.IntLiteral = int_value 4 [concrete = constants.%int_4.0c1] // CHECK:STDOUT: %.loc36_32.1: %struct_type.d.3ea = struct_literal (%int_4) [concrete = constants.%struct.5a9] // CHECK:STDOUT: %impl.elem0.loc36: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 032cdc2aeceb..1c9c042600ce 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -186,7 +186,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %F.ref.loc30: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: init %i32 = call %F.ref.loc30() // CHECK:STDOUT: assign %a.var, %F.call @@ -196,7 +196,7 @@ fn Run() { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [concrete = constants.%Class] // CHECK:STDOUT: %F.ref.loc31: %Class.F.type = name_ref F, @Class.%Class.F.decl [concrete = constants.%Class.F] // CHECK:STDOUT: %Class.F.call: init %i32 = call %F.ref.loc31() diff --git a/toolchain/check/testdata/class/self/raw_self_type.carbon b/toolchain/check/testdata/class/self/raw_self_type.carbon index 5846ad61c842..a7f77d533959 100644 --- a/toolchain/check/testdata/class/self/raw_self_type.carbon +++ b/toolchain/check/testdata/class/self/raw_self_type.carbon @@ -165,7 +165,7 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: %Self.patt: %pattern_type.8c5 = ref_binding_pattern r#Self [concrete = constants.%Self.patt] // CHECK:STDOUT: %Self.var_patt: %pattern_type.8c5 = var_pattern %Self.patt [concrete = constants.%Self.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %Self.var: ref %ptr.7ee = var %Self.var_patt +// CHECK:STDOUT: %Self.var: ref %ptr.7ee = var_storage %Self.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%ptr.7ee, (constants.%DefaultOrUnformed.impl_witness.a7b) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc17_22.1: %DefaultOrUnformed.type = converted constants.%ptr.7ee, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc17_22.1 [concrete = constants.%ptr.7ee] @@ -182,7 +182,7 @@ fn MemberNamedSelf.F(unused x: Self, unused y: r#Self) {} // CHECK:STDOUT: %p.patt: %pattern_type.8c5 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.8c5 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.7ee = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.7ee = var_storage %p.var_patt // CHECK:STDOUT: %Self.ref.loc18_27: ref %ptr.7ee = name_ref r#Self, %Self // CHECK:STDOUT: %.loc18_27: %ptr.7ee = acquire_value %Self.ref.loc18_27 // CHECK:STDOUT: %impl.elem0: %.4c3 = impl_witness_access constants.%Copy.impl_witness.fa4, element0 [concrete = constants.%ptr.as.Copy.impl.Op.8fa] diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index 64c68dc6cca3..903f6325f2ef 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -68,8 +68,8 @@ var a_ptr: const C* = a_ptr_ref; // CHECK:STDOUT: %Main.a_ptr_ref: ref %ptr.77f = import_ref Main//implicit, a_ptr_ref, loaded [concrete = %a_ptr_ref.var] // CHECK:STDOUT: %Main.import_ref.499: @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op.type (%ptr.as.Copy.impl.Op.type.ff5) = import_ref Main//implicit, inst{{[0-9A-F]+}} [indirect], loaded [symbolic = @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op (constants.%ptr.as.Copy.impl.Op.ce9)] // CHECK:STDOUT: %Copy.impl_witness_table.90e = impl_witness_table (%Main.import_ref.499), @ptr.as.Copy.impl [concrete] -// CHECK:STDOUT: %a_ref.var: ref %const.13f = var constants.%a_ref.var_patt [concrete] -// CHECK:STDOUT: %a_ptr_ref.var: ref %ptr.77f = var constants.%a_ptr_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %const.13f = var_storage constants.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ptr_ref.var: ref %ptr.77f = var_storage constants.%a_ptr_ref.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -77,7 +77,7 @@ var a_ptr: const C* = a_ptr_ref; // CHECK:STDOUT: %a.patt: %pattern_type.7d2 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.7d2 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %ptr.77f = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %ptr.77f = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %ptr.loc6 [concrete = constants.%ptr.77f] { // CHECK:STDOUT: %C.ref.loc6: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %const.loc6: type = const_type %C.ref.loc6 [concrete = constants.%const.13f] @@ -88,7 +88,7 @@ var a_ptr: const C* = a_ptr_ref; // CHECK:STDOUT: %a_ptr.patt: %pattern_type.7d2 = ref_binding_pattern a_ptr [concrete = constants.%a_ptr.patt] // CHECK:STDOUT: %a_ptr.var_patt: %pattern_type.7d2 = var_pattern %a_ptr.patt [concrete = constants.%a_ptr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ptr.var: ref %ptr.77f = var %a_ptr.var_patt [concrete] +// CHECK:STDOUT: %a_ptr.var: ref %ptr.77f = var_storage %a_ptr.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %ptr.loc7 [concrete = constants.%ptr.77f] { // CHECK:STDOUT: %C.ref.loc7: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %const.loc7: type = const_type %C.ref.loc7 [concrete = constants.%const.13f] diff --git a/toolchain/check/testdata/deduce/array.carbon b/toolchain/check/testdata/deduce/array.carbon index 8d98fe5bf4cf..6327442dd3da 100644 --- a/toolchain/check/testdata/deduce/array.carbon +++ b/toolchain/check/testdata/deduce/array.carbon @@ -291,7 +291,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.3f5 = ref_binding_pattern a [concrete = constants.%a.patt.b51] // CHECK:STDOUT: %a.var_patt: %pattern_type.3f5 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var_storage %a.var_patt // CHECK:STDOUT: %.loc9_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -547,7 +547,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.3f5 = ref_binding_pattern a [concrete = constants.%a.patt.b51] // CHECK:STDOUT: %a.var_patt: %pattern_type.3f5 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var_storage %a.var_patt // CHECK:STDOUT: %.loc9_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -746,7 +746,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.3f5 = ref_binding_pattern a [concrete = constants.%a.patt.b51] // CHECK:STDOUT: %a.var_patt: %pattern_type.3f5 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var_storage %a.var_patt // CHECK:STDOUT: %.loc9_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -971,7 +971,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.3f5 = ref_binding_pattern a [concrete = constants.%a.patt.b51] // CHECK:STDOUT: %a.var_patt: %pattern_type.3f5 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var_storage %a.var_patt // CHECK:STDOUT: %.loc10_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -1240,7 +1240,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.0ed = ref_binding_pattern a [concrete = constants.%a.patt.7d5] // CHECK:STDOUT: %a.var_patt: %pattern_type.0ed = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.cec = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.cec = var_storage %a.var_patt // CHECK:STDOUT: %.loc11_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc11_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc11_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] @@ -1499,7 +1499,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.3f5 = ref_binding_pattern a [concrete = constants.%a.patt.b51] // CHECK:STDOUT: %a.var_patt: %pattern_type.3f5 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type.9a3 = var_storage %a.var_patt // CHECK:STDOUT: %.loc9_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_30.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_34.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] diff --git a/toolchain/check/testdata/eval/aggregates.carbon b/toolchain/check/testdata/eval/aggregates.carbon index 94086a25a728..2cf2bab9ef84 100644 --- a/toolchain/check/testdata/eval/aggregates.carbon +++ b/toolchain/check/testdata/eval/aggregates.carbon @@ -116,9 +116,9 @@ fn G(N:! i32) { // CHECK:STDOUT: %bound_method.763: = bound_method %int_3.1ba, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete] // CHECK:STDOUT: %int_3.410: %i32 = int_value 3 [concrete] // CHECK:STDOUT: %struct.55d: %struct_type.b.a.c = struct_value (%int_2.295, %int_1.0c6, %int_3.410) [concrete] -// CHECK:STDOUT: %.6b5: ref %i32 = struct_access file.%struct_copy.var, element1 [concrete] -// CHECK:STDOUT: %.e89: ref %i32 = struct_access file.%struct_copy.var, element0 [concrete] -// CHECK:STDOUT: %.dd4: ref %i32 = struct_access file.%struct_copy.var, element2 [concrete] +// CHECK:STDOUT: %.d67: ref %i32 = struct_access file.%struct_copy.var, element1 [concrete] +// CHECK:STDOUT: %.5f2: ref %i32 = struct_access file.%struct_copy.var, element0 [concrete] +// CHECK:STDOUT: %.19e: ref %i32 = struct_access file.%struct_copy.var, element2 [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.bound.4ec: = bound_method %int_3.410, %Int.as.Copy.impl.Op.4f6 [concrete] // CHECK:STDOUT: %bound_method.1b6: = bound_method %int_3.410, %Int.as.Copy.impl.Op.specific_fn [concrete] // CHECK:STDOUT: %struct.11a: %struct_type.a.b.c = struct_value (%int_1.0c6, %int_2.295, %int_3.410) [concrete] @@ -156,7 +156,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %tuple_copy.patt: %pattern_type.394 = ref_binding_pattern tuple_copy [concrete = constants.%tuple_copy.patt] // CHECK:STDOUT: %tuple_copy.var_patt: %pattern_type.394 = var_pattern %tuple_copy.patt [concrete = constants.%tuple_copy.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple_copy.var: ref %tuple.type.e55 = var %tuple_copy.var_patt [concrete] +// CHECK:STDOUT: %tuple_copy.var: ref %tuple.type.e55 = var_storage %tuple_copy.var_patt [concrete] // CHECK:STDOUT: %.loc4_26.1: type = splice_block %.loc4_26.3 [concrete = constants.%tuple.type.e55] { // CHECK:STDOUT: %i32.loc4_18: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc4_23: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -168,7 +168,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %struct_copy.patt: %pattern_type.9c3 = ref_binding_pattern struct_copy [concrete = constants.%struct_copy.patt] // CHECK:STDOUT: %struct_copy.var_patt: %pattern_type.9c3 = var_pattern %struct_copy.patt [concrete = constants.%struct_copy.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %struct_copy.var: ref %struct_type.a.b.c = var %struct_copy.var_patt [concrete] +// CHECK:STDOUT: %struct_copy.var: ref %struct_type.a.b.c = var_storage %struct_copy.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %struct_type.a.b.c [concrete = constants.%struct_type.a.b.c] { // CHECK:STDOUT: %i32.loc6_23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc6_32: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -180,7 +180,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %tuple_index.patt: %pattern_type.97e = ref_binding_pattern tuple_index [concrete = constants.%tuple_index.patt] // CHECK:STDOUT: %tuple_index.var_patt: %pattern_type.97e = var_pattern %tuple_index.patt [concrete = constants.%tuple_index.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple_index.var: ref %array_type = var %tuple_index.var_patt [concrete] +// CHECK:STDOUT: %tuple_index.var: ref %array_type = var_storage %tuple_index.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %array_type.loc8 [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -191,7 +191,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %struct_access.patt: %pattern_type.97e = ref_binding_pattern struct_access [concrete = constants.%struct_access.patt] // CHECK:STDOUT: %struct_access.var_patt: %pattern_type.97e = var_pattern %struct_access.patt [concrete = constants.%struct_access.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %struct_access.var: ref %array_type = var %struct_access.var_patt [concrete] +// CHECK:STDOUT: %struct_access.var: ref %array_type = var_storage %struct_access.var_patt [concrete] // CHECK:STDOUT: %.loc10: type = splice_block %array_type.loc10 [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc10: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1.loc10: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -281,7 +281,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %specific_fn.loc6_73.1: = specific_function %impl.elem0.loc6_73.1, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_73.2: = bound_method %.loc6_73.2, %specific_fn.loc6_73.1 [concrete = constants.%bound_method.681] // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_73.1: init %i32 = call %bound_method.loc6_73.2(%.loc6_73.2) [concrete = constants.%int_1.0c6] -// CHECK:STDOUT: %.loc6_73.3: ref %i32 = struct_access file.%struct_copy.var, element1 [concrete = constants.%.6b5] +// CHECK:STDOUT: %.loc6_73.3: ref %i32 = struct_access file.%struct_copy.var, element1 [concrete = constants.%.d67] // CHECK:STDOUT: %.loc6_73.4: init %i32 to %.loc6_73.3 = in_place_init %Int.as.Copy.impl.Op.call.loc6_73.1 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc6_73.5: %i32 = struct_access %.loc6_73.1, element0 [concrete = constants.%int_2.295] // CHECK:STDOUT: %impl.elem0.loc6_73.2: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] @@ -289,7 +289,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %specific_fn.loc6_73.2: = specific_function %impl.elem0.loc6_73.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_73.4: = bound_method %.loc6_73.5, %specific_fn.loc6_73.2 [concrete = constants.%bound_method.03a] // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_73.2: init %i32 = call %bound_method.loc6_73.4(%.loc6_73.5) [concrete = constants.%int_2.295] -// CHECK:STDOUT: %.loc6_73.6: ref %i32 = struct_access file.%struct_copy.var, element0 [concrete = constants.%.e89] +// CHECK:STDOUT: %.loc6_73.6: ref %i32 = struct_access file.%struct_copy.var, element0 [concrete = constants.%.5f2] // CHECK:STDOUT: %.loc6_73.7: init %i32 to %.loc6_73.6 = in_place_init %Int.as.Copy.impl.Op.call.loc6_73.2 [concrete = constants.%int_2.295] // CHECK:STDOUT: %.loc6_73.8: %i32 = struct_access %.loc6_73.1, element2 [concrete = constants.%int_3.410] // CHECK:STDOUT: %impl.elem0.loc6_73.3: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] @@ -297,7 +297,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %specific_fn.loc6_73.3: = specific_function %impl.elem0.loc6_73.3, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_73.6: = bound_method %.loc6_73.8, %specific_fn.loc6_73.3 [concrete = constants.%bound_method.1b6] // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_73.3: init %i32 = call %bound_method.loc6_73.6(%.loc6_73.8) [concrete = constants.%int_3.410] -// CHECK:STDOUT: %.loc6_73.9: ref %i32 = struct_access file.%struct_copy.var, element2 [concrete = constants.%.dd4] +// CHECK:STDOUT: %.loc6_73.9: ref %i32 = struct_access file.%struct_copy.var, element2 [concrete = constants.%.19e] // CHECK:STDOUT: %.loc6_73.10: init %i32 to %.loc6_73.9 = in_place_init %Int.as.Copy.impl.Op.call.loc6_73.3 [concrete = constants.%int_3.410] // CHECK:STDOUT: %.loc6_73.11: init %struct_type.a.b.c to file.%struct_copy.var = struct_init (%.loc6_73.4, %.loc6_73.7, %.loc6_73.10) [concrete = constants.%struct.11a] // CHECK:STDOUT: %.loc6_1: init %struct_type.a.b.c = converted %.loc6_73.1, %.loc6_73.11 [concrete = constants.%struct.11a] @@ -416,7 +416,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %array_index.patt: %pattern_type.97e = ref_binding_pattern array_index [concrete = constants.%array_index.patt] // CHECK:STDOUT: %array_index.var_patt: %pattern_type.97e = var_pattern %array_index.patt [concrete = constants.%array_index.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %array_index.var: ref %array_type.d27 = var %array_index.var_patt [concrete] +// CHECK:STDOUT: %array_index.var: ref %array_type.d27 = var_storage %array_index.var_patt [concrete] // CHECK:STDOUT: %.loc9: type = splice_block %array_type [concrete = constants.%array_type.d27] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -674,7 +674,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %u.patt.loc6_15.1: @F.%pattern_type.loc6 (%pattern_type.02b) = ref_binding_pattern u [symbolic = %u.patt.loc6_15.2 (constants.%u.patt)] // CHECK:STDOUT: %u.var_patt.loc6_3.1: @F.%pattern_type.loc6 (%pattern_type.02b) = var_pattern %u.patt.loc6_15.1 [symbolic = %u.var_patt.loc6_3.2 (constants.%u.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.var: ref @F.%tuple.type (%tuple.type.cd5) = var %u.var_patt.loc6_3.1 +// CHECK:STDOUT: %u.var: ref @F.%tuple.type (%tuple.type.cd5) = var_storage %u.var_patt.loc6_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc6_30.1: %DefaultOrUnformed.type = facet_value constants.%tuple.type.cd5, (constants.%DefaultOrUnformed.lookup_impl_witness.2ab) [symbolic = %DefaultOrUnformed.facet.loc6_30.2 (constants.%DefaultOrUnformed.facet.c98)] // CHECK:STDOUT: %.loc6_30.1: %DefaultOrUnformed.type = converted constants.%tuple.type.cd5, %DefaultOrUnformed.facet.loc6_30.1 [symbolic = %DefaultOrUnformed.facet.loc6_30.2 (constants.%DefaultOrUnformed.facet.c98)] // CHECK:STDOUT: %as_type.loc6: type = facet_access_type %.loc6_30.1 [symbolic = %tuple.type (constants.%tuple.type.cd5)] @@ -701,7 +701,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %v.patt.loc7_15.1: @F.%pattern_type.loc7 (%pattern_type.915) = ref_binding_pattern v [symbolic = %v.patt.loc7_15.2 (constants.%v.patt)] // CHECK:STDOUT: %v.var_patt.loc7_3.1: @F.%pattern_type.loc7 (%pattern_type.915) = var_pattern %v.patt.loc7_15.1 [symbolic = %v.var_patt.loc7_3.2 (constants.%v.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref @F.%struct_type.a.loc7_23.2 (%struct_type.a) = var %v.var_patt.loc7_3.1 +// CHECK:STDOUT: %v.var: ref @F.%struct_type.a.loc7_23.2 (%struct_type.a) = var_storage %v.var_patt.loc7_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc7_24.1: %DefaultOrUnformed.type = facet_value constants.%struct_type.a, (constants.%DefaultOrUnformed.lookup_impl_witness.53f) [symbolic = %DefaultOrUnformed.facet.loc7_24.2 (constants.%DefaultOrUnformed.facet.103)] // CHECK:STDOUT: %.loc7_24.1: %DefaultOrUnformed.type = converted constants.%struct_type.a, %DefaultOrUnformed.facet.loc7_24.1 [symbolic = %DefaultOrUnformed.facet.loc7_24.2 (constants.%DefaultOrUnformed.facet.103)] // CHECK:STDOUT: %as_type.loc7: type = facet_access_type %.loc7_24.1 [symbolic = %struct_type.a.loc7_23.2 (constants.%struct_type.a)] @@ -721,7 +721,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %w.patt.loc8_15.1: @F.%pattern_type.loc8 (%pattern_type.78a) = ref_binding_pattern w [symbolic = %w.patt.loc8_15.2 (constants.%w.patt)] // CHECK:STDOUT: %w.var_patt.loc8_3.1: @F.%pattern_type.loc8 (%pattern_type.78a) = var_pattern %w.patt.loc8_15.1 [symbolic = %w.var_patt.loc8_3.2 (constants.%w.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref @F.%array_type.loc8_27.2 (%array_type.50f) = var %w.var_patt.loc8_3.1 +// CHECK:STDOUT: %w.var: ref @F.%array_type.loc8_27.2 (%array_type.50f) = var_storage %w.var_patt.loc8_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc8_28.1: %DefaultOrUnformed.type = facet_value constants.%array_type.50f, (constants.%DefaultOrUnformed.lookup_impl_witness.1fb) [symbolic = %DefaultOrUnformed.facet.loc8_28.2 (constants.%DefaultOrUnformed.facet.d60)] // CHECK:STDOUT: %.loc8_28.1: %DefaultOrUnformed.type = converted constants.%array_type.50f, %DefaultOrUnformed.facet.loc8_28.1 [symbolic = %DefaultOrUnformed.facet.loc8_28.2 (constants.%DefaultOrUnformed.facet.d60)] // CHECK:STDOUT: %as_type.loc8: type = facet_access_type %.loc8_28.1 [symbolic = %array_type.loc8_27.2 (constants.%array_type.50f)] @@ -802,7 +802,7 @@ fn G(N:! i32) { // CHECK:STDOUT: %k.patt.loc14_15.1: @G.%pattern_type (%pattern_type.486) = ref_binding_pattern k [symbolic = %k.patt.loc14_15.2 (constants.%k.patt)] // CHECK:STDOUT: %k.var_patt.loc14_3.1: @G.%pattern_type (%pattern_type.486) = var_pattern %k.patt.loc14_15.1 [symbolic = %k.var_patt.loc14_3.2 (constants.%k.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %k.var: ref @G.%array_type.loc14_29.2 (%array_type.359) = var %k.var_patt.loc14_3.1 +// CHECK:STDOUT: %k.var: ref @G.%array_type.loc14_29.2 (%array_type.359) = var_storage %k.var_patt.loc14_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc14_30.1: %DefaultOrUnformed.type = facet_value constants.%array_type.359, (constants.%DefaultOrUnformed.lookup_impl_witness.5c0) [symbolic = %DefaultOrUnformed.facet.loc14_30.2 (constants.%DefaultOrUnformed.facet.b1c)] // CHECK:STDOUT: %.loc14_30.1: %DefaultOrUnformed.type = converted constants.%array_type.359, %DefaultOrUnformed.facet.loc14_30.1 [symbolic = %DefaultOrUnformed.facet.loc14_30.2 (constants.%DefaultOrUnformed.facet.b1c)] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc14_30.1 [symbolic = %array_type.loc14_29.2 (constants.%array_type.359)] diff --git a/toolchain/check/testdata/eval/branch.carbon b/toolchain/check/testdata/eval/branch.carbon index cf7f8de140f0..6e653533054b 100644 --- a/toolchain/check/testdata/eval/branch.carbon +++ b/toolchain/check/testdata/eval/branch.carbon @@ -95,7 +95,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %a.patt: %pattern_type.9ef = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.9ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc14_14.1: type = splice_block %.loc14_14.3 [concrete = constants.%A] { // CHECK:STDOUT: %F.ref.loc14: %F.type = name_ref F, %F.decl [concrete = constants.%F] // CHECK:STDOUT: %true: bool = bool_literal true [concrete = constants.%true] @@ -108,7 +108,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt.492] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %B = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %B = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc15_15.1: type = splice_block %.loc15_15.3 [concrete = constants.%B] { // CHECK:STDOUT: %F.ref.loc15: %F.type = name_ref F, %F.decl [concrete = constants.%F] // CHECK:STDOUT: %false: bool = bool_literal false [concrete = constants.%false] @@ -163,7 +163,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %a.patt: %pattern_type.9ef = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.9ef = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc10_14.1: type = splice_block %.loc10_14.3 [concrete = constants.%A] { // CHECK:STDOUT: %F.ref.loc10: %F.type = name_ref F, %F.decl [concrete = constants.%F] // CHECK:STDOUT: %true: bool = bool_literal true [concrete = constants.%true] @@ -176,7 +176,7 @@ var b: if false then A else B = MakeB(); // CHECK:STDOUT: %b.patt: %pattern_type.e39 = ref_binding_pattern b [concrete = constants.%b.patt.492] // CHECK:STDOUT: %b.var_patt: %pattern_type.e39 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %B = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %B = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc11_15.1: type = splice_block %.loc11_15.3 [concrete = constants.%B] { // CHECK:STDOUT: %F.ref.loc11: %F.type = name_ref F, %F.decl [concrete = constants.%F] // CHECK:STDOUT: %false: bool = bool_literal false [concrete = constants.%false] diff --git a/toolchain/check/testdata/eval/call.carbon b/toolchain/check/testdata/eval/call.carbon index a466ee20363c..83c4d49c82a6 100644 --- a/toolchain/check/testdata/eval/call.carbon +++ b/toolchain/check/testdata/eval/call.carbon @@ -243,7 +243,7 @@ fn H() { // CHECK:STDOUT: %a.patt: %pattern_type.777 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.777 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %tuple.type.555 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %tuple.type.555 = var_storage %a.var_patt // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc8_3: ref %tuple.type.555 = splice_block %a.var {} // CHECK:STDOUT: %F.call: init %tuple.type.555 to %.loc8_3 = call %F.ref() [concrete = constants.%tuple.479] @@ -385,7 +385,7 @@ fn H() { // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc17_43: %tuple.type.f94 = tuple_literal (%int_1, %int_2) [concrete = constants.%tuple.ad8] diff --git a/toolchain/check/testdata/for/actual.carbon b/toolchain/check/testdata/for/actual.carbon index 2dd737523548..aad8b8aebf23 100644 --- a/toolchain/check/testdata/for/actual.carbon +++ b/toolchain/check/testdata/for/actual.carbon @@ -678,7 +678,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %value.patt.loc12_16.1: @IntRange.as.Iterate.impl.Next.%pattern_type.loc12 (%pattern_type.142cb7.1) = ref_binding_pattern value [symbolic = %value.patt.loc12_16.2 (constants.%value.patt.505)] // CHECK:STDOUT: %value.var_patt.loc12_7.1: @IntRange.as.Iterate.impl.Next.%pattern_type.loc12 (%pattern_type.142cb7.1) = var_pattern %value.patt.loc12_16.1 [symbolic = %value.var_patt.loc12_7.2 (constants.%value.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %value.var: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = var %value.var_patt.loc12_7.1 +// CHECK:STDOUT: %value.var: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = var_storage %value.var_patt.loc12_7.1 // CHECK:STDOUT: %cursor.ref.loc12: @IntRange.as.Iterate.impl.Next.%ptr.loc11_38.1 (%ptr.41e) = name_ref cursor, %cursor // CHECK:STDOUT: %.loc12_32.1: ref @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = deref %cursor.ref.loc12 // CHECK:STDOUT: %.loc12_32.2: @IntRange.as.Iterate.impl.Next.%Int.loc11_37.1 (%Int.67af24.1) = acquire_value %.loc12_32.1 @@ -1115,7 +1115,7 @@ fn Read(y:! Core.IntLiteral) { // CHECK:STDOUT: %x.patt: %pattern_type.0f3 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.0f3 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %IntRange.bbd = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %IntRange.bbd = var_storage %x.var_patt // CHECK:STDOUT: %Range.ref: %Range.type = name_ref Range, imports.%Main.Range [concrete = constants.%Range] // CHECK:STDOUT: %y.ref: Core.IntLiteral = name_ref y, %y.loc4_10.2 [symbolic = %y.loc4_10.1 (constants.%y)] // CHECK:STDOUT: %.loc5_3: ref %IntRange.bbd = splice_block %x.var {} diff --git a/toolchain/check/testdata/for/basic.carbon b/toolchain/check/testdata/for/basic.carbon index 56aa16be3c72..61d6e077c594 100644 --- a/toolchain/check/testdata/for/basic.carbon +++ b/toolchain/check/testdata/for/basic.carbon @@ -138,7 +138,7 @@ fn Run() { // CHECK:STDOUT: %NewCursor.ref: %TrivialRange.as.Iterate.impl.NewCursor.type.de32c1.1 = name_ref NewCursor, @TrivialRange.as.Iterate.impl.%TrivialRange.as.Iterate.impl.NewCursor.decl.loc6_31.1 [concrete = constants.%TrivialRange.as.Iterate.impl.NewCursor.93de00.1] // CHECK:STDOUT: %TrivialRange.as.Iterate.impl.NewCursor.bound: = bound_method %.loc18_20.3, %NewCursor.ref [concrete = constants.%TrivialRange.as.Iterate.impl.NewCursor.bound.410] // CHECK:STDOUT: %TrivialRange.as.Iterate.impl.NewCursor.call: init %empty_tuple.type = call %TrivialRange.as.Iterate.impl.NewCursor.bound(%.loc18_20.3) -// CHECK:STDOUT: %var: ref %empty_tuple.type = var invalid +// CHECK:STDOUT: %var: ref %empty_tuple.type = var_storage invalid // CHECK:STDOUT: assign %var, %TrivialRange.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next // CHECK:STDOUT: diff --git a/toolchain/check/testdata/for/pattern.carbon b/toolchain/check/testdata/for/pattern.carbon index c5123d6ce6c4..e606ca5bcd31 100644 --- a/toolchain/check/testdata/for/pattern.carbon +++ b/toolchain/check/testdata/for/pattern.carbon @@ -219,7 +219,7 @@ fn Run() { // CHECK:STDOUT: %bound_method.loc10_36.2: = bound_method %.loc10_35.2, %specific_fn.loc10_36.1 // CHECK:STDOUT: %.loc10_35.3: %EmptyRange.de0 = acquire_value %.loc10_35.2 // CHECK:STDOUT: %EmptyRange.as.Iterate.impl.NewCursor.call: init %empty_struct_type = call %bound_method.loc10_36.2(%.loc10_35.3) -// CHECK:STDOUT: %var: ref %empty_struct_type = var invalid +// CHECK:STDOUT: %var: ref %empty_struct_type = var_storage invalid // CHECK:STDOUT: assign %var, %EmptyRange.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next // CHECK:STDOUT: @@ -402,7 +402,7 @@ fn Run() { // CHECK:STDOUT: %bound_method.loc10_40.2: = bound_method %.loc10_39.2, %specific_fn.loc10_40.1 // CHECK:STDOUT: %.loc10_39.3: %EmptyRange.de0 = acquire_value %.loc10_39.2 // CHECK:STDOUT: %EmptyRange.as.Iterate.impl.NewCursor.call: init %empty_struct_type = call %bound_method.loc10_40.2(%.loc10_39.3) -// CHECK:STDOUT: %var: ref %empty_struct_type = var invalid +// CHECK:STDOUT: %var: ref %empty_struct_type = var_storage invalid // CHECK:STDOUT: assign %var, %EmptyRange.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next // CHECK:STDOUT: @@ -428,7 +428,7 @@ fn Run() { // CHECK:STDOUT: if %.loc10_40.6 br !for.body else br !for.done // CHECK:STDOUT: // CHECK:STDOUT: !for.body: -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %.loc10_40.7: %Optional.Get.type.0a8 = specific_constant imports.%Core.import_ref.73b, @Optional(constants.%Copy.facet) [concrete = constants.%Optional.Get.d5d] // CHECK:STDOUT: %Get.ref: %Optional.Get.type.0a8 = name_ref Get, %.loc10_40.7 [concrete = constants.%Optional.Get.d5d] // CHECK:STDOUT: %Optional.Get.bound: = bound_method %.loc10_40.2, %Get.ref @@ -598,7 +598,7 @@ fn Run() { // CHECK:STDOUT: %bound_method.loc10_61.2: = bound_method %.loc10_60.2, %specific_fn.loc10_61.1 // CHECK:STDOUT: %.loc10_60.3: %EmptyRange.012 = acquire_value %.loc10_60.2 // CHECK:STDOUT: %EmptyRange.as.Iterate.impl.NewCursor.call: init %empty_struct_type = call %bound_method.loc10_61.2(%.loc10_60.3) -// CHECK:STDOUT: %var: ref %empty_struct_type = var invalid +// CHECK:STDOUT: %var: ref %empty_struct_type = var_storage invalid // CHECK:STDOUT: assign %var, %EmptyRange.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next // CHECK:STDOUT: @@ -801,7 +801,7 @@ fn Run() { // CHECK:STDOUT: %bound_method.loc10_49.2: = bound_method %.loc10_48.2, %specific_fn.loc10_49.1 // CHECK:STDOUT: %.loc10_48.3: %EmptyRange.617 = acquire_value %.loc10_48.2 // CHECK:STDOUT: %EmptyRange.as.Iterate.impl.NewCursor.call: init %empty_struct_type = call %bound_method.loc10_49.2(%.loc10_48.3) -// CHECK:STDOUT: %var: ref %empty_struct_type = var invalid +// CHECK:STDOUT: %var: ref %empty_struct_type = var_storage invalid // CHECK:STDOUT: assign %var, %EmptyRange.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/builtin/adapted_type.carbon b/toolchain/check/testdata/function/builtin/adapted_type.carbon index cb8c4d1386db..b6b9e1d9c71d 100644 --- a/toolchain/check/testdata/function/builtin/adapted_type.carbon +++ b/toolchain/check/testdata/function/builtin/adapted_type.carbon @@ -174,7 +174,7 @@ fn Int(N: MyIntLiteral) -> type = "int.make_type_signed"; // CHECK:STDOUT: %v.patt: %pattern_type.af4 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.af4 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %MyInt32 = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %MyInt32 = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %MyInt32.ref: type = name_ref MyInt32, %MyInt32.decl [concrete = constants.%MyInt32] // CHECK:STDOUT: %v: ref %MyInt32 = wrapper_binding v, %v.var [concrete = %v.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/builtin/call.carbon b/toolchain/check/testdata/function/builtin/call.carbon index f36f8617ee8f..df5c2380fcbf 100644 --- a/toolchain/check/testdata/function/builtin/call.carbon +++ b/toolchain/check/testdata/function/builtin/call.carbon @@ -140,7 +140,7 @@ fn RuntimeCall(a: i32, b: i32) -> i32 { // CHECK:STDOUT: %arr.patt: %pattern_type.771 = ref_binding_pattern arr [concrete = constants.%arr.patt] // CHECK:STDOUT: %arr.var_patt: %pattern_type.771 = var_pattern %arr.patt [concrete = constants.%arr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref %array_type = var %arr.var_patt [concrete] +// CHECK:STDOUT: %arr.var: ref %array_type = var_storage %arr.var_patt [concrete] // CHECK:STDOUT: %.loc17_30: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, %Add.decl [concrete = constants.%Add] diff --git a/toolchain/check/testdata/function/builtin/call_from_operator.carbon b/toolchain/check/testdata/function/builtin/call_from_operator.carbon index 61876e464656..8884f2017c8d 100644 --- a/toolchain/check/testdata/function/builtin/call_from_operator.carbon +++ b/toolchain/check/testdata/function/builtin/call_from_operator.carbon @@ -1031,7 +1031,7 @@ var arr: array(i32, (1 as i32) + (2 as i32)) = (3, 4, (3 as i32) + (4 as i32)); // CHECK:STDOUT: %arr.patt: %pattern_type.9e2 = ref_binding_pattern arr [concrete = constants.%arr.patt] // CHECK:STDOUT: %arr.var_patt: %pattern_type.9e2 = var_pattern %arr.patt [concrete = constants.%arr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref %array_type = var %arr.var_patt [concrete] +// CHECK:STDOUT: %arr.var: ref %array_type = var_storage %arr.var_patt [concrete] // CHECK:STDOUT: %.loc4_44: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %.loc4_16: type = type_literal constants.%i32.builtin [concrete = constants.%i32.builtin] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] diff --git a/toolchain/check/testdata/function/builtin/import.carbon b/toolchain/check/testdata/function/builtin/import.carbon index ac8c964a588a..cdc2365f7b54 100644 --- a/toolchain/check/testdata/function/builtin/import.carbon +++ b/toolchain/check/testdata/function/builtin/import.carbon @@ -218,7 +218,7 @@ var arr: array(i32, Core.AsIntLiteral(Core.TestAdd(Core.AsI32(1), Core.AsI32(2)) // CHECK:STDOUT: %arr.patt: %pattern_type.9e2 = ref_binding_pattern arr [concrete = constants.%arr.patt] // CHECK:STDOUT: %arr.var_patt: %pattern_type.9e2 = var_pattern %arr.patt [concrete = constants.%arr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref %array_type = var %arr.var_patt [concrete] +// CHECK:STDOUT: %arr.var: ref %array_type = var_storage %arr.var_patt [concrete] // CHECK:STDOUT: %.loc4_82: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %.loc4_16: type = type_literal constants.%i32.builtin [concrete = constants.%i32.builtin] // CHECK:STDOUT: %Core.ref.loc4_21: = name_ref Core, imports.%Core [concrete = imports.%Core] diff --git a/toolchain/check/testdata/function/builtin/method.carbon b/toolchain/check/testdata/function/builtin/method.carbon index c675dec54694..e21d85149519 100644 --- a/toolchain/check/testdata/function/builtin/method.carbon +++ b/toolchain/check/testdata/function/builtin/method.carbon @@ -163,7 +163,7 @@ var arr: array(i32, (1 as i32).(I.F)(2)); // CHECK:STDOUT: %arr.patt: %pattern_type.771 = ref_binding_pattern arr [concrete = constants.%arr.patt] // CHECK:STDOUT: %arr.var_patt: %pattern_type.771 = var_pattern %arr.patt [concrete = constants.%arr.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %arr.var: ref %array_type = var %arr.var_patt [concrete] +// CHECK:STDOUT: %arr.var: ref %array_type = var_storage %arr.var_patt [concrete] // CHECK:STDOUT: %.loc23_40: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc23_16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] diff --git a/toolchain/check/testdata/function/call/alias.carbon b/toolchain/check/testdata/function/call/alias.carbon index ae5191246c0c..5a142b0e11d9 100644 --- a/toolchain/check/testdata/function/call/alias.carbon +++ b/toolchain/check/testdata/function/call/alias.carbon @@ -86,7 +86,7 @@ fn Main() { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt // CHECK:STDOUT: %B.ref: %A.type = name_ref B, file.%B [concrete = constants.%A] // CHECK:STDOUT: %A.call: init %empty_tuple.type = call %B.ref() // CHECK:STDOUT: assign %b.var, %A.call 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 99c55851ff30..39684d4ce46f 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -125,7 +125,7 @@ fn Run() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt // CHECK:STDOUT: %Foo.ref: %Foo.type = name_ref Foo, file.%Foo.decl [concrete = constants.%Foo] // CHECK:STDOUT: %Foo.call: init %f64.dc1 = call %Foo.ref() // CHECK:STDOUT: %.loc25: %i32 = converted %Foo.call, [concrete = ] diff --git a/toolchain/check/testdata/function/call/form.carbon b/toolchain/check/testdata/function/call/form.carbon index 7ce2f13c3b53..a6fab2c1d1e4 100644 --- a/toolchain/check/testdata/function/call/form.carbon +++ b/toolchain/check/testdata/function/call/form.carbon @@ -395,7 +395,7 @@ fn G() { // CHECK:STDOUT: %bound_method.loc4_7.2: = bound_method %int_0, %specific_fn [concrete = constants.%bound_method] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method.loc4_7.2(%int_0) [concrete = constants.%int_0.3c0] // CHECK:STDOUT: %.loc4: init %i32 = converted %int_0, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_0.3c0] -// CHECK:STDOUT: %x.var: ref %i32 = var @F.%x.var_patt +// CHECK:STDOUT: %x.var: ref %i32 = var_storage @F.%x.var_patt // CHECK:STDOUT: assign %x.var, %.loc4 // CHECK:STDOUT: %F.call: init %empty_tuple.type = call %F.ref(%x.var) // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 @@ -588,7 +588,7 @@ fn G() { // CHECK:STDOUT: %_.patt: %pattern_type.6b6 = ref_binding_pattern _ [concrete = constants.%_.patt] // CHECK:STDOUT: %_.var_patt: %pattern_type.6b6 = var_pattern %_.patt [concrete = constants.%_.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.var: ref %i32 = var %_.var_patt +// CHECK:STDOUT: %_.var: ref %i32 = var_storage %_.var_patt // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call: init %i32 = call %F.ref() // CHECK:STDOUT: assign %_.var, %F.call @@ -856,7 +856,7 @@ fn G() { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt.113] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt.68d] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var.loc11: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var.loc11: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc11: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc11_3.1: = bound_method %int_0, %impl.elem0.loc11 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -871,7 +871,7 @@ fn G() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt // CHECK:STDOUT: %F.ref.loc13: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %i32.loc13_34: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc13_30: Core.Form = init_form %i32.loc13_34 [concrete = constants.%.795] @@ -883,7 +883,7 @@ fn G() { // CHECK:STDOUT: %specific_fn.loc13: = specific_function %impl.elem0.loc13, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc13_40.2: = bound_method %.loc13_40, %specific_fn.loc13 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc13_40.2(%.loc13_40) -// CHECK:STDOUT: %v.var.1: ref %i32 = var constants.%v.var_patt.13561f.1 +// CHECK:STDOUT: %v.var.1: ref %i32 = var_storage constants.%v.var_patt.13561f.1 // CHECK:STDOUT: assign %v.var.1, %Int.as.Copy.impl.Op.call // CHECK:STDOUT: %F.call.loc13: init %i32 = call %F.specific_fn.loc13(%v.var.1) // CHECK:STDOUT: assign %x.var, %F.call.loc13 diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index f254866d970a..030388fc3470 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -134,7 +134,7 @@ fn Main() { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt // CHECK:STDOUT: %Echo.ref: %Echo.type = name_ref Echo, file.%Echo.decl [concrete = constants.%Echo] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index b501b262d0a1..5467de5b6be4 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -123,7 +123,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.e71 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.e71 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %tuple.type.a8a = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %tuple.type.a8a = var_storage %x.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc18_22.1: %tuple.type.985 = tuple_literal (%int_1) [concrete = constants.%tuple.378] // CHECK:STDOUT: %impl.elem0.loc18: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/function/call/ref.carbon b/toolchain/check/testdata/function/call/ref.carbon index 1933beced8fa..14ea2b39b870 100644 --- a/toolchain/check/testdata/function/call/ref.carbon +++ b/toolchain/check/testdata/function/call/ref.carbon @@ -171,7 +171,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc8_3.1: = bound_method %int_0, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -259,7 +259,7 @@ fn G(ref d: D) { F(ref d); } // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%C, (constants.%DefaultOrUnformed.impl_witness.59d) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_11.1: %DefaultOrUnformed.type = converted constants.%C, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_11.1 [concrete = constants.%C] diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index 4dfd1d67f16f..6c33cad098b1 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt // CHECK:STDOUT: %MakeImplicitEmptyTuple.ref: %MakeImplicitEmptyTuple.type = name_ref MakeImplicitEmptyTuple, file.%MakeImplicitEmptyTuple.decl [concrete = constants.%MakeImplicitEmptyTuple] // CHECK:STDOUT: %MakeImplicitEmptyTuple.call: init %empty_tuple.type = call %MakeImplicitEmptyTuple.ref() // CHECK:STDOUT: assign %b.var, %MakeImplicitEmptyTuple.call diff --git a/toolchain/check/testdata/function/declaration/export_name.carbon b/toolchain/check/testdata/function/declaration/export_name.carbon index e826c635523e..33f0009b5460 100644 --- a/toolchain/check/testdata/function/declaration/export_name.carbon +++ b/toolchain/check/testdata/function/declaration/export_name.carbon @@ -105,7 +105,7 @@ var f: () = F(); // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/function/declaration/extern.carbon b/toolchain/check/testdata/function/declaration/extern.carbon index 098ee07b4006..4517ea86bf78 100644 --- a/toolchain/check/testdata/function/declaration/extern.carbon +++ b/toolchain/check/testdata/function/declaration/extern.carbon @@ -127,7 +127,7 @@ extern library "basic" fn F(); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 03b8d8309f69..4528b238f31b 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -570,7 +570,7 @@ import library "extern_api"; // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -580,14 +580,14 @@ import library "extern_api"; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] @@ -597,7 +597,7 @@ import library "extern_api"; // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc9_9.1: type = splice_block %.loc9_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc9_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_9.3: type = converted %.loc9_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -607,7 +607,7 @@ import library "extern_api"; // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -788,7 +788,7 @@ import library "extern_api"; // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc52_9.1: type = splice_block %.loc52_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -798,14 +798,14 @@ import library "extern_api"; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc54: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] @@ -815,7 +815,7 @@ import library "extern_api"; // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc55_9.1: type = splice_block %.loc55_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -825,7 +825,7 @@ import library "extern_api"; // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc56_9.1: type = splice_block %.loc56_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1006,7 +1006,7 @@ import library "extern_api"; // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc12_9.1: type = splice_block %.loc12_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc12_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_9.3: type = converted %.loc12_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1016,14 +1016,14 @@ import library "extern_api"; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc14: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc14: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] @@ -1033,7 +1033,7 @@ import library "extern_api"; // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc15_9.1: type = splice_block %.loc15_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc15_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_9.3: type = converted %.loc15_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1043,7 +1043,7 @@ import library "extern_api"; // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc16_9.1: type = splice_block %.loc16_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc16_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_9.3: type = converted %.loc16_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1199,7 +1199,7 @@ import library "extern_api"; // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc52_9.1: type = splice_block %.loc52_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1209,14 +1209,14 @@ import library "extern_api"; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc54: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] @@ -1226,7 +1226,7 @@ import library "extern_api"; // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc55_9.1: type = splice_block %.loc55_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1236,7 +1236,7 @@ import library "extern_api"; // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc56_9.1: type = splice_block %.loc56_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1392,7 +1392,7 @@ import library "extern_api"; // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc52_9.1: type = splice_block %.loc52_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc52_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc52_9.3: type = converted %.loc52_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1402,14 +1402,14 @@ import library "extern_api"; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc53: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc54: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc54: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] @@ -1419,7 +1419,7 @@ import library "extern_api"; // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %.loc55_9.1: type = splice_block %.loc55_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc55_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc55_9.3: type = converted %.loc55_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -1429,7 +1429,7 @@ import library "extern_api"; // CHECK:STDOUT: %e.patt: %pattern_type.cb1 = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type.cb1 = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc56_9.1: type = splice_block %.loc56_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc56_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc56_9.3: type = converted %.loc56_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index ba26f1390009..8da9148f3e94 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -360,7 +360,7 @@ fn D() {} // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -370,14 +370,14 @@ fn D() {} // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt.b23] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.e1a = ref_binding_pattern c [concrete = constants.%c.patt.863] // CHECK:STDOUT: %c.var_patt: %pattern_type.e1a = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.c = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %struct_type.c = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %struct_type.c [concrete = constants.%struct_type.c] { // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.c: type = struct_type {.c: %i32} [concrete = constants.%struct_type.c] diff --git a/toolchain/check/testdata/function/definition/import_access.carbon b/toolchain/check/testdata/function/definition/import_access.carbon index 4f4df9484949..241736a8be55 100644 --- a/toolchain/check/testdata/function/definition/import_access.carbon +++ b/toolchain/check/testdata/function/definition/import_access.carbon @@ -222,7 +222,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -260,7 +260,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -302,7 +302,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -345,7 +345,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -383,7 +383,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -425,7 +425,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -468,7 +468,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -510,7 +510,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -552,7 +552,7 @@ private fn Redecl() {} // CHECK:STDOUT: %f.patt: %pattern_type = ref_binding_pattern f [concrete = constants.%f.patt] // CHECK:STDOUT: %f.var_patt: %pattern_type = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %empty_tuple.type = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc10_9.1: type = splice_block %.loc10_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_9.3: type = converted %.loc10_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/function/generic/resolve_used.carbon b/toolchain/check/testdata/function/generic/resolve_used.carbon index f171fb80bfa1..cebd657fd6d9 100644 --- a/toolchain/check/testdata/function/generic/resolve_used.carbon +++ b/toolchain/check/testdata/function/generic/resolve_used.carbon @@ -166,7 +166,7 @@ fn CallNegative() { // CHECK:STDOUT: %v.patt.loc9_15.1: @ErrorIfNIsZero.%pattern_type (%pattern_type.142) = ref_binding_pattern v [symbolic = %v.patt.loc9_15.2 (constants.%v.patt.834)] // CHECK:STDOUT: %v.var_patt.loc9_3.1: @ErrorIfNIsZero.%pattern_type (%pattern_type.142) = var_pattern %v.patt.loc9_15.1 [symbolic = %v.var_patt.loc9_3.2 (constants.%v.var_patt.cd4)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref @ErrorIfNIsZero.%Int.loc9_27.2 (%Int) = var %v.var_patt.loc9_3.1 +// CHECK:STDOUT: %v.var: ref @ErrorIfNIsZero.%Int.loc9_27.2 (%Int) = var_storage %v.var_patt.loc9_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc9_28.1: %DefaultOrUnformed.type = facet_value constants.%Int, (constants.%DefaultOrUnformed.lookup_impl_witness) [symbolic = %DefaultOrUnformed.facet.loc9_28.2 (constants.%DefaultOrUnformed.facet.e73)] // CHECK:STDOUT: %.loc9_28.1: %DefaultOrUnformed.type = converted constants.%Int, %DefaultOrUnformed.facet.loc9_28.1 [symbolic = %DefaultOrUnformed.facet.loc9_28.2 (constants.%DefaultOrUnformed.facet.e73)] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc9_28.1 [symbolic = %Int.loc9_27.2 (constants.%Int)] diff --git a/toolchain/check/testdata/function/generic/return_slot.carbon b/toolchain/check/testdata/function/generic/return_slot.carbon index ff953130dbc5..f93351a7915c 100644 --- a/toolchain/check/testdata/function/generic/return_slot.carbon +++ b/toolchain/check/testdata/function/generic/return_slot.carbon @@ -201,7 +201,7 @@ fn G() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %Wrap.ref.loc22: %Wrap.type = name_ref Wrap, file.%Wrap.decl [concrete = constants.%Wrap.generic] // CHECK:STDOUT: %i32.loc22_28: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Wrap.loc22: type = class_type @Wrap, @Wrap(constants.%i32) [concrete = constants.%Wrap.aab] @@ -216,7 +216,7 @@ fn G() { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt // CHECK:STDOUT: %Wrap.ref.loc23: %Wrap.type = name_ref Wrap, file.%Wrap.decl [concrete = constants.%Wrap.generic] // CHECK:STDOUT: %.loc23_28: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc23_29: type = converted %.loc23_28, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -235,7 +235,7 @@ fn G() { // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %Wrap.ref.loc24: %Wrap.type = name_ref Wrap, file.%Wrap.decl [concrete = constants.%Wrap.generic] // CHECK:STDOUT: %C.ref.loc24_26: type = name_ref C, file.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %Wrap.loc24: type = class_type @Wrap, @Wrap(constants.%C) [concrete = constants.%Wrap.fad] diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index d23c4c1f48b9..f39a3af05bd0 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -115,7 +115,7 @@ fn F(T:! type) { // CHECK:STDOUT: %p.patt.loc16_8.1: @F.%pattern_type.loc16 (%pattern_type.4f4) = ref_binding_pattern p [symbolic = %p.patt.loc16_8.2 (constants.%p.patt)] // CHECK:STDOUT: %p.var_patt.loc16_3.1: @F.%pattern_type.loc16 (%pattern_type.4f4) = var_pattern %p.patt.loc16_8.1 [symbolic = %p.var_patt.loc16_3.2 (constants.%p.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref @F.%ptr.loc16_11.2 (%ptr) = var %p.var_patt.loc16_3.1 +// CHECK:STDOUT: %p.var: ref @F.%ptr.loc16_11.2 (%ptr) = var_storage %p.var_patt.loc16_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc16_12.1: %DefaultOrUnformed.type = facet_value constants.%ptr, (constants.%DefaultOrUnformed.lookup_impl_witness) [symbolic = %DefaultOrUnformed.facet.loc16_12.2 (constants.%DefaultOrUnformed.facet)] // CHECK:STDOUT: %.loc16_12.1: %DefaultOrUnformed.type = converted constants.%ptr, %DefaultOrUnformed.facet.loc16_12.1 [symbolic = %DefaultOrUnformed.facet.loc16_12.2 (constants.%DefaultOrUnformed.facet)] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc16_12.1 [symbolic = %ptr.loc16_11.2 (constants.%ptr)] diff --git a/toolchain/check/testdata/generic/dependent_param.carbon b/toolchain/check/testdata/generic/dependent_param.carbon index 5ee899c893a0..588537ec5225 100644 --- a/toolchain/check/testdata/generic/dependent_param.carbon +++ b/toolchain/check/testdata/generic/dependent_param.carbon @@ -120,7 +120,7 @@ var n: i32 = Outer(i32).Inner(42).Get(); // CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt [concrete] +// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %n: ref %i32 = wrapper_binding n, %n.var [concrete = %n.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/generic/local.carbon b/toolchain/check/testdata/generic/local.carbon index 9ed1d9f48fc3..28e55e6198ad 100644 --- a/toolchain/check/testdata/generic/local.carbon +++ b/toolchain/check/testdata/generic/local.carbon @@ -171,7 +171,7 @@ class C(C:! type) { // CHECK:STDOUT: %v.patt: %pattern_type.1f3 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.1f3 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %C.8eb = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %C.8eb = var_storage %v.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc8_33.1: %struct_type.x.c96 = struct_literal (%int_1) [concrete = constants.%struct] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/generic/template/unimplemented.carbon b/toolchain/check/testdata/generic/template/unimplemented.carbon index 262c7e44d4cd..84f796d18179 100644 --- a/toolchain/check/testdata/generic/template/unimplemented.carbon +++ b/toolchain/check/testdata/generic/template/unimplemented.carbon @@ -370,7 +370,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %v.patt.loc14_15.1: @F.%pattern_type (%pattern_type.f4e485.2) = ref_binding_pattern v [template = %v.patt.loc14_15.2 (constants.%v.patt)] // CHECK:STDOUT: %v.var_patt.loc14_3.1: @F.%pattern_type (%pattern_type.f4e485.2) = var_pattern %v.patt.loc14_15.1 [template = %v.var_patt.loc14_3.2 (constants.%v.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref @F.%T.as_type.loc4_36.1 (%T.as_type.700) = var %v.var_patt.loc14_3.1 +// CHECK:STDOUT: %v.var: ref @F.%T.as_type.loc4_36.1 (%T.as_type.700) = var_storage %v.var_patt.loc14_3.1 // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: %ImplicitAs.type.loc14_3.1: type = facet_type <@ImplicitAs, @ImplicitAs(constants.%T.as_type.700)> [template = %ImplicitAs.type.loc14_3.2 (constants.%ImplicitAs.type.f42)] // CHECK:STDOUT: %.loc14_3.1: @F.%.loc14_3.6 (@F.%.loc14_3.6) = splice_inst %.loc14_3.5 @@ -386,7 +386,7 @@ fn F[template T:! Core.Destroy](x: T) { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %i32 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %i32 = var_storage %w.var_patt // CHECK:STDOUT: %x.ref: @F.%T.as_type.loc4_36.1 (%T.as_type.700) = name_ref x, %x // CHECK:STDOUT: %.loc22: %i32 = converted %x.ref, [concrete = ] // CHECK:STDOUT: assign %w.var, diff --git a/toolchain/check/testdata/generic/var_param.carbon b/toolchain/check/testdata/generic/var_param.carbon index f8d8b8c786f6..1e935e5d3a0e 100644 --- a/toolchain/check/testdata/generic/var_param.carbon +++ b/toolchain/check/testdata/generic/var_param.carbon @@ -127,7 +127,7 @@ fn Test(x: i32) { // CHECK:STDOUT: %specific_fn: = specific_function %impl.elem0, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc27_10.2: = bound_method %x.ref, %specific_fn // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc27_10.2(%x.ref) -// CHECK:STDOUT: %x.var: ref %i32 = var @TestOp.%x.param_patt.loc22_25.1 +// CHECK:STDOUT: %x.var: ref %i32 = var_storage @TestOp.%x.param_patt.loc22_25.1 // CHECK:STDOUT: assign %x.var, %Int.as.Copy.impl.Op.call // CHECK:STDOUT: %TestOp.call: init %empty_tuple.type = call %TestOp.specific_fn(%x.var) // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %x.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/check/testdata/global/basics.carbon b/toolchain/check/testdata/global/basics.carbon index f8e6b7840d54..879926f91349 100644 --- a/toolchain/check/testdata/global/basics.carbon +++ b/toolchain/check/testdata/global/basics.carbon @@ -79,7 +79,7 @@ var a: A = Make(); // CHECK:STDOUT: %a.patt: %pattern_type.a96 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.a96 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_struct_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_struct_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc4_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] @@ -114,7 +114,7 @@ var a: A = Make(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_struct_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_struct_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc4_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] @@ -148,7 +148,7 @@ var a: A = Make(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_struct_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_struct_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc6_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] @@ -181,7 +181,7 @@ var a: A = Make(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [concrete = constants.%A] // CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } @@ -211,7 +211,7 @@ var a: A = Make(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [concrete = constants.%A] // CHECK:STDOUT: %a: ref %A = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 7113d6959e4c..ea6655f85617 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -139,7 +139,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %x.patt: %pattern_type.97e = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.97e = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %array_type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %array_type = var_storage %x.var_patt // CHECK:STDOUT: %int_0.loc16_27: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %.loc16_29.1: %tuple.type.985 = tuple_literal (%int_0.loc16_27) [concrete = constants.%tuple.4f2] // CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index ff8b0322dfc3..03ba7c406d10 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -301,7 +301,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc27: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc27_3.1: = bound_method %int_1, %impl.elem0.loc27 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] @@ -335,7 +335,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.f00 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.f00 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %ptr.d08 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %ptr.d08 = var_storage %w.var_patt // CHECK:STDOUT: %v.ref: ref %i32 = name_ref v, %v // CHECK:STDOUT: %addr: %ptr.d08 = addr_of %v.ref // CHECK:STDOUT: %impl.elem0.loc28: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] @@ -396,7 +396,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc33: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc33_3.1: = bound_method %int_1, %impl.elem0.loc33 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] @@ -429,7 +429,7 @@ fn PartiallyConstant(t: type) -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.f00 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.f00 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %ptr.d08 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %ptr.d08 = var_storage %w.var_patt // CHECK:STDOUT: %v.ref: ref %i32 = name_ref v, %v // CHECK:STDOUT: %addr: %ptr.d08 = addr_of %v.ref // CHECK:STDOUT: %impl.elem0.loc34: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] diff --git a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon index 94cad6633dec..adfc4f56f207 100644 --- a/toolchain/check/testdata/if_expr/fail_partial_constant.carbon +++ b/toolchain/check/testdata/if_expr/fail_partial_constant.carbon @@ -95,7 +95,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: br !.loc12_20 @@ -172,7 +172,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: br !.loc9_20 @@ -199,7 +199,7 @@ fn ChosenBranchIsNonConstant(t: type) { // CHECK:STDOUT: %w.patt: = ref_binding_pattern w [concrete = ] // CHECK:STDOUT: %w.var_patt: = var_pattern %w.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref = var %w.var_patt [concrete = ] +// CHECK:STDOUT: %w.var: ref = var_storage %w.var_patt [concrete = ] // CHECK:STDOUT: %int_1.loc14: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: assign %w.var, // CHECK:STDOUT: br !.loc14_20 diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 08a9c951a964..0bb7a3acb450 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -124,7 +124,7 @@ fn F(cond: bool) { // CHECK:STDOUT: %a.patt: %pattern_type.20e3 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.20e3 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %struct_type.a.b.b4c = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %struct_type.a.b.b4c = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc18_46.1: %struct_type.a.b.cfd = struct_literal (%int_1, %int_2) [concrete = constants.%struct.4aa] diff --git a/toolchain/check/testdata/impl/extend_impl_generic.carbon b/toolchain/check/testdata/impl/extend_impl_generic.carbon index 6f9b8ebd3556..22eec4918ad0 100644 --- a/toolchain/check/testdata/impl/extend_impl_generic.carbon +++ b/toolchain/check/testdata/impl/extend_impl_generic.carbon @@ -333,7 +333,7 @@ class X(U:! type) { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt // CHECK:STDOUT: %c.ref: %C = name_ref c, %c // CHECK:STDOUT: %.loc22_24: %HasF.assoc_type.aee = specific_constant @HasF.WithSelf.%assoc0.loc5_14.1, @HasF.WithSelf(constants.%Param, constants.%C.type.facet) [concrete = constants.%assoc0.be0] // CHECK:STDOUT: %F.ref.loc22: %HasF.assoc_type.aee = name_ref F, %.loc22_24 [concrete = constants.%assoc0.be0] diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index 8921fe2a365d..acf20b5730ad 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -127,7 +127,7 @@ class C { // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %.loc23_26.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc23_26.2: init %C to %c.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc23_7: init %C = converted %.loc23_26.1, %.loc23_26.2 [concrete = constants.%C.val] diff --git a/toolchain/check/testdata/impl/import_builtin_call.carbon b/toolchain/check/testdata/impl/import_builtin_call.carbon index 0b96b3b223ab..88d54ae2bb3c 100644 --- a/toolchain/check/testdata/impl/import_builtin_call.carbon +++ b/toolchain/check/testdata/impl/import_builtin_call.carbon @@ -149,7 +149,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %m.patt: %pattern_type.e13 = ref_binding_pattern m [concrete = constants.%m.patt] // CHECK:STDOUT: %m.var_patt: %pattern_type.e13 = var_pattern %m.patt [concrete = constants.%m.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %m.var: ref %i64.builtin = var %m.var_patt [concrete] +// CHECK:STDOUT: %m.var: ref %i64.builtin = var_storage %m.var_patt [concrete] // CHECK:STDOUT: %.loc7_14.1: type = splice_block %.loc7_14.3 [concrete = constants.%i64.builtin] { // CHECK:STDOUT: %Int.ref.loc7: %Int.type = name_ref Int, imports.%Main.Int [concrete = constants.%Int] // CHECK:STDOUT: %int_64.loc7: Core.IntLiteral = int_value 64 [concrete = constants.%int_64.fab] @@ -162,7 +162,7 @@ var n: Int(64) = MakeFromClass(FromLiteral(64) as OtherInt); // CHECK:STDOUT: %n.patt: %pattern_type.e13 = ref_binding_pattern n [concrete = constants.%n.patt.914] // CHECK:STDOUT: %n.var_patt: %pattern_type.e13 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i64.builtin = var %n.var_patt [concrete] +// CHECK:STDOUT: %n.var: ref %i64.builtin = var_storage %n.var_patt [concrete] // CHECK:STDOUT: %.loc8_14.1: type = splice_block %.loc8_14.3 [concrete = constants.%i64.builtin] { // CHECK:STDOUT: %Int.ref.loc8: %Int.type = name_ref Int, imports.%Main.Int [concrete = constants.%Int] // CHECK:STDOUT: %int_64.loc8: Core.IntLiteral = int_value 64 [concrete = constants.%int_64.fab] diff --git a/toolchain/check/testdata/impl/import_use_generic.carbon b/toolchain/check/testdata/impl/import_use_generic.carbon index a17a5a07bbf2..72ab5bdd23e1 100644 --- a/toolchain/check/testdata/impl/import_use_generic.carbon +++ b/toolchain/check/testdata/impl/import_use_generic.carbon @@ -286,7 +286,7 @@ fn H() -> C({}).(I.F)() {} // CHECK:STDOUT: %c.patt: %pattern_type.2fd = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.2fd = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C.d8e = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C.d8e = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6_12.1: type = splice_block %C [concrete = constants.%C.d8e] { // CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Main.C [concrete = constants.%C.generic] // CHECK:STDOUT: %.loc6_11: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] diff --git a/toolchain/check/testdata/impl/lookup/import.carbon b/toolchain/check/testdata/impl/lookup/import.carbon index 8dffb8fc4598..5dc58899e157 100644 --- a/toolchain/check/testdata/impl/lookup/import.carbon +++ b/toolchain/check/testdata/impl/lookup/import.carbon @@ -1931,7 +1931,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %obj.patt: %pattern_type.f0f = ref_binding_pattern obj [concrete = constants.%obj.patt] // CHECK:STDOUT: %obj.var_patt: %pattern_type.f0f = var_pattern %obj.patt [concrete = constants.%obj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj.var: ref %AnyParam.591 = var %obj.var_patt +// CHECK:STDOUT: %obj.var: ref %AnyParam.591 = var_storage %obj.var_patt // CHECK:STDOUT: %.loc13_58.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc13_58.2: init %AnyParam.591 to %obj.var = class_init () [concrete = constants.%AnyParam.val] // CHECK:STDOUT: %.loc13_3: init %AnyParam.591 = converted %.loc13_58.1, %.loc13_58.2 [concrete = constants.%AnyParam.val] @@ -2175,7 +2175,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %obj.patt: %pattern_type.f0f = ref_binding_pattern obj [concrete = constants.%obj.patt] // CHECK:STDOUT: %obj.var_patt: %pattern_type.f0f = var_pattern %obj.patt [concrete = constants.%obj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj.var: ref %AnyParam.591 = var %obj.var_patt +// CHECK:STDOUT: %obj.var: ref %AnyParam.591 = var_storage %obj.var_patt // CHECK:STDOUT: %.loc9_50.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_50.2: init %AnyParam.591 to %obj.var = class_init () [concrete = constants.%AnyParam.val] // CHECK:STDOUT: %.loc8: init %AnyParam.591 = converted %.loc9_50.1, %.loc9_50.2 [concrete = constants.%AnyParam.val] @@ -2463,7 +2463,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %obj.patt: %pattern_type.005 = ref_binding_pattern obj [concrete = constants.%obj.patt] // CHECK:STDOUT: %obj.var_patt: %pattern_type.005 = var_pattern %obj.patt [concrete = constants.%obj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj.var: ref %AnyParam.21c = var %obj.var_patt +// CHECK:STDOUT: %obj.var: ref %AnyParam.21c = var_storage %obj.var_patt // CHECK:STDOUT: %.loc13_54.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc13_54.2: init %AnyParam.21c to %obj.var = class_init () [concrete = constants.%AnyParam.val] // CHECK:STDOUT: %.loc13_3: init %AnyParam.21c = converted %.loc13_54.1, %.loc13_54.2 [concrete = constants.%AnyParam.val] @@ -2701,7 +2701,7 @@ fn Test(c: HasExtraInterfaces.C(type)) { // CHECK:STDOUT: %obj.patt: %pattern_type.005 = ref_binding_pattern obj [concrete = constants.%obj.patt] // CHECK:STDOUT: %obj.var_patt: %pattern_type.005 = var_pattern %obj.patt [concrete = constants.%obj.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %obj.var: ref %AnyParam.21c = var %obj.var_patt +// CHECK:STDOUT: %obj.var: ref %AnyParam.21c = var_storage %obj.var_patt // CHECK:STDOUT: %.loc8_74.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_74.2: init %AnyParam.21c to %obj.var = class_init () [concrete = constants.%AnyParam.val] // CHECK:STDOUT: %.loc8_3: init %AnyParam.21c = converted %.loc8_74.1, %.loc8_74.2 [concrete = constants.%AnyParam.val] diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index b196005c4568..08a827aee126 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -111,7 +111,7 @@ var d: i32 = a[b]; // CHECK:STDOUT: %a.patt: %pattern_type.7b0 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.7b0 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] @@ -122,21 +122,21 @@ var d: i32 = a[b]; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %i32 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %i32 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc18: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index bfb7f328e2e9..53ae0fb11163 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -187,7 +187,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %a.patt: %pattern_type.771 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.771 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc18_27: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc18_30: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %int_3.loc18_33: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] @@ -232,7 +232,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %pa.patt: %pattern_type.f00 = ref_binding_pattern pa [concrete = constants.%pa.patt] // CHECK:STDOUT: %pa.var_patt: %pattern_type.f00 = var_pattern %pa.patt [concrete = constants.%pa.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %pa.var: ref %ptr.d08 = var %pa.var_patt +// CHECK:STDOUT: %pa.var: ref %ptr.d08 = var_storage %pa.var_patt // CHECK:STDOUT: %a.ref.loc21: ref %array_type = name_ref a, %a // CHECK:STDOUT: %int_0.loc21: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc21_28: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -300,7 +300,7 @@ fn ValueBinding(b: array(i32, 3)) { // CHECK:STDOUT: %a.patt: %pattern_type.771 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.771 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc26_27: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc26_30: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %int_3.loc26_33: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index a2eb8fc33047..17b962ece98b 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -113,7 +113,7 @@ var c: i32 = a[0x7FFF_FFFF]; // CHECK:STDOUT: %a.patt: %pattern_type.97e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.97e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -124,14 +124,14 @@ var c: i32 = a[0x7FFF_FFFF]; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %i32 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index d7ed1e9fe9f0..86314d1618d1 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -100,7 +100,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %a.patt: %pattern_type.97e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.97e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] @@ -111,7 +111,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc23: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index d66a3687a990..ad963fca09a7 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -99,7 +99,7 @@ var b: i32 = a[1]; // CHECK:STDOUT: %a.patt: %pattern_type.97e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.97e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -110,7 +110,7 @@ var b: i32 = a[1]; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 711a0ea65089..f083f56ed951 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -166,7 +166,7 @@ fn G(b: array(i32, 3)) { // CHECK:STDOUT: %pb.patt: %pattern_type.f00 = ref_binding_pattern pb [concrete = constants.%pb.patt] // CHECK:STDOUT: %pb.var_patt: %pattern_type.f00 = var_pattern %pb.patt [concrete = constants.%pb.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %pb.var: ref %ptr.d08 = var %pb.var_patt +// CHECK:STDOUT: %pb.var: ref %ptr.d08 = var_storage %pb.var_patt // CHECK:STDOUT: %b.ref.loc23: %array_type = name_ref b, %b // CHECK:STDOUT: %int_0.loc23: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc23_28: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] @@ -215,7 +215,7 @@ fn G(b: array(i32, 3)) { // CHECK:STDOUT: %pf.patt: %pattern_type.f00 = ref_binding_pattern pf [concrete = constants.%pf.patt] // CHECK:STDOUT: %pf.var_patt: %pattern_type.f00 = var_pattern %pf.patt [concrete = constants.%pf.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %pf.var: ref %ptr.d08 = var %pf.var_patt +// CHECK:STDOUT: %pf.var: ref %ptr.d08 = var_storage %pf.var_patt // CHECK:STDOUT: %F.ref.loc36: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc36_28.1: ref %array_type = temporary_storage // CHECK:STDOUT: %F.call.loc36: init %array_type to %.loc36_28.1 = call %F.ref.loc36() diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index e3772270483a..c20629290221 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -94,7 +94,7 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc21: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: %F.decl: %F.type = fn_decl @F [concrete = constants.%F] {} {} @@ -102,21 +102,21 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc28: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %i32 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc34: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %i32 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc40: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index 1ee5918d70cc..468df73c0c60 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: = name_ref a, [concrete = ] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: assign %b.var, diff --git a/toolchain/check/testdata/index/fail_negative_indexing.carbon b/toolchain/check/testdata/index/fail_negative_indexing.carbon index bbd78489c25b..40e723b0866d 100644 --- a/toolchain/check/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/index/fail_negative_indexing.carbon @@ -116,7 +116,7 @@ var d: i32 = c[-10]; // CHECK:STDOUT: %c.patt: %pattern_type.7b0 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.7b0 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %array_type = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %array_type = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %array_type [concrete = constants.%array_type] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2] @@ -127,7 +127,7 @@ var d: i32 = c[-10]; // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %i32 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/as_type_of_type.carbon b/toolchain/check/testdata/interface/as_type_of_type.carbon index 23bec42eaeab..09ab91c5399b 100644 --- a/toolchain/check/testdata/interface/as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/as_type_of_type.carbon @@ -159,7 +159,7 @@ fn F(T:! Empty) { // CHECK:STDOUT: %x.patt.loc22_15.1: @F.%pattern_type (%pattern_type.777) = ref_binding_pattern x [symbolic = %x.patt.loc22_15.2 (constants.%x.patt)] // CHECK:STDOUT: %x.var_patt.loc22_3.1: @F.%pattern_type (%pattern_type.777) = var_pattern %x.patt.loc22_15.1 [symbolic = %x.var_patt.loc22_3.2 (constants.%x.var_patt)] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref @F.%ptr.loc22_18.2 (%ptr) = var %x.var_patt.loc22_3.1 +// CHECK:STDOUT: %x.var: ref @F.%ptr.loc22_18.2 (%ptr) = var_storage %x.var_patt.loc22_3.1 // CHECK:STDOUT: %DefaultOrUnformed.facet.loc22_19.1: %DefaultOrUnformed.type = facet_value constants.%ptr, (constants.%DefaultOrUnformed.lookup_impl_witness) [symbolic = %DefaultOrUnformed.facet.loc22_19.2 (constants.%DefaultOrUnformed.facet)] // CHECK:STDOUT: %.loc22_19.1: %DefaultOrUnformed.type = converted constants.%ptr, %DefaultOrUnformed.facet.loc22_19.1 [symbolic = %DefaultOrUnformed.facet.loc22_19.2 (constants.%DefaultOrUnformed.facet)] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc22_19.1 [symbolic = %ptr.loc22_18.2 (constants.%ptr)] diff --git a/toolchain/check/testdata/interface/default_fn.carbon b/toolchain/check/testdata/interface/default_fn.carbon index 331f77bfc574..d45930239c2f 100644 --- a/toolchain/check/testdata/interface/default_fn.carbon +++ b/toolchain/check/testdata/interface/default_fn.carbon @@ -164,7 +164,7 @@ class C { // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %.loc20_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc20_19.2: init %C to %c.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc20_7: init %C = converted %.loc20_19.1, %.loc20_19.2 [concrete = constants.%C.val] diff --git a/toolchain/check/testdata/interface/fail_member_lookup.carbon b/toolchain/check/testdata/interface/fail_member_lookup.carbon index 6cd6eee9a078..85329b9a343a 100644 --- a/toolchain/check/testdata/interface/fail_member_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_member_lookup.carbon @@ -156,7 +156,7 @@ fn G(U:! Different) -> U.(Interface.T); // CHECK:STDOUT: %v.patt: = ref_binding_pattern v [concrete = ] // CHECK:STDOUT: %v.var_patt: = var_pattern %v.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref = var %v.var_patt [concrete = ] +// CHECK:STDOUT: %v.var: ref = var_storage %v.var_patt [concrete = ] // CHECK:STDOUT: assign %v.var, // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %Interface.ref.loc23: type = name_ref Interface, file.%Interface.decl [concrete = constants.%Interface.type] diff --git a/toolchain/check/testdata/interface/generic_method.carbon b/toolchain/check/testdata/interface/generic_method.carbon index 701be413879e..26ce8663d3f3 100644 --- a/toolchain/check/testdata/interface/generic_method.carbon +++ b/toolchain/check/testdata/interface/generic_method.carbon @@ -536,7 +536,7 @@ fn CallIndirect() { // CHECK:STDOUT: %u.patt: %pattern_type.34e = ref_binding_pattern u [concrete = constants.%u.patt.352] // CHECK:STDOUT: %u.var_patt: %pattern_type.34e = var_pattern %u.patt [concrete = constants.%u.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.var: ref %Z = var %u.var_patt +// CHECK:STDOUT: %u.var: ref %Z = var_storage %u.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Z, (constants.%DefaultOrUnformed.impl_witness.e88) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc22_11.1: %DefaultOrUnformed.type = converted constants.%Z, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type.loc22: type = facet_access_type %.loc22_11.1 [concrete = constants.%Z] @@ -623,7 +623,7 @@ fn CallIndirect() { // CHECK:STDOUT: %u.patt: %pattern_type.34e = ref_binding_pattern u [concrete = constants.%u.patt.352] // CHECK:STDOUT: %u.var_patt: %pattern_type.34e = var_pattern %u.patt [concrete = constants.%u.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.var: ref %Z = var %u.var_patt +// CHECK:STDOUT: %u.var: ref %Z = var_storage %u.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%Z, (constants.%DefaultOrUnformed.impl_witness.e88) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc27_11.1: %DefaultOrUnformed.type = converted constants.%Z, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc27_11.1 [concrete = constants.%Z] diff --git a/toolchain/check/testdata/interface/import.carbon b/toolchain/check/testdata/interface/import.carbon index 20ed5c684e60..4710243a149a 100644 --- a/toolchain/check/testdata/interface/import.carbon +++ b/toolchain/check/testdata/interface/import.carbon @@ -113,7 +113,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %f_ref.patt: %pattern_type.1c1 = ref_binding_pattern f_ref [concrete = constants.%f_ref.patt] // CHECK:STDOUT: %f_ref.var_patt: %pattern_type.1c1 = var_pattern %f_ref.patt [concrete = constants.%f_ref.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f_ref.var: ref %struct_type.f = var %f_ref.var_patt [concrete] +// CHECK:STDOUT: %f_ref.var: ref %struct_type.f = var_storage %f_ref.var_patt [concrete] // CHECK:STDOUT: %.loc20: type = splice_block %struct_type.f [concrete = constants.%struct_type.f] { // CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, %ForwardDeclared.decl [concrete = constants.%ForwardDeclared.type] // CHECK:STDOUT: %struct_type.f: type = struct_type {.f: %ForwardDeclared.type} [concrete = constants.%struct_type.f] @@ -249,8 +249,8 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %pattern_type.1c1: type = pattern_type %struct_type.f [concrete] // CHECK:STDOUT: %f_ref.patt: %pattern_type.1c1 = ref_binding_pattern f_ref [concrete] // CHECK:STDOUT: %f_ref.var_patt: %pattern_type.1c1 = var_pattern %f_ref.patt [concrete] -// CHECK:STDOUT: %.81b: ref %ForwardDeclared.type = struct_access imports.%f_ref.var, element0 [concrete] -// CHECK:STDOUT: %addr: %ptr.b71 = addr_of %.81b [concrete] +// CHECK:STDOUT: %.594: ref %ForwardDeclared.type = struct_access imports.%f_ref.var, element0 [concrete] +// CHECK:STDOUT: %addr: %ptr.b71 = addr_of %.594 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %T.67d: type = symbolic_binding T, 0 [symbolic] // CHECK:STDOUT: %ptr.as.Copy.impl.Op.type.ff5: type = fn_type @ptr.as.Copy.impl.Op, @ptr.as.Copy.impl(%T.67d) [symbolic] @@ -293,7 +293,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %Main.import_ref.3c9 = import_ref Main//a, loc9_9, unloaded // CHECK:STDOUT: %Main.import_ref.643 = import_ref Main//a, loc16_8, unloaded // CHECK:STDOUT: %Main.import_ref.e95 = import_ref Main//a, loc17_9, unloaded -// CHECK:STDOUT: %f_ref.var: ref %struct_type.f = var constants.%f_ref.var_patt [concrete] +// CHECK:STDOUT: %f_ref.var: ref %struct_type.f = var_storage constants.%f_ref.var_patt [concrete] // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.e5f: @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op.type (%ptr.as.Copy.impl.Op.type.ff5) = import_ref Core//prelude/parts/copy, loc{{\d+_\d+}}, loaded [symbolic = @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op (constants.%ptr.as.Copy.impl.Op.ce9)] // CHECK:STDOUT: %Copy.impl_witness_table.4f1 = impl_witness_table (%Core.import_ref.e5f), @ptr.as.Copy.impl [concrete] @@ -357,7 +357,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: %f.patt: %pattern_type.7a7 = ref_binding_pattern f [concrete = constants.%f.patt.752] // CHECK:STDOUT: %f.var_patt: %pattern_type.7a7 = var_pattern %f.patt [concrete = constants.%f.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %f.var: ref %ptr.b71 = var %f.var_patt [concrete] +// CHECK:STDOUT: %f.var: ref %ptr.b71 = var_storage %f.var_patt [concrete] // CHECK:STDOUT: %.loc16: type = splice_block %ptr [concrete = constants.%ptr.b71] { // CHECK:STDOUT: %ForwardDeclared.ref.loc16: type = name_ref ForwardDeclared, imports.%Main.ForwardDeclared [concrete = constants.%ForwardDeclared.type] // CHECK:STDOUT: %ptr: type = ptr_type %ForwardDeclared.ref.loc16 [concrete = constants.%ptr.b71] @@ -419,7 +419,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %f_ref.ref: ref %struct_type.f = name_ref f_ref, imports.%Main.f_ref [concrete = imports.%f_ref.var] -// CHECK:STDOUT: %.loc16: ref %ForwardDeclared.type = struct_access %f_ref.ref, element0 [concrete = constants.%.81b] +// CHECK:STDOUT: %.loc16: ref %ForwardDeclared.type = struct_access %f_ref.ref, element0 [concrete = constants.%.594] // CHECK:STDOUT: %addr: %ptr.b71 = addr_of %.loc16 [concrete = constants.%addr] // CHECK:STDOUT: %impl.elem0: %.a22 = impl_witness_access constants.%Copy.impl_witness.fe0, element0 [concrete = constants.%ptr.as.Copy.impl.Op.a7b] // CHECK:STDOUT: %bound_method.loc16_27.1: = bound_method %addr, %impl.elem0 [concrete = constants.%ptr.as.Copy.impl.Op.bound] diff --git a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon index 08039525611d..d12c73aa11e4 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/import.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/import.carbon @@ -133,7 +133,7 @@ fn F() { // CHECK:STDOUT: %x.patt: = ref_binding_pattern x [concrete = ] // CHECK:STDOUT: %x.var_patt: = var_pattern %x.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] +// CHECK:STDOUT: %x.var: ref = var_storage %x.var_patt [concrete = ] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %MyStructAlias.ref: type = name_ref MyStructAlias, imports.%Main.MyStructAlias [concrete = ] // CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] diff --git a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon index 73d0e55b2bab..cb599984162f 100644 --- a/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon +++ b/toolchain/check/testdata/interop/cpp/basics/import/indirect.carbon @@ -282,7 +282,7 @@ fn UseZ() -> Cpp.A.Z { // CHECK:STDOUT: %ax.patt: %pattern_type.88a = ref_binding_pattern ax [concrete = constants.%ax.patt] // CHECK:STDOUT: %ax.var_patt: %pattern_type.88a = var_pattern %ax.patt [concrete = constants.%ax.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %ax.var: ref %X = var %ax.var_patt +// CHECK:STDOUT: %ax.var: ref %X = var_storage %ax.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %.loc9_3.1: ref %X = splice_block %ax.var {} // CHECK:STDOUT: %impl.elem0.loc9: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] diff --git a/toolchain/check/testdata/interop/cpp/class/import/access.carbon b/toolchain/check/testdata/interop/cpp/class/import/access.carbon index ee414a6b8bc2..ed651412ea04 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/access.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/access.carbon @@ -1641,7 +1641,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %S.decl: type = class_decl @S [concrete = constants.%S] {} {} // CHECK:STDOUT: %static_data.patt: %pattern_type.6b6 = ref_binding_pattern static_data [concrete = constants.%static_data.patt.617] // CHECK:STDOUT: %static_data.var_patt: %pattern_type.6b6 = var_pattern %static_data.patt [concrete = constants.%static_data.var_patt] -// CHECK:STDOUT: %static_data.var: ref %i32 = var %static_data.var_patt [concrete] +// CHECK:STDOUT: %static_data.var: ref %i32 = var_storage %static_data.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%s.param: %S) { @@ -1686,7 +1686,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: imports { // CHECK:STDOUT: %static_data.patt: %pattern_type.6b6 = ref_binding_pattern static_data [concrete = constants.%static_data.patt.617] // CHECK:STDOUT: %static_data.var_patt: %pattern_type.6b6 = var_pattern %static_data.patt [concrete = constants.%static_data.var_patt] -// CHECK:STDOUT: %static_data.var: ref %i32 = var %static_data.var_patt [concrete] +// CHECK:STDOUT: %static_data.var: ref %i32 = var_storage %static_data.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%d.param: %Derived) { @@ -1740,7 +1740,7 @@ fn Call(var instance: Cpp.PublicPrivate) { // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %static_data.patt: %pattern_type.6b6 = ref_binding_pattern static_data [concrete = constants.%static_data.patt] // CHECK:STDOUT: %static_data.var_patt: %pattern_type.6b6 = var_pattern %static_data.patt [concrete = constants.%static_data.var_patt] -// CHECK:STDOUT: %static_data.var: ref %i32 = var %static_data.var_patt [concrete] +// CHECK:STDOUT: %static_data.var: ref %i32 = var_storage %static_data.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Derived { diff --git a/toolchain/check/testdata/interop/cpp/class/import/class.carbon b/toolchain/check/testdata/interop/cpp/class/import/class.carbon index 492543564aff..c523c28b5156 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/class.carbon @@ -412,7 +412,7 @@ fn GenericUse(p2: Generic(Cpp.Class1)) { // CHECK:STDOUT: %Bar.decl: type = class_decl @Bar [concrete = constants.%Bar] {} {} // CHECK:STDOUT: %foo.patt: %pattern_type = ref_binding_pattern foo [concrete = constants.%foo.patt] // CHECK:STDOUT: %foo.var_patt: %pattern_type = var_pattern %foo.patt [concrete = constants.%foo.var_patt] -// CHECK:STDOUT: %foo.var: ref %ptr.227 = var %foo.var_patt [concrete] +// CHECK:STDOUT: %foo.var: ref %ptr.227 = var_storage %foo.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF() { diff --git a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon index 0ca0230a16d8..796bce781f81 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/constructor.carbon @@ -405,7 +405,7 @@ fn F() { // CHECK:STDOUT: %c.patt: %pattern_type.bbc = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.bbc = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%C, (constants.%DefaultOrUnformed.impl_witness.7ba) [concrete = constants.%DefaultOrUnformed.facet.5f4] // CHECK:STDOUT: %.loc8_22.1: %DefaultOrUnformed.type = converted constants.%C, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet.5f4] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc8_22.1 [concrete = constants.%C] @@ -853,7 +853,7 @@ fn F() { // CHECK:STDOUT: %c1.patt: %pattern_type.bbc = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.bbc = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C = var %c1.var_patt +// CHECK:STDOUT: %c1.var: ref %C = var_storage %c1.var_patt // CHECK:STDOUT: %Cpp.ref.loc8_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc8_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -879,7 +879,7 @@ fn F() { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C = var %c2.var_patt +// CHECK:STDOUT: %c2.var: ref %C = var_storage %c2.var_patt // CHECK:STDOUT: %Cpp.ref.loc9_26: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_29: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc9_31: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -904,7 +904,7 @@ fn F() { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = ref_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: %c3.var_patt: %pattern_type.bbc = var_pattern %c3.patt [concrete = constants.%c3.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3.var: ref %C = var %c3.var_patt +// CHECK:STDOUT: %c3.var: ref %C = var_storage %c3.var_patt // CHECK:STDOUT: %Cpp.ref.loc10_26: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc10_29: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc10_31: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] diff --git a/toolchain/check/testdata/interop/cpp/class/import/method.carbon b/toolchain/check/testdata/interop/cpp/class/import/method.carbon index 9ceef9b96194..b88631f0ace1 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/method.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/method.carbon @@ -564,7 +564,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt.623a16.1] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt.207d5f.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %v.ref: %NoRefQualifier = name_ref v, %v // CHECK:STDOUT: %F.ref.loc8: %NoRefQualifier.F.cpp_overload_set.type = name_ref F, imports.%NoRefQualifier.F.cpp_overload_set.value [concrete = constants.%NoRefQualifier.F.cpp_overload_set.value] // CHECK:STDOUT: %bound_method.loc8: = bound_method %v.ref, %F.ref.loc8 @@ -576,7 +576,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %b.patt: %pattern_type.f00 = ref_binding_pattern b [concrete = constants.%b.patt.9fb99a.1] // CHECK:STDOUT: %b.var_patt: %pattern_type.f00 = var_pattern %b.patt [concrete = constants.%b.var_patt.dede8c.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %ptr.d08 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %ptr.d08 = var_storage %b.var_patt // CHECK:STDOUT: %p.ref: %ptr.f7d = name_ref p, %p // CHECK:STDOUT: %.loc9_25: ref %NoRefQualifier = deref %p.ref // CHECK:STDOUT: %F.ref.loc9: %NoRefQualifier.F.cpp_overload_set.type = name_ref F, imports.%NoRefQualifier.F.cpp_overload_set.value [concrete = constants.%NoRefQualifier.F.cpp_overload_set.value] @@ -610,7 +610,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt.623a16.2] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt.207d5f.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %v.ref: %WithRefQualifier = name_ref v, %v // CHECK:STDOUT: %F.ref.loc15: %WithRefQualifier.F.cpp_overload_set.type = name_ref F, imports.%WithRefQualifier.F.cpp_overload_set.value [concrete = constants.%WithRefQualifier.F.cpp_overload_set.value] // CHECK:STDOUT: %bound_method.loc15: = bound_method %v.ref, %F.ref.loc15 @@ -622,7 +622,7 @@ fn Call(e: Cpp.ExplicitObjectParam, n: i32, a: Cpp.Another) { // CHECK:STDOUT: %b.patt: %pattern_type.f00 = ref_binding_pattern b [concrete = constants.%b.patt.9fb99a.2] // CHECK:STDOUT: %b.var_patt: %pattern_type.f00 = var_pattern %b.patt [concrete = constants.%b.var_patt.dede8c.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %ptr.d08 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %ptr.d08 = var_storage %b.var_patt // CHECK:STDOUT: %p.ref: %ptr.90c = name_ref p, %p // CHECK:STDOUT: %.loc16_25: ref %WithRefQualifier = deref %p.ref // CHECK:STDOUT: %F.ref.loc16: %WithRefQualifier.F.cpp_overload_set.type = name_ref F, imports.%WithRefQualifier.F.cpp_overload_set.value [concrete = constants.%WithRefQualifier.F.cpp_overload_set.value] diff --git a/toolchain/check/testdata/interop/cpp/class/import/template.carbon b/toolchain/check/testdata/interop/cpp/class/import/template.carbon index b85206aefbc7..0bd5a2d1e43a 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/template.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/template.carbon @@ -229,7 +229,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %type.ref.loc7 [concrete = constants.%i32] { // CHECK:STDOUT: %Cpp.ref.loc7: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %XY.ref: type = name_ref XY, imports.%X.decl.8c4 [concrete = constants.%X.816] @@ -241,7 +241,7 @@ fn F() { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc21: type = splice_block %type.ref.loc21 [concrete = constants.%i32] { // CHECK:STDOUT: %Cpp.ref.loc21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Xint.ref: type = name_ref Xint, imports.%X.decl.b67 [concrete = constants.%X.c92] diff --git a/toolchain/check/testdata/interop/cpp/class/import/union.carbon b/toolchain/check/testdata/interop/cpp/class/import/union.carbon index cdcd38ea3c5b..96d70f30eb92 100644 --- a/toolchain/check/testdata/interop/cpp/class/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/class/import/union.carbon @@ -333,7 +333,7 @@ fn MyF(bar: Cpp.Bar(Cpp.X)*); // CHECK:STDOUT: %Bar.decl: type = class_decl @Bar [concrete = constants.%Bar] {} {} // CHECK:STDOUT: %foo.patt: %pattern_type = ref_binding_pattern foo [concrete = constants.%foo.patt] // CHECK:STDOUT: %foo.var_patt: %pattern_type = var_pattern %foo.patt [concrete = constants.%foo.var_patt] -// CHECK:STDOUT: %foo.var: ref %ptr.227 = var %foo.var_patt [concrete] +// CHECK:STDOUT: %foo.var: ref %ptr.227 = var_storage %foo.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MyF() { diff --git a/toolchain/check/testdata/interop/cpp/enum/copy.carbon b/toolchain/check/testdata/interop/cpp/enum/copy.carbon index 2f997dc939b0..408bb01551a8 100644 --- a/toolchain/check/testdata/interop/cpp/enum/copy.carbon +++ b/toolchain/check/testdata/interop/cpp/enum/copy.carbon @@ -73,7 +73,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.926 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.926 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Enum = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Enum = var_storage %a.var_patt // CHECK:STDOUT: %Cpp.ref.loc8_21: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Enum.ref.loc8_24: type = name_ref Enum, imports.%Enum.decl [concrete = constants.%Enum] // CHECK:STDOUT: %a.ref.loc8: %Enum = name_ref a, imports.%int_0 [concrete = constants.%int_0] diff --git a/toolchain/check/testdata/interop/cpp/function/import/class.carbon b/toolchain/check/testdata/interop/cpp/function/import/class.carbon index 607572316a17..0e0aacb9acb7 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/class.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/class.carbon @@ -858,7 +858,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.7cb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.7cb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %C = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %C = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%C, (constants.%DefaultOrUnformed.impl_witness.8f7) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_24.1: %DefaultOrUnformed.type = converted constants.%C, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_24.1 [concrete = constants.%C] @@ -983,7 +983,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.6eb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6eb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %O = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %O = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%O, (constants.%DefaultOrUnformed.impl_witness.3bc) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc9_22.1: %DefaultOrUnformed.type = converted constants.%O, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc9_22.1 [concrete = constants.%O] diff --git a/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon b/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon index 4f373f9f85e8..e2e9dabe6374 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/decayed_param.carbon @@ -221,7 +221,7 @@ fn F() { // CHECK:STDOUT: %n.patt: %pattern_type.c07 = ref_binding_pattern n [concrete = constants.%n.patt.dac] // CHECK:STDOUT: %n.var_patt: %pattern_type.c07 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %array_type.d58 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %array_type.d58 = var_storage %n.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%array_type.d58, (constants.%DefaultOrUnformed.impl_witness.800) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_24.1: %DefaultOrUnformed.type = converted constants.%array_type.d58, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_24.1 [concrete = constants.%array_type.d58] @@ -391,7 +391,7 @@ fn F() { // CHECK:STDOUT: %n.patt: %pattern_type.c07 = ref_binding_pattern n [concrete = constants.%n.patt.dac] // CHECK:STDOUT: %n.var_patt: %pattern_type.c07 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %array_type.d58 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %array_type.d58 = var_storage %n.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%array_type.d58, (constants.%DefaultOrUnformed.impl_witness.800) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc22_24.1: %DefaultOrUnformed.type = converted constants.%array_type.d58, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc22_24.1 [concrete = constants.%array_type.d58] diff --git a/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon b/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon index 95380f79d6d9..1a4c7c37ab2c 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/extern_c.carbon @@ -188,7 +188,7 @@ fn MyF(a: Cpp.X, b: Cpp.X) -> Cpp.X { // CHECK:STDOUT: } // CHECK:STDOUT: %foo.patt: %pattern_type.6b6 = ref_binding_pattern foo [concrete = constants.%foo.patt] // CHECK:STDOUT: %foo.var_patt: %pattern_type.6b6 = var_pattern %foo.patt [concrete = constants.%foo.var_patt] -// CHECK:STDOUT: %foo.var: ref %i32 = var %foo.var_patt [concrete] +// CHECK:STDOUT: %foo.var: ref %i32 = var_storage %foo.var_patt [concrete] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.5e0)] // CHECK:STDOUT: %Copy.impl_witness_table.367 = impl_witness_table (%Core.import_ref.cd6), @Int.as.Copy.impl [concrete] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon index 2e3ef413c7a7..b67bfcff0a06 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/pointer.carbon @@ -468,7 +468,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -529,7 +529,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.282 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.282 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %const = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %const = var_storage %p.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %G.call: init %const = call %G.ref() // CHECK:STDOUT: assign %p.var, %G.call @@ -619,7 +619,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -633,7 +633,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.de6 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.de6 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.037 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.037 = var_storage %p.var_patt // CHECK:STDOUT: %s.ref: ref %S = name_ref s, %s // CHECK:STDOUT: %addr.loc9: %ptr.037 = addr_of %s.ref // CHECK:STDOUT: %impl.elem0: %.166 = impl_witness_access constants.%Copy.impl_witness.478, element0 [concrete = constants.%ptr.as.Copy.impl.Op.def] @@ -703,7 +703,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.914 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.914 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %const = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %const = var_storage %s.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %.loc10_3: ref %const = splice_block %s.var {} // CHECK:STDOUT: %G.call: init %const to %.loc10_3 = call %G.ref() @@ -771,7 +771,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %.loc8_3: ref %S = splice_block %s.var {} // CHECK:STDOUT: %G.call: init %S to %.loc8_3 = call %G.ref() @@ -834,7 +834,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.282 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.282 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %const = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %const = var_storage %p.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %G.call: init %const = call %G.ref() // CHECK:STDOUT: assign %p.var, %G.call @@ -904,7 +904,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.de6 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.de6 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr = var_storage %p.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %G.call: init %ptr = call %G.ref() // CHECK:STDOUT: assign %p.var, %G.call @@ -1030,7 +1030,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.282 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.282 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %const.f96 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %const.f96 = var_storage %p.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %G.call: init %const.f96 = call %G.ref() // CHECK:STDOUT: assign %p.var, %G.call @@ -1175,7 +1175,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.de6 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.de6 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.037 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.037 = var_storage %p.var_patt // CHECK:STDOUT: %G.ref: %G.type = name_ref G, file.%G.decl [concrete = constants.%G] // CHECK:STDOUT: %G.call: init %ptr.037 = call %G.ref() // CHECK:STDOUT: assign %p.var, %G.call @@ -1451,7 +1451,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -1705,7 +1705,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -1905,7 +1905,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -2066,7 +2066,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc10_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc10_3: init %S = converted %.loc10_19.1, %.loc10_19.2 [concrete = constants.%S.val] diff --git a/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon b/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon index 189f6f7eb2d8..17d24952b682 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/qualified_param.carbon @@ -117,7 +117,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc10_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc10_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc10_3: init %S = converted %.loc10_19.1, %.loc10_19.2 [concrete = constants.%S.val] diff --git a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon index 05936b296390..fd5788ccbdec 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/reference.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/reference.carbon @@ -522,7 +522,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -603,7 +603,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %v.patt: %pattern_type.0f5 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.0f5 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %S = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %S = var_storage %v.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc8: %DefaultOrUnformed.type = facet_value constants.%S, (constants.%DefaultOrUnformed.impl_witness.eff) [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %.loc8_15.1: %DefaultOrUnformed.type = converted constants.%S, %DefaultOrUnformed.facet.loc8 [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %as_type.loc8: type = facet_access_type %.loc8_15.1 [concrete = constants.%S] @@ -642,7 +642,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %t.patt: %pattern_type.5f6 = ref_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: %t.var_patt: %pattern_type.5f6 = var_pattern %t.patt [concrete = constants.%t.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t.var: ref %T.ed0 = var %t.var_patt +// CHECK:STDOUT: %t.var: ref %T.ed0 = var_storage %t.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc30: %DefaultOrUnformed.type = facet_value constants.%T.ed0, (constants.%DefaultOrUnformed.impl_witness.537) [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %.loc30_15.1: %DefaultOrUnformed.type = converted constants.%T.ed0, %DefaultOrUnformed.facet.loc30 [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %as_type.loc30: type = facet_access_type %.loc30_15.1 [concrete = constants.%T.ed0] @@ -663,7 +663,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %u.patt: %pattern_type.0f5 = ref_binding_pattern u [concrete = constants.%u.patt] // CHECK:STDOUT: %u.var_patt: %pattern_type.0f5 = var_pattern %u.patt [concrete = constants.%u.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %u.var: ref %S = var %u.var_patt +// CHECK:STDOUT: %u.var: ref %S = var_storage %u.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc41: %DefaultOrUnformed.type = facet_value constants.%S, (constants.%DefaultOrUnformed.impl_witness.eff) [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %.loc41_15.1: %DefaultOrUnformed.type = converted constants.%S, %DefaultOrUnformed.facet.loc41 [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %as_type.loc41: type = facet_access_type %.loc41_15.1 [concrete = constants.%S] @@ -802,7 +802,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc8: %DefaultOrUnformed.type = facet_value constants.%S, (constants.%DefaultOrUnformed.impl_witness.eff) [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %.loc8_15.1: %DefaultOrUnformed.type = converted constants.%S, %DefaultOrUnformed.facet.loc8 [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %as_type.loc8: type = facet_access_type %.loc8_15.1 [concrete = constants.%S] @@ -823,7 +823,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %t.patt: %pattern_type.5f6 = ref_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: %t.var_patt: %pattern_type.5f6 = var_pattern %t.patt [concrete = constants.%t.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t.var: ref %T.ed0 = var %t.var_patt +// CHECK:STDOUT: %t.var: ref %T.ed0 = var_storage %t.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc19: %DefaultOrUnformed.type = facet_value constants.%T.ed0, (constants.%DefaultOrUnformed.impl_witness.537) [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %.loc19_15.1: %DefaultOrUnformed.type = converted constants.%T.ed0, %DefaultOrUnformed.facet.loc19 [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %as_type.loc19: type = facet_access_type %.loc19_15.1 [concrete = constants.%T.ed0] @@ -903,7 +903,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %.loc8_19.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_19.2: init %S to %s.var = class_init () [concrete = constants.%S.val] // CHECK:STDOUT: %.loc8_3: init %S = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%S.val] @@ -1129,7 +1129,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %s.patt: %pattern_type.0f5 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.0f5 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %S = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %S = var_storage %s.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc8: %DefaultOrUnformed.type = facet_value constants.%S, (constants.%DefaultOrUnformed.impl_witness.eff) [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %.loc8_15.1: %DefaultOrUnformed.type = converted constants.%S, %DefaultOrUnformed.facet.loc8 [concrete = constants.%DefaultOrUnformed.facet.176] // CHECK:STDOUT: %as_type.loc8: type = facet_access_type %.loc8_15.1 [concrete = constants.%S] @@ -1150,7 +1150,7 @@ fn PassConstRef(ref x: const X) { // CHECK:STDOUT: %t.patt: %pattern_type.5f6 = ref_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: %t.var_patt: %pattern_type.5f6 = var_pattern %t.patt [concrete = constants.%t.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t.var: ref %T.ed0 = var %t.var_patt +// CHECK:STDOUT: %t.var: ref %T.ed0 = var_storage %t.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet.loc19: %DefaultOrUnformed.type = facet_value constants.%T.ed0, (constants.%DefaultOrUnformed.impl_witness.537) [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %.loc19_15.1: %DefaultOrUnformed.type = converted constants.%T.ed0, %DefaultOrUnformed.facet.loc19 [concrete = constants.%DefaultOrUnformed.facet.e0e] // CHECK:STDOUT: %as_type.loc19: type = facet_access_type %.loc19_15.1 [concrete = constants.%T.ed0] diff --git a/toolchain/check/testdata/interop/cpp/function/import/return.carbon b/toolchain/check/testdata/interop/cpp/function/import/return.carbon index e6a6da3fd566..5db8304e2a83 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/return.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/return.carbon @@ -227,7 +227,7 @@ fn Var() { // CHECK:STDOUT: %c.patt: %pattern_type.af6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.af6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Cpp.nullptr_t = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %Cpp.nullptr_t = var_storage %c.var_patt // CHECK:STDOUT: %Cpp.ref.loc11_33: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ReturnNullPtr.ref: %ReturnNullPtr.cpp_overload_set.type = name_ref ReturnNullPtr, imports.%ReturnNullPtr.cpp_overload_set.value [concrete = constants.%ReturnNullPtr.cpp_overload_set.value] // CHECK:STDOUT: %.loc11_3: ref %Cpp.nullptr_t = splice_block %c.var {} @@ -418,7 +418,7 @@ fn Var() { // CHECK:STDOUT: %my_u32.patt: %pattern_type.668 = ref_binding_pattern my_u32 [concrete = constants.%my_u32.patt] // CHECK:STDOUT: %my_u32.var_patt: %pattern_type.668 = var_pattern %my_u32.patt [concrete = constants.%my_u32.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %my_u32.var: ref %u32 = var %my_u32.var_patt +// CHECK:STDOUT: %my_u32.var: ref %u32 = var_storage %my_u32.var_patt // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %ReturnU32.ref: %ReturnU32.cpp_overload_set.type = name_ref ReturnU32, imports.%ReturnU32.cpp_overload_set.value [concrete = constants.%ReturnU32.cpp_overload_set.value] // CHECK:STDOUT: %ReturnU32.call: init %u32 = call imports.%ReturnU32.decl() diff --git a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon index d28d907db520..71ef9e0a38ff 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/struct.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/struct.carbon @@ -701,7 +701,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.bc1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.bc1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %S = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %S = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%S, (constants.%DefaultOrUnformed.impl_witness.a26) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_24.1: %DefaultOrUnformed.type = converted constants.%S, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_24.1 [concrete = constants.%S] @@ -826,7 +826,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.6eb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6eb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %O = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %O = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%O, (constants.%DefaultOrUnformed.impl_witness.3bc) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc9_22.1: %DefaultOrUnformed.type = converted constants.%O, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc9_22.1 [concrete = constants.%O] diff --git a/toolchain/check/testdata/interop/cpp/function/import/union.carbon b/toolchain/check/testdata/interop/cpp/function/import/union.carbon index 5e044ffbc396..ae4fef451e75 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/union.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/union.carbon @@ -626,7 +626,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.04d = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.04d = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %U = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %U = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%U, (constants.%DefaultOrUnformed.impl_witness.147) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_24.1: %DefaultOrUnformed.type = converted constants.%U, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_24.1 [concrete = constants.%U] @@ -751,7 +751,7 @@ fn F() { // CHECK:STDOUT: %x.patt: %pattern_type.6eb = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6eb = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %O = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %O = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%O, (constants.%DefaultOrUnformed.impl_witness.3bc) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc9_22.1: %DefaultOrUnformed.type = converted constants.%O, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc9_22.1 [concrete = constants.%O] diff --git a/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon b/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon index 2ebe41991684..2454cbff4e81 100644 --- a/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon +++ b/toolchain/check/testdata/interop/cpp/function/import/void_pointer.carbon @@ -598,7 +598,7 @@ fn F() { // CHECK:STDOUT: %non_nullable_pointer.patt: %pattern_type.c1e = ref_binding_pattern non_nullable_pointer [concrete = constants.%non_nullable_pointer.patt] // CHECK:STDOUT: %non_nullable_pointer.var_patt: %pattern_type.c1e = var_pattern %non_nullable_pointer.patt [concrete = constants.%non_nullable_pointer.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %non_nullable_pointer.var: ref %ptr.6f9 = var %non_nullable_pointer.var_patt +// CHECK:STDOUT: %non_nullable_pointer.var: ref %ptr.6f9 = var_storage %non_nullable_pointer.var_patt // CHECK:STDOUT: %Cpp.ref.loc11_42: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Return.ref: %Return.cpp_overload_set.type = name_ref Return, imports.%Return.cpp_overload_set.value [concrete = constants.%Return.cpp_overload_set.value] // CHECK:STDOUT: %Return.call: init %ptr.6f9 = call imports.%Return.decl() @@ -671,7 +671,7 @@ fn F() { // CHECK:STDOUT: %const_void_pointer.patt: %pattern_type.c83 = ref_binding_pattern const_void_pointer [concrete = constants.%const_void_pointer.patt] // CHECK:STDOUT: %const_void_pointer.var_patt: %pattern_type.c83 = var_pattern %const_void_pointer.patt [concrete = constants.%const_void_pointer.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %const_void_pointer.var: ref %ptr = var %const_void_pointer.var_patt +// CHECK:STDOUT: %const_void_pointer.var: ref %ptr = var_storage %const_void_pointer.var_patt // CHECK:STDOUT: %Cpp.ref.loc11_45: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Return.ref: %Return.cpp_overload_set.type = name_ref Return, imports.%Return.cpp_overload_set.value [concrete = constants.%Return.cpp_overload_set.value] // CHECK:STDOUT: %Return.call: init %ptr = call imports.%Return.decl() diff --git a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon index 06a7d50756d3..d2adb9184bd8 100644 --- a/toolchain/check/testdata/interop/cpp/impls/destroy.carbon +++ b/toolchain/check/testdata/interop/cpp/impls/destroy.carbon @@ -324,7 +324,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.bdc = ref_binding_pattern a [concrete = constants.%a.patt.e26] // CHECK:STDOUT: %a.var_patt: %pattern_type.bdc = var_pattern %a.patt [concrete = constants.%a.var_patt.17b] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %PublicDestructor = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %PublicDestructor = var_storage %a.var_patt // CHECK:STDOUT: %.loc11_41.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc11_41.2: init %PublicDestructor to %a.var = class_init () [concrete = constants.%PublicDestructor.val] // CHECK:STDOUT: %.loc11_3: init %PublicDestructor = converted %.loc11_41.1, %.loc11_41.2 [concrete = constants.%PublicDestructor.val] @@ -347,7 +347,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.a12 = ref_binding_pattern a [concrete = constants.%a.patt.b64] // CHECK:STDOUT: %a.var_patt: %pattern_type.a12 = var_pattern %a.patt [concrete = constants.%a.var_patt.d25] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %TrivialDestructor = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %TrivialDestructor = var_storage %a.var_patt // CHECK:STDOUT: %.loc15_42.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc15_42.2: init %TrivialDestructor to %a.var = class_init () [concrete = constants.%TrivialDestructor.val] // CHECK:STDOUT: %.loc15_3: init %TrivialDestructor = converted %.loc15_42.1, %.loc15_42.2 [concrete = constants.%TrivialDestructor.val] @@ -409,7 +409,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.746 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.746 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Derived = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Derived = var_storage %a.var_patt // CHECK:STDOUT: %.loc20_37.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct.a40] // CHECK:STDOUT: %.loc20_38.1: %struct_type.base.f5e = struct_literal (%.loc20_37.1) [concrete = constants.%struct] // CHECK:STDOUT: %.loc20_38.2: ref %.a6c = class_element_access %a.var, element0 @@ -464,7 +464,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.746 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.746 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Derived = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Derived = var_storage %a.var_patt // CHECK:STDOUT: %.loc21_37.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct.a40] // CHECK:STDOUT: %.loc21_38.1: %struct_type.base.f5e = struct_literal (%.loc21_37.1) [concrete = constants.%struct] // CHECK:STDOUT: %.loc21_38.2: ref %.c73 = class_element_access %a.var, element0 diff --git a/toolchain/check/testdata/interop/cpp/macros/macros.carbon b/toolchain/check/testdata/interop/cpp/macros/macros.carbon index 739d917670ef..df8f0a8a4ffa 100644 --- a/toolchain/check/testdata/interop/cpp/macros/macros.carbon +++ b/toolchain/check/testdata/interop/cpp/macros/macros.carbon @@ -1131,7 +1131,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %n.patt: %pattern_type.240 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.240 = var_pattern %n.patt [concrete = constants.%n.var_patt] -// CHECK:STDOUT: %n.var: ref %f32.c73 = var %n.var_patt [concrete] +// CHECK:STDOUT: %n.var: ref %f32.c73 = var_storage %n.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { @@ -1140,7 +1140,7 @@ fn F() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc10_42.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc10_42: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -1939,7 +1939,7 @@ fn F() { // CHECK:STDOUT: %pattern_type.ed1: type = pattern_type %const [concrete] // CHECK:STDOUT: %a.patt.85b: %pattern_type.ed1 = ref_binding_pattern a [concrete] // CHECK:STDOUT: %a.var_patt: %pattern_type.ed1 = var_pattern %a.patt.85b [concrete] -// CHECK:STDOUT: %a.var: ref %i32 = var imports.%a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage imports.%a.var_patt [concrete] // CHECK:STDOUT: %int_1: %i32 = int_value 1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1950,7 +1950,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %a.patt: %pattern_type.ed1 = ref_binding_pattern a [concrete = constants.%a.patt.85b] // CHECK:STDOUT: %a.var_patt: %pattern_type.ed1 = var_pattern %a.patt [concrete = constants.%a.var_patt] -// CHECK:STDOUT: %a.var: ref %const = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %const = var_storage %a.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { @@ -1992,7 +1992,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %n.patt: %pattern_type.ed1 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.ed1 = var_pattern %n.patt [concrete = constants.%n.var_patt] -// CHECK:STDOUT: %n.var: ref %const = var %n.var_patt [concrete] +// CHECK:STDOUT: %n.var: ref %const = var_storage %n.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -2138,7 +2138,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %Core.import_ref.edf: @Core.IntLiteral.as.ImplicitAs.impl.0e9.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Core//prelude/types/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.0e9.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] // CHECK:STDOUT: %ImplicitAs.impl_witness_table.b3c = impl_witness_table (%Core.import_ref.edf), @Core.IntLiteral.as.ImplicitAs.impl.0e9 [concrete] // CHECK:STDOUT: } @@ -2171,8 +2171,8 @@ fn F() { // CHECK:STDOUT: %B: type = class_type @B [concrete] // CHECK:STDOUT: %A.elem: type = unbound_element_type %A, %B [concrete] // CHECK:STDOUT: %B.elem: type = unbound_element_type %B, %i32 [concrete] -// CHECK:STDOUT: %.135: ref %B = class_element_access imports.%a.var, element0 [concrete] -// CHECK:STDOUT: %.47b: ref %i32 = class_element_access %.135, element0 [concrete] +// CHECK:STDOUT: %.401: ref %B = class_element_access imports.%a.var, element0 [concrete] +// CHECK:STDOUT: %.8f5: ref %i32 = class_element_access %.401, element0 [concrete] // CHECK:STDOUT: %int_2.ecc: Core.IntLiteral = int_value 2 [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] // CHECK:STDOUT: %To: Core.IntLiteral = symbolic_binding To, 0 [symbolic] @@ -2192,12 +2192,12 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Cpp: = namespace file.%Cpp.import_cpp, [concrete] { -// CHECK:STDOUT: .m = constants.%.47b +// CHECK:STDOUT: .m = constants.%.8f5 // CHECK:STDOUT: import Cpp//... // CHECK:STDOUT: } // CHECK:STDOUT: %a.patt: %pattern_type.3fa = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.3fa = var_pattern %a.patt [concrete = constants.%a.var_patt] -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %Core.import_ref.edf: @Core.IntLiteral.as.ImplicitAs.impl.0e9.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Core//prelude/types/int, loc{{\d+_\d+}}, loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.0e9.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] // CHECK:STDOUT: %ImplicitAs.impl_witness_table.b3c = impl_witness_table (%Core.import_ref.edf), @Core.IntLiteral.as.ImplicitAs.impl.0e9 [concrete] // CHECK:STDOUT: } @@ -2207,10 +2207,10 @@ fn F() { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: // CHECK:STDOUT: %b.ref: %A.elem = name_ref b, @A.%.1 [concrete = @A.%.1] -// CHECK:STDOUT: %.loc17_6.1: ref %B = class_element_access imports.%a.var, element0 [concrete = constants.%.135] +// CHECK:STDOUT: %.loc17_6.1: ref %B = class_element_access imports.%a.var, element0 [concrete = constants.%.401] // CHECK:STDOUT: %c.ref: %B.elem = name_ref c, @B.%.1 [concrete = @B.%.1] -// CHECK:STDOUT: %.loc17_6.2: ref %i32 = class_element_access %.loc17_6.1, element0 [concrete = constants.%.47b] -// CHECK:STDOUT: %m.ref: ref %i32 = name_ref m, constants.%.47b [concrete = constants.%.47b] +// CHECK:STDOUT: %.loc17_6.2: ref %i32 = class_element_access %.loc17_6.1, element0 [concrete = constants.%.8f5] +// CHECK:STDOUT: %m.ref: ref %i32 = name_ref m, constants.%.8f5 [concrete = constants.%.8f5] // CHECK:STDOUT: %int_2: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc17_9.1: = bound_method %int_2, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/interop/cpp/operators/operators.carbon b/toolchain/check/testdata/interop/cpp/operators/operators.carbon index ebc695708134..62a70ab0b92f 100644 --- a/toolchain/check/testdata/interop/cpp/operators/operators.carbon +++ b/toolchain/check/testdata/interop/cpp/operators/operators.carbon @@ -1093,7 +1093,7 @@ fn F() { // CHECK:STDOUT: %c.patt: %pattern_type.bbc = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.bbc = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt // CHECK:STDOUT: %Cpp.ref.loc8_18: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_21: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc8_23: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -1447,7 +1447,7 @@ fn F() { // CHECK:STDOUT: %c1.patt: %pattern_type.bbc = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.bbc = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C = var %c1.var_patt +// CHECK:STDOUT: %c1.var: ref %C = var_storage %c1.var_patt // CHECK:STDOUT: %Cpp.ref.loc8_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc8_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -1465,7 +1465,7 @@ fn F() { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C = var %c2.var_patt +// CHECK:STDOUT: %c2.var: ref %C = var_storage %c2.var_patt // CHECK:STDOUT: %Cpp.ref.loc9_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc9_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc9_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -2208,7 +2208,7 @@ fn F() { // CHECK:STDOUT: %c1.patt: %pattern_type.bbc = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.bbc = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C = var %c1.var_patt +// CHECK:STDOUT: %c1.var: ref %C = var_storage %c1.var_patt // CHECK:STDOUT: %Cpp.ref.loc15_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc15_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc15_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -2226,7 +2226,7 @@ fn F() { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C = var %c2.var_patt +// CHECK:STDOUT: %c2.var: ref %C = var_storage %c2.var_patt // CHECK:STDOUT: %Cpp.ref.loc16_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc16_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc16_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -2369,7 +2369,7 @@ fn F() { // CHECK:STDOUT: %c1.patt: %pattern_type.bbc = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.bbc = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C = var %c1.var_patt +// CHECK:STDOUT: %c1.var: ref %C = var_storage %c1.var_patt // CHECK:STDOUT: %Cpp.ref.loc12_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc12_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc12_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -2387,7 +2387,7 @@ fn F() { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C = var %c2.var_patt +// CHECK:STDOUT: %c2.var: ref %C = var_storage %c2.var_patt // CHECK:STDOUT: %Cpp.ref.loc13_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc13_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc13_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -3186,7 +3186,7 @@ fn F() { // CHECK:STDOUT: %c1.patt: %pattern_type.bbc = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.bbc = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C = var %c1.var_patt +// CHECK:STDOUT: %c1.var: ref %C = var_storage %c1.var_patt // CHECK:STDOUT: %Cpp.ref.loc8_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %C.ref.loc8_22: type = name_ref C, imports.%C.decl [concrete = constants.%C] // CHECK:STDOUT: %C.ref.loc8_24: %C.C.cpp_overload_set.type = name_ref C, imports.%C.C.cpp_overload_set.value [concrete = constants.%C.C.cpp_overload_set.value] @@ -3204,7 +3204,7 @@ fn F() { // CHECK:STDOUT: %c2.patt: %pattern_type.bbc = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.bbc = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C = var %c2.var_patt +// CHECK:STDOUT: %c2.var: ref %C = var_storage %c2.var_patt // CHECK:STDOUT: %c1.ref.loc9: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %.loc9_3: ref %C = splice_block %c2.var {} // CHECK:STDOUT: %addr.loc9: %ptr.0a2 = addr_of %.loc9_3 @@ -3220,7 +3220,7 @@ fn F() { // CHECK:STDOUT: %c3.patt: %pattern_type.bbc = ref_binding_pattern c3 [concrete = constants.%c3.patt] // CHECK:STDOUT: %c3.var_patt: %pattern_type.bbc = var_pattern %c3.patt [concrete = constants.%c3.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c3.var: ref %C = var %c3.var_patt +// CHECK:STDOUT: %c3.var: ref %C = var_storage %c3.var_patt // CHECK:STDOUT: %c1.ref.loc10: ref %C = name_ref c1, %c1 // CHECK:STDOUT: %c2.ref: ref %C = name_ref c2, %c2 // CHECK:STDOUT: %.loc10_3: ref %C = splice_block %c3.var {} diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon index f0210d0e2d46..4502da99d2af 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/arithmetic.carbon @@ -574,7 +574,7 @@ fn F() { // CHECK:STDOUT: %unsigned_int.patt: %pattern_type.990 = ref_binding_pattern unsigned_int [concrete = constants.%unsigned_int.patt] // CHECK:STDOUT: %unsigned_int.var_patt: %pattern_type.990 = var_pattern %unsigned_int.patt [concrete = constants.%unsigned_int.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %unsigned_int.var: ref %unsigned_int = var %unsigned_int.var_patt +// CHECK:STDOUT: %unsigned_int.var: ref %unsigned_int = var_storage %unsigned_int.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%unsigned_int, (constants.%DefaultOrUnformed.impl_witness.a47) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc12_38.1: %DefaultOrUnformed.type = converted constants.%unsigned_int, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc12_38.1 [concrete = constants.%unsigned_int] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon index 35f5e0b6dfac..b781aad191ae 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.llp64.carbon @@ -807,7 +807,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc11_55.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc11_55: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -984,7 +984,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc11_64.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc11_64: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -1300,7 +1300,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc26_50.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc26_50: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -1407,7 +1407,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -1423,7 +1423,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %b.patt: %pattern_type.25e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.25e = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.long = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: ref %Cpp.long = name_ref a, %a // CHECK:STDOUT: %.loc9_28: %Cpp.long = acquire_value %a.ref // CHECK:STDOUT: %impl.elem0.loc9: %.3dd = impl_witness_access constants.%Copy.impl_witness.fc57, element0 [concrete = constants.%Cpp.long.as.Copy.impl.Op] @@ -2970,7 +2970,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -2986,7 +2986,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %b.patt: %pattern_type.25e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.25e = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.long = var_storage %b.var_patt // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc9: = bound_method %int_1.loc9, %impl.elem0.loc9 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -3417,7 +3417,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.3ce] // CHECK:STDOUT: %bound_method.loc9: = bound_method %int_1.loc9, %impl.elem0.loc9 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.5d7] @@ -3715,7 +3715,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -3850,7 +3850,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.3ce] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.5d7] @@ -3971,7 +3971,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.25e = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.25e = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.b13 = impl_witness_access constants.%ImplicitAs.impl_witness.e27, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -4266,7 +4266,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc24_59.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc24_59: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -4373,7 +4373,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %a.patt: %pattern_type.1a0 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.1a0 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.unsigned_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.unsigned_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.cce = impl_witness_access constants.%ImplicitAs.impl_witness.2d1, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -4389,7 +4389,7 @@ fn CopyUnsignedLong() { // CHECK:STDOUT: %b.patt: %pattern_type.1a0 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.1a0 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.unsigned_long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.unsigned_long = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: ref %Cpp.unsigned_long = name_ref a, %a // CHECK:STDOUT: %.loc9_37: %Cpp.unsigned_long = acquire_value %a.ref // CHECK:STDOUT: %impl.elem0.loc9: %.a6d = impl_witness_access constants.%Copy.impl_witness.845, element0 [concrete = constants.%Cpp.unsigned_long.as.Copy.impl.Op] diff --git a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon index 76de422f582a..fe7f62c1f2b1 100644 --- a/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon +++ b/toolchain/check/testdata/interop/cpp/primitive_types/long_and_long_long.lp64.carbon @@ -755,7 +755,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc11_50.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc11_50: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -932,7 +932,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc11_59.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc11_59: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -1225,7 +1225,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc24_55.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc24_55: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -1332,7 +1332,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -1348,7 +1348,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %b.patt: %pattern_type.d58 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.d58 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.long_long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.long_long = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: ref %Cpp.long_long = name_ref a, %a // CHECK:STDOUT: %.loc9_33: %Cpp.long_long = acquire_value %a.ref // CHECK:STDOUT: %impl.elem0.loc9: %.3c3 = impl_witness_access constants.%Copy.impl_witness.5c7, element0 [concrete = constants.%Cpp.long_long.as.Copy.impl.Op] @@ -2679,7 +2679,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -2695,7 +2695,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %b.patt: %pattern_type.d58 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.d58 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.long_long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.long_long = var_storage %b.var_patt // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc9: = bound_method %int_1.loc9, %impl.elem0.loc9 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -3126,7 +3126,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc9: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc9: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.3ce] // CHECK:STDOUT: %bound_method.loc9: = bound_method %int_1.loc9, %impl.elem0.loc9 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.5d7] @@ -3424,7 +3424,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -3559,7 +3559,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1.loc8: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.3ce] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1.loc8, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.5d7] @@ -3680,7 +3680,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.d58 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.d58 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ca2 = impl_witness_access constants.%ImplicitAs.impl_witness.660, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -3976,7 +3976,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.18b = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.18b = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %array_type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %array_type = var_storage %a.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 10e-1 [concrete = constants.%float.6da] // CHECK:STDOUT: %.loc24_64.1: %tuple.type = tuple_literal (%float) [concrete = constants.%tuple] // CHECK:STDOUT: %impl.elem0.loc24_64: %.17b = impl_witness_access constants.%ImplicitAs.impl_witness.303, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.b37] @@ -4083,7 +4083,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %a.patt: %pattern_type.4cd = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.4cd = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %Cpp.unsigned_long_long = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %Cpp.unsigned_long_long = var_storage %a.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc8: %.ee9 = impl_witness_access constants.%ImplicitAs.impl_witness.fa4, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert] // CHECK:STDOUT: %bound_method.loc8: = bound_method %int_1, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -4099,7 +4099,7 @@ fn CopyUnsignedLongLong() { // CHECK:STDOUT: %b.patt: %pattern_type.4cd = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.4cd = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %Cpp.unsigned_long_long = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %Cpp.unsigned_long_long = var_storage %b.var_patt // CHECK:STDOUT: %a.ref: ref %Cpp.unsigned_long_long = name_ref a, %a // CHECK:STDOUT: %.loc9_42: %Cpp.unsigned_long_long = acquire_value %a.ref // CHECK:STDOUT: %impl.elem0.loc9: %.294 = impl_witness_access constants.%Copy.impl_witness.15f, element0 [concrete = constants.%Cpp.unsigned_long_long.as.Copy.impl.Op] diff --git a/toolchain/check/testdata/interop/cpp/range_for.carbon b/toolchain/check/testdata/interop/cpp/range_for.carbon index d2db2ad0a3c8..472bf56198c2 100644 --- a/toolchain/check/testdata/interop/cpp/range_for.carbon +++ b/toolchain/check/testdata/interop/cpp/range_for.carbon @@ -1017,7 +1017,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc34_19.2: %Iterate.type = converted constants.%R.as_type.67d, %Iterate.facet.loc34_19.2 [symbolic = %Iterate.facet.loc34_19.5 (constants.%Iterate.facet.bbb)] // CHECK:STDOUT: %specific_impl_fn.loc34_19.1: = specific_impl_function %impl.elem2.loc34_19.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.bbb) [symbolic = %specific_impl_fn.loc34_19.4 (constants.%specific_impl_fn.87a)] // CHECK:STDOUT: %bound_method.loc34_19.2: = bound_method %r.ref, %specific_impl_fn.loc34_19.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.ca2) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.ca2) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.ca2) to %var = call %bound_method.loc34_19.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -1130,7 +1130,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc49_19.2: %CppRangeForIterate_where.type = converted constants.%MutableRange, %facet_value.loc49_19.2 [concrete = constants.%facet_value.cd6] // CHECK:STDOUT: %specific_fn.loc49_19.1: = specific_function %impl.elem2.loc49, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.cd6) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn.bf1] // CHECK:STDOUT: %bound_method.loc49_19.2: = bound_method %m.ref, %specific_fn.loc49_19.1 -// CHECK:STDOUT: %var.loc49: ref %tuple.type.508 = var invalid +// CHECK:STDOUT: %var.loc49: ref %tuple.type.508 = var_storage invalid // CHECK:STDOUT: %.loc49_18.1: %MutableRange = acquire_value %m.ref // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call.loc49: init %tuple.type.508 to %var.loc49 = call %bound_method.loc49_19.2(%.loc49_18.1) // CHECK:STDOUT: assign %var.loc49, %R.as_type.as.Iterate.impl.NewCursor.call.loc49 @@ -1200,7 +1200,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc55_19.2: %CppRangeForIterate_where.type = converted constants.%ConstRange, %facet_value.loc55_19.2 [concrete = constants.%facet_value.e88] // CHECK:STDOUT: %specific_fn.loc55_19.1: = specific_function %impl.elem2.loc55, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.e88) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn.a05] // CHECK:STDOUT: %bound_method.loc55_19.2: = bound_method %c.ref, %specific_fn.loc55_19.1 -// CHECK:STDOUT: %var.loc55: ref %tuple.type.69f = var invalid +// CHECK:STDOUT: %var.loc55: ref %tuple.type.69f = var_storage invalid // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call.loc55: init %tuple.type.69f to %var.loc55 = call %bound_method.loc55_19.2(%c.ref) // CHECK:STDOUT: assign %var.loc55, %R.as_type.as.Iterate.impl.NewCursor.call.loc55 // CHECK:STDOUT: br !for.next.loc55 @@ -1639,7 +1639,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc44_29.2: %Iterate.type = converted constants.%R.as_type.f62, %Iterate.facet.loc44_29.2 [symbolic = %Iterate.facet.loc44_29.5 (constants.%Iterate.facet.b95)] // CHECK:STDOUT: %specific_impl_fn.loc44_29.1: = specific_impl_function %impl.elem2.loc44_29.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.b95) [symbolic = %specific_impl_fn.loc44_29.4 (constants.%specific_impl_fn.544)] // CHECK:STDOUT: %bound_method.loc44_29.2: = bound_method %r.ref, %specific_impl_fn.loc44_29.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.bc6) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.bc6) = var_storage invalid // CHECK:STDOUT: %.loc44_28.1: @TestIterate.%R.as_type.loc40_76.1 (%R.as_type.f62) = acquire_value %r.ref // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.bc6) to %var = call %bound_method.loc44_29.2(%.loc44_28.1) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call @@ -1757,7 +1757,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc59_29.2: %CppRangeForIterate_where.type = converted constants.%MutableRange, %facet_value.loc59_29.2 [concrete = constants.%facet_value.55a] // CHECK:STDOUT: %specific_fn.loc59_29.1: = specific_function %impl.elem2.loc59, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.55a) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn.532] // CHECK:STDOUT: %bound_method.loc59_29.2: = bound_method %m.ref, %specific_fn.loc59_29.1 -// CHECK:STDOUT: %var.loc59: ref %tuple.type.829 = var invalid +// CHECK:STDOUT: %var.loc59: ref %tuple.type.829 = var_storage invalid // CHECK:STDOUT: %.loc59_28.1: %MutableRange = acquire_value %m.ref // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call.loc59: init %tuple.type.829 to %var.loc59 = call %bound_method.loc59_29.2(%.loc59_28.1) // CHECK:STDOUT: assign %var.loc59, %R.as_type.as.Iterate.impl.NewCursor.call.loc59 @@ -1826,7 +1826,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc63_29.2: %CppRangeForIterate_where.type = converted constants.%ConstRange, %facet_value.loc63_29.2 [concrete = constants.%facet_value.445] // CHECK:STDOUT: %specific_fn.loc63_29.1: = specific_function %impl.elem2.loc63, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.445) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn.7c7] // CHECK:STDOUT: %bound_method.loc63_29.2: = bound_method %c.ref, %specific_fn.loc63_29.1 -// CHECK:STDOUT: %var.loc63: ref %tuple.type.99f = var invalid +// CHECK:STDOUT: %var.loc63: ref %tuple.type.99f = var_storage invalid // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call.loc63: init %tuple.type.99f to %var.loc63 = call %bound_method.loc63_29.2(%c.ref) // CHECK:STDOUT: assign %var.loc63, %R.as_type.as.Iterate.impl.NewCursor.call.loc63 // CHECK:STDOUT: br !for.next.loc63 @@ -2198,7 +2198,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc24_19.2: %Iterate.type = converted constants.%R.as_type.657, %Iterate.facet.loc24_19.2 [symbolic = %Iterate.facet.loc24_19.5 (constants.%Iterate.facet.523)] // CHECK:STDOUT: %specific_impl_fn.loc24_19.1: = specific_impl_function %impl.elem2.loc24_19.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.523) [symbolic = %specific_impl_fn.loc24_19.4 (constants.%specific_impl_fn.5ff)] // CHECK:STDOUT: %bound_method.loc24_19.2: = bound_method %r.ref, %specific_impl_fn.loc24_19.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.6f2) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.6f2) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.6f2) to %var = call %bound_method.loc24_19.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -2306,7 +2306,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc38_19.2: %CppRangeForIterate_where.type = converted constants.%ConstRange, %facet_value.loc38_19.2 [concrete = constants.%facet_value.c05] // CHECK:STDOUT: %specific_fn.loc38_19.1: = specific_function %impl.elem2, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.c05) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn] // CHECK:STDOUT: %bound_method.loc38_19.2: = bound_method %c.ref, %specific_fn.loc38_19.1 -// CHECK:STDOUT: %var: ref %tuple.type.005 = var invalid +// CHECK:STDOUT: %var: ref %tuple.type.005 = var_storage invalid // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call: init %tuple.type.005 to %var = call %bound_method.loc38_19.2(%c.ref) // CHECK:STDOUT: assign %var, %R.as_type.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next @@ -2631,7 +2631,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc26_19.2: %Iterate.type = converted constants.%R.as_type.657, %Iterate.facet.loc26_19.2 [symbolic = %Iterate.facet.loc26_19.5 (constants.%Iterate.facet.523)] // CHECK:STDOUT: %specific_impl_fn.loc26_19.1: = specific_impl_function %impl.elem2.loc26_19.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.523) [symbolic = %specific_impl_fn.loc26_19.4 (constants.%specific_impl_fn.5ff)] // CHECK:STDOUT: %bound_method.loc26_19.2: = bound_method %r.ref, %specific_impl_fn.loc26_19.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.6f2) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.6f2) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.6f2) to %var = call %bound_method.loc26_19.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -2739,7 +2739,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc68_19.2: %CppRangeForIterate_where.type = converted constants.%MutableRange, %facet_value.loc68_19.2 [concrete = constants.%facet_value.85f] // CHECK:STDOUT: %specific_fn.loc68_19.1: = specific_function %impl.elem2, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.85f) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn] // CHECK:STDOUT: %bound_method.loc68_19.2: = bound_method %m.ref, %specific_fn.loc68_19.1 -// CHECK:STDOUT: %var: ref %tuple.type.dd0 = var invalid +// CHECK:STDOUT: %var: ref %tuple.type.dd0 = var_storage invalid // CHECK:STDOUT: %.loc68_18.1: %MutableRange = acquire_value %m.ref // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call: init %tuple.type.dd0 to %var = call %bound_method.loc68_19.2(%.loc68_18.1) // CHECK:STDOUT: assign %var, %R.as_type.as.Iterate.impl.NewCursor.call @@ -3085,7 +3085,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc31_31.2: %Iterate.type = converted constants.%R.as_type.a62, %Iterate.facet.loc31_31.2 [symbolic = %Iterate.facet.loc31_31.5 (constants.%Iterate.facet.b19)] // CHECK:STDOUT: %specific_impl_fn.loc31_31.1: = specific_impl_function %impl.elem2.loc31_31.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.b19) [symbolic = %specific_impl_fn.loc31_31.4 (constants.%specific_impl_fn.e23)] // CHECK:STDOUT: %bound_method.loc31_31.2: = bound_method %r.ref, %specific_impl_fn.loc31_31.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.862) to %var = call %bound_method.loc31_31.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -3202,7 +3202,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc45_31.2: %CppRangeForIterate_where.type = converted constants.%ConstRange, %facet_value.loc45_31.2 [concrete = constants.%facet_value.b1e] // CHECK:STDOUT: %specific_fn.loc45_31.1: = specific_function %impl.elem2, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.b1e) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn] // CHECK:STDOUT: %bound_method.loc45_31.2: = bound_method %c.ref, %specific_fn.loc45_31.1 -// CHECK:STDOUT: %var: ref %tuple.type.df8 = var invalid +// CHECK:STDOUT: %var: ref %tuple.type.df8 = var_storage invalid // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call: init %tuple.type.df8 to %var = call %bound_method.loc45_31.2(%c.ref) // CHECK:STDOUT: assign %var, %R.as_type.as.Iterate.impl.NewCursor.call // CHECK:STDOUT: br !for.next @@ -3464,7 +3464,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc31_31.2: %Iterate.type = converted constants.%R.as_type.a62, %Iterate.facet.loc31_31.2 [symbolic = %Iterate.facet.loc31_31.5 (constants.%Iterate.facet)] // CHECK:STDOUT: %specific_impl_fn.loc31_31.1: = specific_impl_function %impl.elem2.loc31_31.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet) [symbolic = %specific_impl_fn.loc31_31.4 (constants.%specific_impl_fn.e23)] // CHECK:STDOUT: %bound_method.loc31_31.2: = bound_method %r.ref, %specific_impl_fn.loc31_31.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.862) to %var = call %bound_method.loc31_31.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -3573,7 +3573,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %i.patt: %pattern_type.e41 = value_binding_pattern i [concrete = constants.%i.patt] // CHECK:STDOUT: } // CHECK:STDOUT: %m.ref: ref %MutableRange = name_ref m, %m -// CHECK:STDOUT: %var: ref = var invalid [concrete = ] +// CHECK:STDOUT: %var: ref = var_storage invalid [concrete = ] // CHECK:STDOUT: assign , // CHECK:STDOUT: br !for.next // CHECK:STDOUT: @@ -3846,7 +3846,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc38_31.2: %Iterate.type = converted constants.%R.as_type.a62, %Iterate.facet.loc38_31.2 [symbolic = %Iterate.facet.loc38_31.5 (constants.%Iterate.facet.b19)] // CHECK:STDOUT: %specific_impl_fn.loc38_31.1: = specific_impl_function %impl.elem2.loc38_31.1, @Iterate.WithSelf.NewCursor(constants.%Iterate.facet.b19) [symbolic = %specific_impl_fn.loc38_31.4 (constants.%specific_impl_fn.e23)] // CHECK:STDOUT: %bound_method.loc38_31.2: = bound_method %r.ref, %specific_impl_fn.loc38_31.1 -// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var invalid +// CHECK:STDOUT: %var: ref @TestIterate.%as_type (%as_type.862) = var_storage invalid // CHECK:STDOUT: %Iterate.WithSelf.NewCursor.call: init @TestIterate.%as_type (%as_type.862) to %var = call %bound_method.loc38_31.2(%r.ref) // CHECK:STDOUT: assign %var, %Iterate.WithSelf.NewCursor.call // CHECK:STDOUT: br !for.next @@ -3963,7 +3963,7 @@ fn TestDriver(var no_begin_end: Cpp.NoBeginEnd, // CHECK:STDOUT: %.loc80_32.2: %CppRangeForIterate_where.type = converted constants.%MutableAndConstRange, %facet_value.loc80_32.2 [concrete = constants.%facet_value.88d] // CHECK:STDOUT: %specific_fn.loc80_32.1: = specific_function %impl.elem2, @R.as_type.as.Iterate.impl.NewCursor(constants.%facet_value.88d) [concrete = constants.%R.as_type.as.Iterate.impl.NewCursor.specific_fn] // CHECK:STDOUT: %bound_method.loc80_32.2: = bound_method %mc.ref, %specific_fn.loc80_32.1 -// CHECK:STDOUT: %var: ref %tuple.type.56e = var invalid +// CHECK:STDOUT: %var: ref %tuple.type.56e = var_storage invalid // CHECK:STDOUT: %.loc80_30.1: %MutableAndConstRange = acquire_value %mc.ref // CHECK:STDOUT: %R.as_type.as.Iterate.impl.NewCursor.call: init %tuple.type.56e to %var = call %bound_method.loc80_32.2(%.loc80_30.1) // CHECK:STDOUT: assign %var, %R.as_type.as.Iterate.impl.NewCursor.call diff --git a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon index 7ba4a69dcc5f..763fbbad1807 100644 --- a/toolchain/check/testdata/interop/cpp/template/alias_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/alias_template.carbon @@ -94,25 +94,25 @@ var a2: Cpp.Second(Cpp.B, Cpp.A) = Cpp.A.A(); // CHECK:STDOUT: %a1.patt: %pattern_type.3fa = ref_binding_pattern a1 [concrete = constants.%a1.patt] // CHECK:STDOUT: %a1.var_patt: %pattern_type.3fa = var_pattern %a1.patt [concrete = constants.%a1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a1.var: ref %A = var %a1.var_patt [concrete] +// CHECK:STDOUT: %a1.var: ref %A = var_storage %a1.var_patt [concrete] // CHECK:STDOUT: %a1: ref %A = wrapper_binding a1, %a1.var [concrete = %a1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b1.patt: %pattern_type.65a = ref_binding_pattern b1 [concrete = constants.%b1.patt] // CHECK:STDOUT: %b1.var_patt: %pattern_type.65a = var_pattern %b1.patt [concrete = constants.%b1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b1.var: ref %B = var %b1.var_patt [concrete] +// CHECK:STDOUT: %b1.var: ref %B = var_storage %b1.var_patt [concrete] // CHECK:STDOUT: %b1: ref %B = wrapper_binding b1, %b1.var [concrete = %b1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b2.patt: %pattern_type.65a = ref_binding_pattern b2 [concrete = constants.%b2.patt] // CHECK:STDOUT: %b2.var_patt: %pattern_type.65a = var_pattern %b2.patt [concrete = constants.%b2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b2.var: ref %B = var %b2.var_patt [concrete] +// CHECK:STDOUT: %b2.var: ref %B = var_storage %b2.var_patt [concrete] // CHECK:STDOUT: %b2: ref %B = wrapper_binding b2, %b2.var [concrete = %b2.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a2.patt: %pattern_type.3fa = ref_binding_pattern a2 [concrete = constants.%a2.patt] // CHECK:STDOUT: %a2.var_patt: %pattern_type.3fa = var_pattern %a2.patt [concrete = constants.%a2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a2.var: ref %A = var %a2.var_patt [concrete] +// CHECK:STDOUT: %a2.var: ref %A = var_storage %a2.var_patt [concrete] // CHECK:STDOUT: %a2: ref %A = wrapper_binding a2, %a2.var [concrete = %a2.var] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon index 456a88f288d0..610446c8aea8 100644 --- a/toolchain/check/testdata/interop/cpp/template/argument_count.carbon +++ b/toolchain/check/testdata/interop/cpp/template/argument_count.carbon @@ -148,7 +148,7 @@ var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); // CHECK:STDOUT: %x.patt: %pattern_type.83a = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.83a = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %TwoTypes = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -225,25 +225,25 @@ var too_many: Cpp.FixedSizePack(Cpp.A, Cpp.A).Inner(Cpp.B, Cpp.B, Cpp.B); // CHECK:STDOUT: %a0.patt: %pattern_type.a64 = ref_binding_pattern a0 [concrete = constants.%a0.patt] // CHECK:STDOUT: %a0.var_patt: %pattern_type.a64 = var_pattern %a0.patt [concrete = constants.%a0.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a0.var: ref %TypePack.78f = var %a0.var_patt [concrete] +// CHECK:STDOUT: %a0.var: ref %TypePack.78f = var_storage %a0.var_patt [concrete] // CHECK:STDOUT: %a0: ref %TypePack.78f = wrapper_binding a0, %a0.var [concrete = %a0.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a1.patt: %pattern_type.20e = ref_binding_pattern a1 [concrete = constants.%a1.patt] // CHECK:STDOUT: %a1.var_patt: %pattern_type.20e = var_pattern %a1.patt [concrete = constants.%a1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a1.var: ref %TypePack.0bc = var %a1.var_patt [concrete] +// CHECK:STDOUT: %a1.var: ref %TypePack.0bc = var_storage %a1.var_patt [concrete] // CHECK:STDOUT: %a1: ref %TypePack.0bc = wrapper_binding a1, %a1.var [concrete = %a1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a2.patt: %pattern_type.c25 = ref_binding_pattern a2 [concrete = constants.%a2.patt] // CHECK:STDOUT: %a2.var_patt: %pattern_type.c25 = var_pattern %a2.patt [concrete = constants.%a2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a2.var: ref %TypePack.0ec = var %a2.var_patt [concrete] +// CHECK:STDOUT: %a2.var: ref %TypePack.0ec = var_storage %a2.var_patt [concrete] // CHECK:STDOUT: %a2: ref %TypePack.0ec = wrapper_binding a2, %a2.var [concrete = %a2.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a3.patt: %pattern_type.678 = ref_binding_pattern a3 [concrete = constants.%a3.patt] // CHECK:STDOUT: %a3.var_patt: %pattern_type.678 = var_pattern %a3.patt [concrete = constants.%a3.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a3.var: ref %TypePack.186 = var %a3.var_patt [concrete] +// CHECK:STDOUT: %a3.var: ref %TypePack.186 = var_storage %a3.var_patt [concrete] // CHECK:STDOUT: %a3: ref %TypePack.186 = wrapper_binding a3, %a3.var [concrete = %a3.var] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/template/class_template.carbon b/toolchain/check/testdata/interop/cpp/template/class_template.carbon index bca1ead73409..f3ad8102e3e0 100644 --- a/toolchain/check/testdata/interop/cpp/template/class_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/class_template.carbon @@ -76,7 +76,7 @@ var a: Cpp.A = Cpp.X(Cpp.A, Cpp.B).f({} as Cpp.B); // CHECK:STDOUT: %a.patt: %pattern_type.3fa = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.3fa = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %A.ref [concrete = constants.%A] { // CHECK:STDOUT: %Cpp.ref: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %A.ref: type = name_ref A, imports.%A.decl [concrete = constants.%A] diff --git a/toolchain/check/testdata/interop/cpp/template/concept.carbon b/toolchain/check/testdata/interop/cpp/template/concept.carbon index 8c92846c13e1..f5ac271f7a37 100644 --- a/toolchain/check/testdata/interop/cpp/template/concept.carbon +++ b/toolchain/check/testdata/interop/cpp/template/concept.carbon @@ -77,7 +77,7 @@ var x2: X(Cpp.IsLarge(Cpp.Large)) = X(true).Make(); // CHECK:STDOUT: %x1.patt: %pattern_type.26c = ref_binding_pattern x1 [concrete = constants.%x1.patt] // CHECK:STDOUT: %x1.var_patt: %pattern_type.26c = var_pattern %x1.patt [concrete = constants.%x1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x1.var: ref %X.541 = var %x1.var_patt [concrete] +// CHECK:STDOUT: %x1.var: ref %X.541 = var_storage %x1.var_patt [concrete] // CHECK:STDOUT: %.loc11: type = splice_block %X.loc11 [concrete = constants.%X.541] { // CHECK:STDOUT: %X.ref.loc11: %X.type = name_ref X, %X.decl [concrete = constants.%X.generic] // CHECK:STDOUT: %Cpp.ref.loc11_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] @@ -92,7 +92,7 @@ var x2: X(Cpp.IsLarge(Cpp.Large)) = X(true).Make(); // CHECK:STDOUT: %x2.patt: %pattern_type.795 = ref_binding_pattern x2 [concrete = constants.%x2.patt] // CHECK:STDOUT: %x2.var_patt: %pattern_type.795 = var_pattern %x2.patt [concrete = constants.%x2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x2.var: ref %X.7b4 = var %x2.var_patt [concrete] +// CHECK:STDOUT: %x2.var: ref %X.7b4 = var_storage %x2.var_patt [concrete] // CHECK:STDOUT: %.loc12: type = splice_block %X.loc12 [concrete = constants.%X.7b4] { // CHECK:STDOUT: %X.ref.loc12: %X.type = name_ref X, %X.decl [concrete = constants.%X.generic] // CHECK:STDOUT: %Cpp.ref.loc12_11: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] diff --git a/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon b/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon index 3b7089bcbf0d..e5c9e44b61bc 100644 --- a/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/non_type_param.carbon @@ -195,7 +195,7 @@ fn G() -> i32 { // CHECK:STDOUT: %x.patt: %pattern_type.2aa = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.2aa = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %TwoNonType = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %TwoNonType = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %TwoNonType = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -253,7 +253,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: %StaticInt.patt: %pattern_type.6b6 = ref_binding_pattern StaticInt [concrete = constants.%StaticInt.patt] // CHECK:STDOUT: %StaticInt.var_patt: %pattern_type.6b6 = var_pattern %StaticInt.patt [concrete = constants.%StaticInt.var_patt] -// CHECK:STDOUT: %StaticInt.var: ref %i32 = var %StaticInt.var_patt [concrete] +// CHECK:STDOUT: %StaticInt.var: ref %i32 = var_storage %StaticInt.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -261,13 +261,13 @@ fn G() -> i32 { // CHECK:STDOUT: %x.patt: %pattern_type.eef = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.eef = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %DependentNonType.43e = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %DependentNonType.43e = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %DependentNonType.43e = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.70d = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.70d = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %DependentNonType.d43 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %DependentNonType.d43 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %y: ref %DependentNonType.d43 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon b/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon index 2f86e85714c1..8bf4dd568cb3 100644 --- a/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/template_template_param.carbon @@ -110,7 +110,7 @@ var x: Cpp.TwoTemplates(Cpp.A, true); // CHECK:STDOUT: %x.patt: %pattern_type.f5e = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.f5e = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %TwoTemplates = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %TwoTemplates = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %TwoTemplates = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -134,7 +134,7 @@ var x: Cpp.TwoTemplates(Cpp.A, true); // CHECK:STDOUT: %x.patt: = ref_binding_pattern x [concrete = ] // CHECK:STDOUT: %x.var_patt: = var_pattern %x.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] +// CHECK:STDOUT: %x.var: ref = var_storage %x.var_patt [concrete = ] // CHECK:STDOUT: %x: = wrapper_binding x, [concrete = ] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/template/type_param.carbon b/toolchain/check/testdata/interop/cpp/template/type_param.carbon index 1d4def78be3c..6c6f03368944 100644 --- a/toolchain/check/testdata/interop/cpp/template/type_param.carbon +++ b/toolchain/check/testdata/interop/cpp/template/type_param.carbon @@ -94,7 +94,7 @@ var x: Cpp.TwoTypes(Cpp.A, {}); // CHECK:STDOUT: %x.patt: %pattern_type.83a = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.83a = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %TwoTypes = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -141,7 +141,7 @@ var x: Cpp.TwoTypes(Cpp.A, {}); // CHECK:STDOUT: %x.patt: %pattern_type.0c3 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.0c3 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %TwoTypes = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %TwoTypes = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %x: ref %TwoTypes = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/template/var_template.carbon b/toolchain/check/testdata/interop/cpp/template/var_template.carbon index 38d3bbbfff57..b96c7eeb8eef 100644 --- a/toolchain/check/testdata/interop/cpp/template/var_template.carbon +++ b/toolchain/check/testdata/interop/cpp/template/var_template.carbon @@ -46,7 +46,7 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %pattern_type.3fa: type = pattern_type %A [concrete] // CHECK:STDOUT: %var.patt.c98: %pattern_type.3fa = ref_binding_pattern r#var [concrete] // CHECK:STDOUT: %var.var_patt.e06: %pattern_type.3fa = var_pattern %var.patt.c98 [concrete] -// CHECK:STDOUT: %addr.58e: %ptr.25f = addr_of imports.%var.var.64d [concrete] +// CHECK:STDOUT: %addr.305: %ptr.25f = addr_of imports.%var.var.905 [concrete] // CHECK:STDOUT: %B: type = class_type @B [concrete] // CHECK:STDOUT: %ptr.dc0: type = ptr_type %B [concrete] // CHECK:STDOUT: %pattern_type.733: type = pattern_type %ptr.dc0 [concrete] @@ -54,18 +54,18 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %pattern_type.65a: type = pattern_type %B [concrete] // CHECK:STDOUT: %var.patt.de6: %pattern_type.65a = ref_binding_pattern r#var [concrete] // CHECK:STDOUT: %var.var_patt.72d: %pattern_type.65a = var_pattern %var.patt.de6 [concrete] -// CHECK:STDOUT: %addr.191: %ptr.dc0 = addr_of imports.%var.var.e6d [concrete] +// CHECK:STDOUT: %addr.62b: %ptr.dc0 = addr_of imports.%var.var.46c [concrete] // CHECK:STDOUT: %pwa.patt: %pattern_type.1fa = value_binding_pattern pwa [concrete] // CHECK:STDOUT: %Wrap: type = class_type @Wrap [concrete] // CHECK:STDOUT: %var.type.30e: type = cpp_type_template_type r#var [concrete] // CHECK:STDOUT: %var.template.28b: %var.type.30e = struct_value () [concrete] // CHECK:STDOUT: %var.patt.4ff: %pattern_type.3fa = ref_binding_pattern r#var [concrete] // CHECK:STDOUT: %var.var_patt.c1f: %pattern_type.3fa = var_pattern %var.patt.4ff [concrete] -// CHECK:STDOUT: %addr.7e0: %ptr.25f = addr_of imports.%var.var.6a9 [concrete] +// CHECK:STDOUT: %addr.c42: %ptr.25f = addr_of imports.%var.var.515 [concrete] // CHECK:STDOUT: %pwb.patt: %pattern_type.733 = value_binding_pattern pwb [concrete] // CHECK:STDOUT: %var.patt.96f: %pattern_type.65a = ref_binding_pattern r#var [concrete] // CHECK:STDOUT: %var.var_patt.891: %pattern_type.65a = var_pattern %var.patt.96f [concrete] -// CHECK:STDOUT: %addr.e65: %ptr.dc0 = addr_of imports.%var.var.061 [concrete] +// CHECK:STDOUT: %addr.cd4: %ptr.dc0 = addr_of imports.%var.var.302 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { @@ -80,19 +80,19 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %var.template.7db: %var.type.fce = struct_value () [concrete = constants.%var.template.7db] // CHECK:STDOUT: %var.patt.c98: %pattern_type.3fa = ref_binding_pattern r#var [concrete = constants.%var.patt.c98] // CHECK:STDOUT: %var.var_patt.e06: %pattern_type.3fa = var_pattern %var.patt.c98 [concrete = constants.%var.var_patt.e06] -// CHECK:STDOUT: %var.var.64d: ref %A = var %var.var_patt.e06 [concrete] +// CHECK:STDOUT: %var.var.905: ref %A = var_storage %var.var_patt.e06 [concrete] // CHECK:STDOUT: %B.decl: type = class_decl @B [concrete = constants.%B] {} {} // CHECK:STDOUT: %var.patt.de6: %pattern_type.65a = ref_binding_pattern r#var [concrete = constants.%var.patt.de6] // CHECK:STDOUT: %var.var_patt.72d: %pattern_type.65a = var_pattern %var.patt.de6 [concrete = constants.%var.var_patt.72d] -// CHECK:STDOUT: %var.var.e6d: ref %B = var %var.var_patt.72d [concrete] +// CHECK:STDOUT: %var.var.46c: ref %B = var_storage %var.var_patt.72d [concrete] // CHECK:STDOUT: %Wrap.decl: type = class_decl @Wrap [concrete = constants.%Wrap] {} {} // CHECK:STDOUT: %var.template.28b: %var.type.30e = struct_value () [concrete = constants.%var.template.28b] // CHECK:STDOUT: %var.patt.4ff: %pattern_type.3fa = ref_binding_pattern r#var [concrete = constants.%var.patt.4ff] // CHECK:STDOUT: %var.var_patt.c1f: %pattern_type.3fa = var_pattern %var.patt.4ff [concrete = constants.%var.var_patt.c1f] -// CHECK:STDOUT: %var.var.6a9: ref %A = var %var.var_patt.c1f [concrete] +// CHECK:STDOUT: %var.var.515: ref %A = var_storage %var.var_patt.c1f [concrete] // CHECK:STDOUT: %var.patt.96f: %pattern_type.65a = ref_binding_pattern r#var [concrete = constants.%var.patt.96f] // CHECK:STDOUT: %var.var_patt.891: %pattern_type.65a = var_pattern %var.patt.96f [concrete = constants.%var.var_patt.891] -// CHECK:STDOUT: %var.var.061: ref %B = var %var.var_patt.891 [concrete] +// CHECK:STDOUT: %var.var.302: ref %B = var_storage %var.var_patt.891 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -140,24 +140,24 @@ let pwb: Cpp.B* = &Cpp.Wrap.r#var(Cpp.B); // CHECK:STDOUT: %var.ref.loc7: %var.type.fce = name_ref r#var, imports.%var.template.7db [concrete = constants.%var.template.7db] // CHECK:STDOUT: %Cpp.ref.loc7_29: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %A.ref.loc7: type = name_ref A, imports.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %addr.loc7: %ptr.25f = addr_of imports.%var.var.64d [concrete = constants.%addr.58e] +// CHECK:STDOUT: %addr.loc7: %ptr.25f = addr_of imports.%var.var.905 [concrete = constants.%addr.305] // CHECK:STDOUT: %Cpp.ref.loc8_19: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %var.ref.loc8: %var.type.fce = name_ref r#var, imports.%var.template.7db [concrete = constants.%var.template.7db] // CHECK:STDOUT: %Cpp.ref.loc8_29: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %B.ref.loc8: type = name_ref B, imports.%B.decl [concrete = constants.%B] -// CHECK:STDOUT: %addr.loc8: %ptr.dc0 = addr_of imports.%var.var.e6d [concrete = constants.%addr.191] +// CHECK:STDOUT: %addr.loc8: %ptr.dc0 = addr_of imports.%var.var.46c [concrete = constants.%addr.62b] // CHECK:STDOUT: %Cpp.ref.loc9_20: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Wrap.ref.loc9: type = name_ref Wrap, imports.%Wrap.decl [concrete = constants.%Wrap] // CHECK:STDOUT: %var.ref.loc9: %var.type.30e = name_ref r#var, imports.%var.template.28b [concrete = constants.%var.template.28b] // CHECK:STDOUT: %Cpp.ref.loc9_35: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %A.ref.loc9: type = name_ref A, imports.%A.decl [concrete = constants.%A] -// CHECK:STDOUT: %addr.loc9: %ptr.25f = addr_of imports.%var.var.6a9 [concrete = constants.%addr.7e0] +// CHECK:STDOUT: %addr.loc9: %ptr.25f = addr_of imports.%var.var.515 [concrete = constants.%addr.c42] // CHECK:STDOUT: %Cpp.ref.loc10_20: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %Wrap.ref.loc10: type = name_ref Wrap, imports.%Wrap.decl [concrete = constants.%Wrap] // CHECK:STDOUT: %var.ref.loc10: %var.type.30e = name_ref r#var, imports.%var.template.28b [concrete = constants.%var.template.28b] // CHECK:STDOUT: %Cpp.ref.loc10_35: = name_ref Cpp, imports.%Cpp [concrete = imports.%Cpp] // CHECK:STDOUT: %B.ref.loc10: type = name_ref B, imports.%B.decl [concrete = constants.%B] -// CHECK:STDOUT: %addr.loc10: %ptr.dc0 = addr_of imports.%var.var.061 [concrete = constants.%addr.e65] +// CHECK:STDOUT: %addr.loc10: %ptr.dc0 = addr_of imports.%var.var.302 [concrete = constants.%addr.cd4] // CHECK:STDOUT: // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon index 6e26a72d326b..11f3c2655e76 100644 --- a/toolchain/check/testdata/interop/cpp/type_alias/import.carbon +++ b/toolchain/check/testdata/interop/cpp/type_alias/import.carbon @@ -113,7 +113,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt // CHECK:STDOUT: %int_42: Core.IntLiteral = int_value 42 [concrete = constants.%int_42.20e] // CHECK:STDOUT: %impl.elem0.loc8: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc8_3.1: = bound_method %int_42, %impl.elem0.loc8 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -132,7 +132,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %p.patt: %pattern_type.f00 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.f00 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.d08 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.d08 = var_storage %p.var_patt // CHECK:STDOUT: %n.ref: ref %i32 = name_ref n, %n // CHECK:STDOUT: %addr: %ptr.d08 = addr_of %n.ref // CHECK:STDOUT: %impl.elem0.loc10: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] @@ -207,7 +207,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %pd.patt: %pattern_type.8fa = ref_binding_pattern pd [concrete = constants.%pd.patt] // CHECK:STDOUT: %pd.var_patt: %pattern_type.8fa = var_pattern %pd.patt [concrete = constants.%pd.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %pd.var: ref %ptr.0a2 = var %pd.var_patt +// CHECK:STDOUT: %pd.var: ref %ptr.0a2 = var_storage %pd.var_patt // CHECK:STDOUT: %c.ref: ref %C = name_ref c, %c // CHECK:STDOUT: %addr.loc9: %ptr.0a2 = addr_of %c.ref // CHECK:STDOUT: %impl.elem0.loc9: %.51b = impl_witness_access constants.%Copy.impl_witness.00a, element0 [concrete = constants.%ptr.as.Copy.impl.Op.4ad] @@ -226,7 +226,7 @@ fn H(var c: Cpp.C, var d: Cpp.D) { // CHECK:STDOUT: %pc.patt: %pattern_type.8fa = ref_binding_pattern pc [concrete = constants.%pc.patt] // CHECK:STDOUT: %pc.var_patt: %pattern_type.8fa = var_pattern %pc.patt [concrete = constants.%pc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %pc.var: ref %ptr.0a2 = var %pc.var_patt +// CHECK:STDOUT: %pc.var: ref %ptr.0a2 = var_storage %pc.var_patt // CHECK:STDOUT: %d.ref: ref %C = name_ref d, %d // CHECK:STDOUT: %addr.loc10: %ptr.0a2 = addr_of %d.ref // CHECK:STDOUT: %impl.elem0.loc10: %.51b = impl_witness_access constants.%Copy.impl_witness.00a, element0 [concrete = constants.%ptr.as.Copy.impl.Op.4ad] diff --git a/toolchain/check/testdata/interop/cpp/var/import/global.carbon b/toolchain/check/testdata/interop/cpp/var/import/global.carbon index fa651642cd18..b7420b6b3606 100644 --- a/toolchain/check/testdata/interop/cpp/var/import/global.carbon +++ b/toolchain/check/testdata/interop/cpp/var/import/global.carbon @@ -91,7 +91,7 @@ fn MyF() { // CHECK:STDOUT: %pattern_type.635: type = pattern_type %const [concrete] // CHECK:STDOUT: %global_ref.patt: %pattern_type.635 = ref_binding_pattern global_ref [concrete] // CHECK:STDOUT: %global_ref.var_patt: %pattern_type.635 = var_pattern %global_ref.patt [concrete] -// CHECK:STDOUT: %global_ref.var: ref %ptr.0a2 = var imports.%global_ref.var_patt [concrete] +// CHECK:STDOUT: %global_ref.var: ref %ptr.0a2 = var_storage imports.%global_ref.var_patt [concrete] // CHECK:STDOUT: %addr: %ptr.0a2 = addr_of imports.%global.var [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -110,13 +110,13 @@ fn MyF() { // CHECK:STDOUT: %C.decl: type = class_decl @C [concrete = constants.%C] {} {} // CHECK:STDOUT: %global.patt: %pattern_type.bbc = ref_binding_pattern global [concrete = constants.%global.patt] // CHECK:STDOUT: %global.var_patt: %pattern_type.bbc = var_pattern %global.patt [concrete = constants.%global.var_patt] -// CHECK:STDOUT: %global.var: ref %C = var %global.var_patt [concrete] +// CHECK:STDOUT: %global.var: ref %C = var_storage %global.var_patt [concrete] // CHECK:STDOUT: %global_ptr.patt: %pattern_type.8fa = ref_binding_pattern global_ptr [concrete = constants.%global_ptr.patt] // CHECK:STDOUT: %global_ptr.var_patt: %pattern_type.8fa = var_pattern %global_ptr.patt [concrete = constants.%global_ptr.var_patt] -// CHECK:STDOUT: %global_ptr.var: ref %ptr.0a2 = var %global_ptr.var_patt [concrete] +// CHECK:STDOUT: %global_ptr.var: ref %ptr.0a2 = var_storage %global_ptr.var_patt [concrete] // CHECK:STDOUT: %global_ref.patt: %pattern_type.635 = ref_binding_pattern global_ref [concrete = constants.%global_ref.patt] // CHECK:STDOUT: %global_ref.var_patt: %pattern_type.635 = var_pattern %global_ref.patt [concrete = constants.%global_ref.var_patt] -// CHECK:STDOUT: %global_ref.var: ref %const = var %global_ref.var_patt [concrete] +// CHECK:STDOUT: %global_ref.var: ref %const = var_storage %global_ref.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { diff --git a/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon b/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon index c42a3269b1e5..c561037f735d 100644 --- a/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon +++ b/toolchain/check/testdata/interop/cpp/var/import/namespace.carbon @@ -63,7 +63,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index aff5f6eb4005..51287a126c68 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -105,7 +105,7 @@ var b: T = *a; // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: %.loc8: type = splice_block %ptr [concrete = ] { // CHECK:STDOUT: %T.ref.loc8: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] @@ -115,7 +115,7 @@ var b: T = *a; // CHECK:STDOUT: %b.patt: = ref_binding_pattern b [concrete = ] // CHECK:STDOUT: %b.var_patt: = var_pattern %b.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref = var %b.var_patt [concrete = ] +// CHECK:STDOUT: %b.var: ref = var_storage %b.var_patt [concrete = ] // CHECK:STDOUT: %T.ref.loc13: type = name_ref T, imports.%Implicit.T // CHECK:STDOUT: %b: = wrapper_binding b, [concrete = ] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index cc4ed3fb5d68..408391193db6 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -117,7 +117,7 @@ var a: i32 = NS.A(); // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index 21ed0ef66b55..8c7b9b3975c0 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -123,7 +123,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -133,7 +133,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %b.patt: %pattern_type = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc5_9.1: type = splice_block %.loc5_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -143,7 +143,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %package_a.patt: %pattern_type = ref_binding_pattern package_a [concrete = constants.%package_a.patt] // CHECK:STDOUT: %package_a.var_patt: %pattern_type = var_pattern %package_a.patt [concrete = constants.%package_a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_a.var: ref %empty_tuple.type = var %package_a.var_patt [concrete] +// CHECK:STDOUT: %package_a.var: ref %empty_tuple.type = var_storage %package_a.var_patt [concrete] // CHECK:STDOUT: %.loc7_17.1: type = splice_block %.loc7_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc7_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_17.3: type = converted %.loc7_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -153,7 +153,7 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: %package_b.patt: %pattern_type = ref_binding_pattern package_b [concrete = constants.%package_b.patt] // CHECK:STDOUT: %package_b.var_patt: %pattern_type = var_pattern %package_b.patt [concrete = constants.%package_b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_b.var: ref %empty_tuple.type = var %package_b.var_patt [concrete] +// CHECK:STDOUT: %package_b.var: ref %empty_tuple.type = var_storage %package_b.var_patt [concrete] // CHECK:STDOUT: %.loc8_17.1: type = splice_block %.loc8_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc8_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_17.3: type = converted %.loc8_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index 189130dbbcdb..693dedd688d5 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -283,7 +283,7 @@ fn G() { Same.F(); } // CHECK:STDOUT: %e.patt: %pattern_type = ref_binding_pattern e [concrete = constants.%e.patt] // CHECK:STDOUT: %e.var_patt: %pattern_type = var_pattern %e.patt [concrete = constants.%e.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var %e.var_patt [concrete] +// CHECK:STDOUT: %e.var: ref %empty_tuple.type = var_storage %e.var_patt [concrete] // CHECK:STDOUT: %.loc5_9.1: type = splice_block %.loc5_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/namespace/merging_with_indirections.carbon b/toolchain/check/testdata/namespace/merging_with_indirections.carbon index 25050b146188..f4e8402b9157 100644 --- a/toolchain/check/testdata/namespace/merging_with_indirections.carbon +++ b/toolchain/check/testdata/namespace/merging_with_indirections.carbon @@ -246,7 +246,7 @@ fn Run() { // CHECK:STDOUT: %a.patt: %pattern_type.821 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.821 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %A = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %A = var_storage %a.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%A, (constants.%DefaultOrUnformed.impl_witness.776) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc10_21.1: %DefaultOrUnformed.type = converted constants.%A, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc10_21.1 [concrete = constants.%A] diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 06e3eb4631b3..7ff8d433463d 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -149,7 +149,7 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: %A.patt: %pattern_type.6b6 = ref_binding_pattern A [concrete = constants.%A.patt] // CHECK:STDOUT: %A.var_patt: %pattern_type.6b6 = var_pattern %A.patt [concrete = constants.%A.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %A.var: ref %i32 = var %A.var_patt +// CHECK:STDOUT: %A.var: ref %i32 = var_storage %A.var_patt // CHECK:STDOUT: %int_0.loc26: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc26: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc26_5.1: = bound_method %int_0.loc26, %impl.elem0.loc26 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/operators/builtin/and.carbon b/toolchain/check/testdata/operators/builtin/and.carbon index 7347877fc110..2055a10e8a1f 100644 --- a/toolchain/check/testdata/operators/builtin/and.carbon +++ b/toolchain/check/testdata/operators/builtin/and.carbon @@ -190,7 +190,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %a.patt: %pattern_type.831 = ref_binding_pattern a [concrete = constants.%a.patt.d4c] // CHECK:STDOUT: %a.var_patt: %pattern_type.831 = var_pattern %a.patt [concrete = constants.%a.var_patt.41b] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref bool = var %a.var_patt +// CHECK:STDOUT: %a.var: ref bool = var_storage %a.var_patt // CHECK:STDOUT: %true.loc23_54: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method: = bound_method %true.loc23_54, %impl.elem0 [concrete = constants.%bool.as.Copy.impl.Op.bound] @@ -230,7 +230,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %b.patt: %pattern_type.cb1 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.cb1 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt // CHECK:STDOUT: %.loc24_56.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc24_56.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc24_3: init %empty_tuple.type = converted %.loc24_56.1, %.loc24_56.2 [concrete = constants.%empty_tuple] @@ -269,7 +269,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %c.patt: %pattern_type.cb1 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.cb1 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var_storage %c.var_patt // CHECK:STDOUT: %.loc25_56.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc25_56.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc25_3: init %empty_tuple.type = converted %.loc25_56.1, %.loc25_56.2 [concrete = constants.%empty_tuple] @@ -308,7 +308,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt // CHECK:STDOUT: %.loc26_57.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc26_57.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc26_3: init %empty_tuple.type = converted %.loc26_57.1, %.loc26_57.2 [concrete = constants.%empty_tuple] @@ -364,7 +364,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt.728] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt.06f] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt // CHECK:STDOUT: %.loc30_53.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc30_53.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc30_3: init %empty_tuple.type = converted %.loc30_53.1, %.loc30_53.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/operators/builtin/assignment.carbon b/toolchain/check/testdata/operators/builtin/assignment.carbon index 833f6123c7b6..2c14fcad5a0d 100644 --- a/toolchain/check/testdata/operators/builtin/assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/assignment.carbon @@ -167,7 +167,7 @@ fn Main() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %int_12: Core.IntLiteral = int_value 12 [concrete = constants.%int_12.6a3] // CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc16_3.1: = bound_method %int_12, %impl.elem0.loc16 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.87c] @@ -191,7 +191,7 @@ fn Main() { // CHECK:STDOUT: %b.patt: %pattern_type.394 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.394 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %tuple.type.e55 = var %b.var_patt +// CHECK:STDOUT: %b.var: ref %tuple.type.e55 = var_storage %b.var_patt // CHECK:STDOUT: %int_1.loc19: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc19: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc19_28.1: %tuple.type.f94 = tuple_literal (%int_1.loc19, %int_2.loc19) [concrete = constants.%tuple.ad8] @@ -247,7 +247,7 @@ fn Main() { // CHECK:STDOUT: %c.patt: %pattern_type.20e3 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.20e3 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %struct_type.a.b.b4c = var %c.var_patt +// CHECK:STDOUT: %c.var: ref %struct_type.a.b.b4c = var_storage %c.var_patt // CHECK:STDOUT: %int_1.loc23: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc23: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc23_46.1: %struct_type.a.b.cfd = struct_literal (%int_1.loc23, %int_2.loc23) [concrete = constants.%struct.4aa] @@ -300,7 +300,7 @@ fn Main() { // CHECK:STDOUT: %p.patt: %pattern_type.f00 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.f00 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.d08 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.d08 = var_storage %p.var_patt // CHECK:STDOUT: %a.ref.loc27: ref %i32 = name_ref a, %a // CHECK:STDOUT: %addr.loc27: %ptr.d08 = addr_of %a.ref.loc27 // CHECK:STDOUT: %impl.elem0.loc27: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] 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 35ec39728e33..7cee7b6463c2 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 @@ -96,7 +96,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: %a.patt: = ref_binding_pattern a [concrete = ] // CHECK:STDOUT: %a.var_patt: = var_pattern %a.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref = var %a.var_patt [concrete = ] +// CHECK:STDOUT: %a.var: ref = var_storage %a.var_patt [concrete = ] // CHECK:STDOUT: assign %a.var, // CHECK:STDOUT: br !.loc9_20 // CHECK:STDOUT: @@ -132,7 +132,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: %b.patt: = ref_binding_pattern b [concrete = ] // CHECK:STDOUT: %b.var_patt: = var_pattern %b.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref = var %b.var_patt [concrete = ] +// CHECK:STDOUT: %b.var: ref = var_storage %b.var_patt [concrete = ] // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: br !.loc14_20 // CHECK:STDOUT: @@ -216,7 +216,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: %c.patt: = ref_binding_pattern c [concrete = ] // CHECK:STDOUT: %c.var_patt: = var_pattern %c.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref = var %c.var_patt [concrete = ] +// CHECK:STDOUT: %c.var: ref = var_storage %c.var_patt [concrete = ] // CHECK:STDOUT: assign %c.var, // CHECK:STDOUT: br !.loc11_20 // CHECK:STDOUT: @@ -252,7 +252,7 @@ fn KnownValueButNonConstantCondition(x: bool) { // CHECK:STDOUT: %d.patt: = ref_binding_pattern d [concrete = ] // CHECK:STDOUT: %d.var_patt: = var_pattern %d.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref = var %d.var_patt [concrete = ] +// CHECK:STDOUT: %d.var: ref = var_storage %d.var_patt [concrete = ] // CHECK:STDOUT: assign %d.var, // CHECK:STDOUT: br !.loc16_20 // 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 48791b1a784b..cc4963366d6d 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 @@ -246,7 +246,7 @@ fn Main() { // CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc33: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc33_3.1: = bound_method %int_0, %impl.elem0.loc33 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] @@ -353,7 +353,7 @@ fn Main() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%i32, (constants.%DefaultOrUnformed.impl_witness.e52) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc56_13.1: %DefaultOrUnformed.type = converted constants.%i32, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc56_13.1 [concrete = constants.%i32] 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 59b03b28bc06..2baeadeee8f5 100644 --- a/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_redundant_compound_access.carbon @@ -140,7 +140,7 @@ fn Main() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %impl.elem0.loc18: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc18_3.1: = bound_method %int_3, %impl.elem0.loc18 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.485] diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon index b8bb0853b062..6fd905753944 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch.carbon @@ -68,7 +68,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.831 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.831 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref bool = var %x.var_patt +// CHECK:STDOUT: %x.var: ref bool = var_storage %x.var_patt // CHECK:STDOUT: %int_12: Core.IntLiteral = int_value 12 [concrete = constants.%int_12] // CHECK:STDOUT: %.loc23_24.1: bool = converted %int_12, [concrete = ] // CHECK:STDOUT: %.loc23_24.2: = not [concrete = ] diff --git a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon index 0f1127b9f4ac..09152ec9c7eb 100644 --- a/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/builtin/fail_type_mismatch_assignment.carbon @@ -91,7 +91,7 @@ fn Main() { // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt // CHECK:STDOUT: %int_3: Core.IntLiteral = int_value 3 [concrete = constants.%int_3.1ba] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc16_3.1: = bound_method %int_3, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/operators/builtin/or.carbon b/toolchain/check/testdata/operators/builtin/or.carbon index 9d5aed44e8dc..5d1ddcf47c29 100644 --- a/toolchain/check/testdata/operators/builtin/or.carbon +++ b/toolchain/check/testdata/operators/builtin/or.carbon @@ -191,7 +191,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %a.patt: %pattern_type.831 = ref_binding_pattern a [concrete = constants.%a.patt.d4ccad.1] // CHECK:STDOUT: %a.var_patt: %pattern_type.831 = var_pattern %a.patt [concrete = constants.%a.var_patt.41b89c.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref bool = var %a.var_patt +// CHECK:STDOUT: %a.var: ref bool = var_storage %a.var_patt // CHECK:STDOUT: %true.loc23_53: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0.loc23: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method.loc23: = bound_method %true.loc23_53, %impl.elem0.loc23 [concrete = constants.%bool.as.Copy.impl.Op.bound] @@ -232,7 +232,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %b.patt: %pattern_type.831 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.831 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref bool = var %b.var_patt +// CHECK:STDOUT: %b.var: ref bool = var_storage %b.var_patt // CHECK:STDOUT: %true.loc24_54: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0.loc24: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method.loc24: = bound_method %true.loc24_54, %impl.elem0.loc24 [concrete = constants.%bool.as.Copy.impl.Op.bound] @@ -273,7 +273,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %c.patt: %pattern_type.831 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.831 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref bool = var %c.var_patt +// CHECK:STDOUT: %c.var: ref bool = var_storage %c.var_patt // CHECK:STDOUT: %true.loc25_54: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0.loc25: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method.loc25: = bound_method %true.loc25_54, %impl.elem0.loc25 [concrete = constants.%bool.as.Copy.impl.Op.bound] @@ -314,7 +314,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %d.patt: %pattern_type.cb1 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.cb1 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var %d.var_patt +// CHECK:STDOUT: %d.var: ref %empty_tuple.type = var_storage %d.var_patt // CHECK:STDOUT: %.loc26_56.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc26_56.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc26_3: init %empty_tuple.type = converted %.loc26_56.1, %.loc26_56.2 [concrete = constants.%empty_tuple] @@ -371,7 +371,7 @@ fn PartialConstant(x: bool) { // CHECK:STDOUT: %a.patt: %pattern_type.831 = ref_binding_pattern a [concrete = constants.%a.patt.d4ccad.2] // CHECK:STDOUT: %a.var_patt: %pattern_type.831 = var_pattern %a.patt [concrete = constants.%a.var_patt.41b89c.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref bool = var %a.var_patt +// CHECK:STDOUT: %a.var: ref bool = var_storage %a.var_patt // CHECK:STDOUT: %true.loc30_50: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method: = bound_method %true.loc30_50, %impl.elem0 [concrete = constants.%bool.as.Copy.impl.Op.bound] diff --git a/toolchain/check/testdata/operators/builtin/unary_op.carbon b/toolchain/check/testdata/operators/builtin/unary_op.carbon index 3ba7f900af03..bb59c5ec26cb 100644 --- a/toolchain/check/testdata/operators/builtin/unary_op.carbon +++ b/toolchain/check/testdata/operators/builtin/unary_op.carbon @@ -130,7 +130,7 @@ fn Constant() { // CHECK:STDOUT: %a.patt: %pattern_type.cb1 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.cb1 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt // CHECK:STDOUT: %.loc23_50.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc23_50.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc23_3: init %empty_tuple.type = converted %.loc23_50.1, %.loc23_50.2 [concrete = constants.%empty_tuple] @@ -161,7 +161,7 @@ fn Constant() { // CHECK:STDOUT: %b.patt: %pattern_type.831 = ref_binding_pattern b [concrete = constants.%b.patt.454] // CHECK:STDOUT: %b.var_patt: %pattern_type.831 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref bool = var %b.var_patt +// CHECK:STDOUT: %b.var: ref bool = var_storage %b.var_patt // CHECK:STDOUT: %true.loc24: bool = bool_literal true [concrete = constants.%true] // CHECK:STDOUT: %impl.elem0: %.15e = impl_witness_access constants.%Copy.impl_witness.713, element0 [concrete = constants.%bool.as.Copy.impl.Op] // CHECK:STDOUT: %bound_method: = bound_method %true.loc24, %impl.elem0 [concrete = constants.%bool.as.Copy.impl.Op.bound] diff --git a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon index 0836409e086c..e23aad362f62 100644 --- a/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon +++ b/toolchain/check/testdata/operators/overloaded/fail_no_impl.carbon @@ -179,7 +179,7 @@ fn TestRef(b: C) { // CHECK:STDOUT: %a.patt: %pattern_type.4a7 = ref_binding_pattern a [concrete = constants.%a.patt.28f] // CHECK:STDOUT: %a.var_patt: %pattern_type.4a7 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %C = var %a.var_patt +// CHECK:STDOUT: %a.var: ref %C = var_storage %a.var_patt // CHECK:STDOUT: %.loc36_15.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc36_15.2: init %C to %a.var = class_init () [concrete = constants.%C.val] // CHECK:STDOUT: %.loc36_3: init %C = converted %.loc36_15.1, %.loc36_15.2 [concrete = constants.%C.val] diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index d2ff498da8ab..07aaa1d95560 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -115,14 +115,14 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %i32.loc4: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } @@ -234,7 +234,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt.1ad] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt.16c] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %x: ref %i32 = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: %Main.decl: %Main.type = fn_decl @Main [concrete = constants.%Main] {} {} @@ -246,7 +246,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.6b6 = ref_binding_pattern x [concrete = constants.%x.patt.aaf] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b6 = var_pattern %x.patt [concrete = constants.%x.var_patt.c4a] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %i32 = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %i32 = var_storage %x.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc7: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc7_3.1: = bound_method %int_1, %impl.elem0.loc7 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] @@ -261,7 +261,7 @@ fn Main() { // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt // CHECK:STDOUT: %package.ref: = name_ref package, package [concrete = package] // CHECK:STDOUT: %x.ref: ref %i32 = name_ref x, file.%x [concrete = file.%x.var] // CHECK:STDOUT: %.loc9: %i32 = acquire_value %x.ref diff --git a/toolchain/check/testdata/packages/cross_package_export.carbon b/toolchain/check/testdata/packages/cross_package_export.carbon index a9e6a9e787b7..45fe6a2e8880 100644 --- a/toolchain/check/testdata/packages/cross_package_export.carbon +++ b/toolchain/check/testdata/packages/cross_package_export.carbon @@ -389,7 +389,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -415,7 +415,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -435,7 +435,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.1: %struct_type.x = struct_literal (%.loc6_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc6_25.2: init %empty_tuple.type to %.loc6_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.3: init %empty_tuple.type = converted %.loc6_25.1, %.loc6_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.4: init %empty_tuple.type to %.loc6_26.2 = in_place_init %.loc6_26.3 [concrete = constants.%empty_tuple] @@ -457,7 +457,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -484,7 +484,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -504,7 +504,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.1: %struct_type.x = struct_literal (%.loc7_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc7_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc7_25.2: init %empty_tuple.type to %.loc7_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.3: init %empty_tuple.type = converted %.loc7_25.1, %.loc7_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.4: init %empty_tuple.type to %.loc7_26.2 = in_place_init %.loc7_26.3 [concrete = constants.%empty_tuple] @@ -526,7 +526,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -553,7 +553,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -573,7 +573,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.1: %struct_type.x = struct_literal (%.loc6_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc6_25.2: init %empty_tuple.type to %.loc6_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.3: init %empty_tuple.type = converted %.loc6_25.1, %.loc6_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.4: init %empty_tuple.type to %.loc6_26.2 = in_place_init %.loc6_26.3 [concrete = constants.%empty_tuple] @@ -595,7 +595,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -620,7 +620,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -640,7 +640,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.1: %struct_type.x = struct_literal (%.loc6_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc6_25.2: init %empty_tuple.type to %.loc6_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.3: init %empty_tuple.type = converted %.loc6_25.1, %.loc6_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.4: init %empty_tuple.type to %.loc6_26.2 = in_place_init %.loc6_26.3 [concrete = constants.%empty_tuple] @@ -662,7 +662,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -688,7 +688,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -708,7 +708,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.1: %struct_type.x = struct_literal (%.loc7_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc7_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc7_25.2: init %empty_tuple.type to %.loc7_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.3: init %empty_tuple.type = converted %.loc7_25.1, %.loc7_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.4: init %empty_tuple.type to %.loc7_26.2 = in_place_init %.loc7_26.3 [concrete = constants.%empty_tuple] @@ -730,7 +730,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -755,7 +755,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -775,7 +775,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.1: %struct_type.x = struct_literal (%.loc6_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc6_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc6_25.2: init %empty_tuple.type to %.loc6_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.3: init %empty_tuple.type = converted %.loc6_25.1, %.loc6_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_26.4: init %empty_tuple.type to %.loc6_26.2 = in_place_init %.loc6_26.3 [concrete = constants.%empty_tuple] @@ -797,7 +797,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.0c9: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.a6a: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -828,7 +828,7 @@ alias C = Other.C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc11: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Other.C [concrete = constants.%C] @@ -848,7 +848,7 @@ alias C = Other.C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc11_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_26.1: %struct_type.x = struct_literal (%.loc11_25.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc11_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.0c9] +// CHECK:STDOUT: %.loc11_26.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.a6a] // CHECK:STDOUT: %.loc11_25.2: init %empty_tuple.type to %.loc11_26.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_26.3: init %empty_tuple.type = converted %.loc11_25.1, %.loc11_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_26.4: init %empty_tuple.type to %.loc11_26.2 = in_place_init %.loc11_26.3 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/packages/export_import.carbon b/toolchain/check/testdata/packages/export_import.carbon index 8764abd618a2..fa68e5a38bc8 100644 --- a/toolchain/check/testdata/packages/export_import.carbon +++ b/toolchain/check/testdata/packages/export_import.carbon @@ -300,7 +300,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -321,7 +321,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -338,7 +338,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -362,7 +362,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -384,7 +384,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -401,7 +401,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc4_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.1: %struct_type.x = struct_literal (%.loc4_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc4_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc4_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc4_19.2: init %empty_tuple.type to %.loc4_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.3: init %empty_tuple.type = converted %.loc4_19.1, %.loc4_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.4: init %empty_tuple.type to %.loc4_20.2 = in_place_init %.loc4_20.3 [concrete = constants.%empty_tuple] @@ -423,7 +423,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -444,7 +444,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -461,7 +461,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -483,7 +483,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -504,7 +504,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -521,7 +521,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -543,7 +543,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -564,7 +564,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -581,7 +581,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -603,7 +603,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -624,7 +624,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -641,7 +641,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -663,7 +663,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -684,7 +684,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -701,7 +701,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -723,7 +723,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -744,7 +744,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -761,7 +761,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -795,7 +795,7 @@ export Poison; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -816,7 +816,7 @@ export Poison; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -833,7 +833,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -855,7 +855,7 @@ export Poison; // CHECK:STDOUT: %indirect_c.var_patt: %pattern_type = var_pattern %indirect_c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.ad5: ref %empty_tuple.type = class_element_access file.%indirect_c.var, element0 [concrete] +// CHECK:STDOUT: %.f13: ref %empty_tuple.type = class_element_access file.%indirect_c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -878,7 +878,7 @@ export Poison; // CHECK:STDOUT: %indirect_c.patt: %pattern_type = ref_binding_pattern indirect_c [concrete = constants.%indirect_c.patt] // CHECK:STDOUT: %indirect_c.var_patt: %pattern_type = var_pattern %indirect_c.patt [concrete = constants.%indirect_c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %indirect_c.var: ref %C = var %indirect_c.var_patt [concrete] +// CHECK:STDOUT: %indirect_c.var: ref %C = var_storage %indirect_c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %indirect_c: ref %C = wrapper_binding indirect_c, %indirect_c.var [concrete = %indirect_c.var] // CHECK:STDOUT: } @@ -895,7 +895,7 @@ export Poison; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_28.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_29.1: %struct_type.x = struct_literal (%.loc6_28.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_29.2: ref %empty_tuple.type = class_element_access file.%indirect_c.var, element0 [concrete = constants.%.ad5] +// CHECK:STDOUT: %.loc6_29.2: ref %empty_tuple.type = class_element_access file.%indirect_c.var, element0 [concrete = constants.%.f13] // CHECK:STDOUT: %.loc6_28.2: init %empty_tuple.type to %.loc6_29.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_29.3: init %empty_tuple.type = converted %.loc6_28.1, %.loc6_28.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_29.4: init %empty_tuple.type to %.loc6_29.2 = in_place_init %.loc6_29.3 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/packages/export_mixed.carbon b/toolchain/check/testdata/packages/export_mixed.carbon index bbc3b51d9c65..b032faf309eb 100644 --- a/toolchain/check/testdata/packages/export_mixed.carbon +++ b/toolchain/check/testdata/packages/export_mixed.carbon @@ -269,7 +269,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -290,7 +290,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -307,7 +307,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -329,7 +329,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -350,7 +350,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -367,7 +367,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -389,7 +389,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -410,7 +410,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -427,7 +427,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -461,7 +461,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %d.patt: = ref_binding_pattern d [concrete = ] // CHECK:STDOUT: %d.var_patt: = var_pattern %d.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref = var %d.var_patt [concrete = ] +// CHECK:STDOUT: %d.var: ref = var_storage %d.var_patt [concrete = ] // CHECK:STDOUT: %D.ref: = name_ref D, [concrete = ] // CHECK:STDOUT: %d: = wrapper_binding d, [concrete = ] // CHECK:STDOUT: } @@ -486,7 +486,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -507,7 +507,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -524,7 +524,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -546,7 +546,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %D: type = class_type @D [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -555,7 +555,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %d.patt: %pattern_type.d8d = ref_binding_pattern d [concrete] // CHECK:STDOUT: %d.var_patt: %pattern_type.d8d = var_pattern %d.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.15f: ref %empty_tuple.type = class_element_access file.%d.var, element0 [concrete] +// CHECK:STDOUT: %.2e1: ref %empty_tuple.type = class_element_access file.%d.var, element0 [concrete] // CHECK:STDOUT: %D.val: %D = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -582,14 +582,14 @@ var d: D = {.y = ()}; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.d8d = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.d8d = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %D = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %D = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %D.ref: type = name_ref D, imports.%Main.D [concrete = constants.%D] // CHECK:STDOUT: %d: ref %D = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } @@ -614,7 +614,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc8_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_20.1: %struct_type.x = struct_literal (%.loc8_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc8_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc8_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc8_19.2: init %empty_tuple.type to %.loc8_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_20.3: init %empty_tuple.type = converted %.loc8_19.1, %.loc8_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_20.4: init %empty_tuple.type to %.loc8_20.2 = in_place_init %.loc8_20.3 [concrete = constants.%empty_tuple] @@ -623,7 +623,7 @@ var d: D = {.y = ()}; // CHECK:STDOUT: assign file.%c.var, %.loc8_1 // CHECK:STDOUT: %.loc9_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_20.1: %struct_type.y = struct_literal (%.loc9_19.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc9_20.2: ref %empty_tuple.type = class_element_access file.%d.var, element0 [concrete = constants.%.15f] +// CHECK:STDOUT: %.loc9_20.2: ref %empty_tuple.type = class_element_access file.%d.var, element0 [concrete = constants.%.2e1] // CHECK:STDOUT: %.loc9_19.2: init %empty_tuple.type to %.loc9_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_20.3: init %empty_tuple.type = converted %.loc9_19.1, %.loc9_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc9_20.4: init %empty_tuple.type to %.loc9_20.2 = in_place_init %.loc9_20.3 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/packages/export_name.carbon b/toolchain/check/testdata/packages/export_name.carbon index c247e3f31450..c1f111ef482a 100644 --- a/toolchain/check/testdata/packages/export_name.carbon +++ b/toolchain/check/testdata/packages/export_name.carbon @@ -394,7 +394,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %NSC: type = class_type @NSC [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -403,7 +403,7 @@ private export C; // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.e7e: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] // CHECK:STDOUT: %NSC.val: %NSC = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -434,14 +434,14 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc.var: ref %NSC = var %nsc.var_patt [concrete] +// CHECK:STDOUT: %nsc.var: ref %NSC = var_storage %nsc.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %NSC.ref [concrete = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] @@ -469,7 +469,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -478,7 +478,7 @@ private export C; // CHECK:STDOUT: assign file.%c.var, %.loc6_1 // CHECK:STDOUT: %.loc7_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.1: %struct_type.y = struct_literal (%.loc7_26.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc7_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.e7e] +// CHECK:STDOUT: %.loc7_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc7_26.2: init %empty_tuple.type to %.loc7_27.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.3: init %empty_tuple.type = converted %.loc7_26.1, %.loc7_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.4: init %empty_tuple.type to %.loc7_27.2 = in_place_init %.loc7_27.3 [concrete = constants.%empty_tuple] @@ -500,7 +500,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %NSC: type = class_type @NSC [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -509,7 +509,7 @@ private export C; // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.e7e: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] // CHECK:STDOUT: %NSC.val: %NSC = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -541,14 +541,14 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc.var: ref %NSC = var %nsc.var_patt [concrete] +// CHECK:STDOUT: %nsc.var: ref %NSC = var_storage %nsc.var_patt [concrete] // CHECK:STDOUT: %.loc5: type = splice_block %NSC.ref [concrete = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] @@ -576,7 +576,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc4_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.1: %struct_type.x = struct_literal (%.loc4_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc4_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc4_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc4_19.2: init %empty_tuple.type to %.loc4_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.3: init %empty_tuple.type = converted %.loc4_19.1, %.loc4_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.4: init %empty_tuple.type to %.loc4_20.2 = in_place_init %.loc4_20.3 [concrete = constants.%empty_tuple] @@ -585,7 +585,7 @@ private export C; // CHECK:STDOUT: assign file.%c.var, %.loc4_1 // CHECK:STDOUT: %.loc5_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_27.1: %struct_type.y = struct_literal (%.loc5_26.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc5_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.e7e] +// CHECK:STDOUT: %.loc5_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc5_26.2: init %empty_tuple.type to %.loc5_27.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_27.3: init %empty_tuple.type = converted %.loc5_26.1, %.loc5_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_27.4: init %empty_tuple.type to %.loc5_27.2 = in_place_init %.loc5_27.3 [concrete = constants.%empty_tuple] @@ -607,7 +607,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %NSC: type = class_type @NSC [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -616,7 +616,7 @@ private export C; // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.e7e: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] // CHECK:STDOUT: %NSC.val: %NSC = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -647,14 +647,14 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc.var: ref %NSC = var %nsc.var_patt [concrete] +// CHECK:STDOUT: %nsc.var: ref %NSC = var_storage %nsc.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %NSC.ref [concrete = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] @@ -682,7 +682,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] @@ -691,7 +691,7 @@ private export C; // CHECK:STDOUT: assign file.%c.var, %.loc6_1 // CHECK:STDOUT: %.loc7_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.1: %struct_type.y = struct_literal (%.loc7_26.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc7_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.e7e] +// CHECK:STDOUT: %.loc7_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc7_26.2: init %empty_tuple.type to %.loc7_27.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.3: init %empty_tuple.type = converted %.loc7_26.1, %.loc7_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_27.4: init %empty_tuple.type to %.loc7_27.2 = in_place_init %.loc7_27.3 [concrete = constants.%empty_tuple] @@ -792,7 +792,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %NSC: type = class_type @NSC [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -801,7 +801,7 @@ private export C; // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.e7e: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] // CHECK:STDOUT: %NSC.val: %NSC = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -832,14 +832,14 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc.var: ref %NSC = var %nsc.var_patt [concrete] +// CHECK:STDOUT: %nsc.var: ref %NSC = var_storage %nsc.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %NSC.ref [concrete = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] @@ -867,7 +867,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -876,7 +876,7 @@ private export C; // CHECK:STDOUT: assign file.%c.var, %.loc7_1 // CHECK:STDOUT: %.loc8_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.1: %struct_type.y = struct_literal (%.loc8_26.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc8_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.e7e] +// CHECK:STDOUT: %.loc8_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc8_26.2: init %empty_tuple.type to %.loc8_27.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.3: init %empty_tuple.type = converted %.loc8_26.1, %.loc8_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.4: init %empty_tuple.type to %.loc8_27.2 = in_place_init %.loc8_27.3 [concrete = constants.%empty_tuple] @@ -898,7 +898,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct.948: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: %NSC: type = class_type @NSC [concrete] // CHECK:STDOUT: %struct_type.y: type = struct_type {.y: %empty_tuple.type} [concrete] @@ -907,7 +907,7 @@ private export C; // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete] // CHECK:STDOUT: %struct.8ce: %struct_type.y = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.e7e: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete] // CHECK:STDOUT: %NSC.val: %NSC = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -938,14 +938,14 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type.98b = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.98b = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %nsc.patt: %pattern_type.533 = ref_binding_pattern nsc [concrete = constants.%nsc.patt] // CHECK:STDOUT: %nsc.var_patt: %pattern_type.533 = var_pattern %nsc.patt [concrete = constants.%nsc.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %nsc.var: ref %NSC = var %nsc.var_patt [concrete] +// CHECK:STDOUT: %nsc.var: ref %NSC = var_storage %nsc.var_patt [concrete] // CHECK:STDOUT: %.loc8: type = splice_block %NSC.ref [concrete = constants.%NSC] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS [concrete = imports.%NS] // CHECK:STDOUT: %NSC.ref: type = name_ref NSC, imports.%Main.NSC [concrete = constants.%NSC] @@ -973,7 +973,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc7_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.1: %struct_type.x = struct_literal (%.loc7_19.1) [concrete = constants.%struct.948] -// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc7_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc7_19.2: init %empty_tuple.type to %.loc7_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.3: init %empty_tuple.type = converted %.loc7_19.1, %.loc7_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_20.4: init %empty_tuple.type to %.loc7_20.2 = in_place_init %.loc7_20.3 [concrete = constants.%empty_tuple] @@ -982,7 +982,7 @@ private export C; // CHECK:STDOUT: assign file.%c.var, %.loc7_1 // CHECK:STDOUT: %.loc8_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.1: %struct_type.y = struct_literal (%.loc8_26.1) [concrete = constants.%struct.8ce] -// CHECK:STDOUT: %.loc8_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.e7e] +// CHECK:STDOUT: %.loc8_27.2: ref %empty_tuple.type = class_element_access file.%nsc.var, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc8_26.2: init %empty_tuple.type to %.loc8_27.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.3: init %empty_tuple.type = converted %.loc8_26.1, %.loc8_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_27.4: init %empty_tuple.type to %.loc8_27.2 = in_place_init %.loc8_27.3 [concrete = constants.%empty_tuple] @@ -1059,7 +1059,7 @@ private export C; // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete] // CHECK:STDOUT: %struct: %struct_type.x = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.eda: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.1a2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %C.val: %C = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -1080,7 +1080,7 @@ private export C; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] // CHECK:STDOUT: %c: ref %C = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -1097,7 +1097,7 @@ private export C; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc6_19.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.1: %struct_type.x = struct_literal (%.loc6_19.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.eda] +// CHECK:STDOUT: %.loc6_20.2: ref %empty_tuple.type = class_element_access file.%c.var, element0 [concrete = constants.%.1a2] // CHECK:STDOUT: %.loc6_19.2: init %empty_tuple.type to %.loc6_20.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.3: init %empty_tuple.type = converted %.loc6_19.1, %.loc6_19.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_20.4: init %empty_tuple.type to %.loc6_20.2 = in_place_init %.loc6_20.3 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 23e97996131c..e4eda7d83fde 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -109,7 +109,7 @@ import library "var"; // CHECK:STDOUT: %Foo.patt: %pattern_type.6b6 = ref_binding_pattern Foo [concrete = constants.%Foo.patt] // CHECK:STDOUT: %Foo.var_patt: %pattern_type.6b6 = var_pattern %Foo.patt [concrete = constants.%Foo.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %Foo.var: ref %i32 = var %Foo.var_patt [concrete] +// CHECK:STDOUT: %Foo.var: ref %i32 = var_storage %Foo.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %Foo: ref %i32 = wrapper_binding Foo, %Foo.var [concrete = %Foo.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 9a94e0798664..0569f97c5e24 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -71,14 +71,14 @@ var d: i32 = d_ref; // CHECK:STDOUT: %a_ref.patt: = ref_binding_pattern a_ref [concrete = ] // CHECK:STDOUT: %a_ref.var_patt: = var_pattern %a_ref.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ref.var: ref = var %a_ref.var_patt [concrete = ] +// CHECK:STDOUT: %a_ref.var: ref = var_storage %a_ref.var_patt [concrete = ] // CHECK:STDOUT: %x.ref.loc8: = name_ref x, [concrete = ] // CHECK:STDOUT: %a_ref: = wrapper_binding a_ref, [concrete = ] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b_ref.patt: = ref_binding_pattern b_ref [concrete = ] // CHECK:STDOUT: %b_ref.var_patt: = var_pattern %b_ref.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %b_ref.var: ref = var %b_ref.var_patt [concrete = ] +// CHECK:STDOUT: %b_ref.var: ref = var_storage %b_ref.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %x.ref.loc13: = name_ref x, [concrete = ] // CHECK:STDOUT: %.loc13: = struct_literal (%x.ref.loc13) [concrete = ] @@ -88,7 +88,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: %c_ref.patt: = ref_binding_pattern c_ref [concrete = ] // CHECK:STDOUT: %c_ref.var_patt: = var_pattern %c_ref.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %c_ref.var: ref = var %c_ref.var_patt [concrete = ] +// CHECK:STDOUT: %c_ref.var: ref = var_storage %c_ref.var_patt [concrete = ] // CHECK:STDOUT: %.2: = splice_block [concrete = ] { // CHECK:STDOUT: %x.ref.loc18: = name_ref x, [concrete = ] // CHECK:STDOUT: %.loc18: = tuple_literal (%x.ref.loc18) [concrete = ] @@ -98,7 +98,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: %d_ref.patt: = ref_binding_pattern d_ref [concrete = ] // CHECK:STDOUT: %d_ref.var_patt: = var_pattern %d_ref.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %d_ref.var: ref = var %d_ref.var_patt [concrete = ] +// CHECK:STDOUT: %d_ref.var: ref = var_storage %d_ref.var_patt [concrete = ] // CHECK:STDOUT: %.loc23: type = splice_block %ptr [concrete = ] { // CHECK:STDOUT: %x.ref.loc23: = name_ref x, [concrete = ] // CHECK:STDOUT: %ptr: type = ptr_type [concrete = ] @@ -165,28 +165,28 @@ var d: i32 = d_ref; // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %i32 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc8: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %i32 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc9: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index bf3c3f9e7629..705dcdde371d 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -43,7 +43,7 @@ var a: () = A(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc8_9.1: type = splice_block %.loc8_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc8_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_9.3: type = converted %.loc8_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/packages/implicit_imports_entities.carbon b/toolchain/check/testdata/packages/implicit_imports_entities.carbon index cd5aa465812a..d4c0f020c3cd 100644 --- a/toolchain/check/testdata/packages/implicit_imports_entities.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_entities.carbon @@ -363,14 +363,14 @@ import Other library "o1"; // CHECK:STDOUT: %c1.patt: %pattern_type.0b2 = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type.0b2 = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C1 = var %c1.var_patt [concrete] +// CHECK:STDOUT: %c1.var: ref %C1 = var_storage %c1.var_patt [concrete] // CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [concrete = constants.%C1] // CHECK:STDOUT: %c1: ref %C1 = wrapper_binding c1, %c1.var [concrete = %c1.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c2.patt: %pattern_type.5ca = ref_binding_pattern c2 [concrete = constants.%c2.patt] // CHECK:STDOUT: %c2.var_patt: %pattern_type.5ca = var_pattern %c2.patt [concrete = constants.%c2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c2.var: ref %C2 = var %c2.var_patt [concrete] +// CHECK:STDOUT: %c2.var: ref %C2 = var_storage %c2.var_patt [concrete] // CHECK:STDOUT: %C2.ref: type = name_ref C2, imports.%Main.C2 [concrete = constants.%C2] // CHECK:STDOUT: %c2: ref %C2 = wrapper_binding c2, %c2.var [concrete = %c2.var] // CHECK:STDOUT: } @@ -445,7 +445,7 @@ import Other library "o1"; // CHECK:STDOUT: %c1.patt: %pattern_type = ref_binding_pattern c1 [concrete = constants.%c1.patt] // CHECK:STDOUT: %c1.var_patt: %pattern_type = var_pattern %c1.patt [concrete = constants.%c1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c1.var: ref %C1 = var %c1.var_patt [concrete] +// CHECK:STDOUT: %c1.var: ref %C1 = var_storage %c1.var_patt [concrete] // CHECK:STDOUT: %C1.ref: type = name_ref C1, imports.%Main.C1 [concrete = constants.%C1] // CHECK:STDOUT: %c1: ref %C1 = wrapper_binding c1, %c1.var [concrete = %c1.var] // CHECK:STDOUT: } @@ -517,7 +517,7 @@ import Other library "o1"; // CHECK:STDOUT: %c.patt: %pattern_type = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc4: type = splice_block %C.ref [concrete = constants.%C] { // CHECK:STDOUT: %NS.ref: = name_ref NS, imports.%NS.7ae [concrete = imports.%NS.7ae] // CHECK:STDOUT: %C.ref: type = name_ref C, imports.%Main.C [concrete = constants.%C] @@ -602,7 +602,7 @@ import Other library "o1"; // CHECK:STDOUT: %o1.patt: %pattern_type.1e6 = ref_binding_pattern o1 [concrete = constants.%o1.patt] // CHECK:STDOUT: %o1.var_patt: %pattern_type.1e6 = var_pattern %o1.patt [concrete = constants.%o1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %o1.var: ref %O1 = var %o1.var_patt [concrete] +// CHECK:STDOUT: %o1.var: ref %O1 = var_storage %o1.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %O1.ref [concrete = constants.%O1] { // CHECK:STDOUT: %Other.ref.loc6: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [concrete = constants.%O1] @@ -612,7 +612,7 @@ import Other library "o1"; // CHECK:STDOUT: %o2.patt: %pattern_type.327 = ref_binding_pattern o2 [concrete = constants.%o2.patt] // CHECK:STDOUT: %o2.var_patt: %pattern_type.327 = var_pattern %o2.patt [concrete = constants.%o2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %o2.var: ref %O2 = var %o2.var_patt [concrete] +// CHECK:STDOUT: %o2.var: ref %O2 = var_storage %o2.var_patt [concrete] // CHECK:STDOUT: %.loc7: type = splice_block %O2.ref [concrete = constants.%O2] { // CHECK:STDOUT: %Other.ref.loc7: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O2.ref: type = name_ref O2, imports.%Other.O2 [concrete = constants.%O2] @@ -697,7 +697,7 @@ import Other library "o1"; // CHECK:STDOUT: %o1.patt: %pattern_type = ref_binding_pattern o1 [concrete = constants.%o1.patt] // CHECK:STDOUT: %o1.var_patt: %pattern_type = var_pattern %o1.patt [concrete = constants.%o1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %o1.var: ref %O1 = var %o1.var_patt [concrete] +// CHECK:STDOUT: %o1.var: ref %O1 = var_storage %o1.var_patt [concrete] // CHECK:STDOUT: %.loc6: type = splice_block %O1.ref [concrete = constants.%O1] { // CHECK:STDOUT: %Other.ref: = name_ref Other, imports.%Other [concrete = imports.%Other] // CHECK:STDOUT: %O1.ref: type = name_ref O1, imports.%Other.O1 [concrete = constants.%O1] diff --git a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon index 3cb698f209d5..0eff6eb589a2 100644 --- a/toolchain/check/testdata/packages/implicit_imports_prelude.carbon +++ b/toolchain/check/testdata/packages/implicit_imports_prelude.carbon @@ -78,7 +78,7 @@ var b: i32 = a; // CHECK:STDOUT: %a.patt: %pattern_type.6b6 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.6b6 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %i32 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a: ref %i32 = wrapper_binding a, %a.var [concrete = %a.var] // CHECK:STDOUT: } @@ -130,7 +130,7 @@ var b: i32 = a; // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } // CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/parts/int, Int, loaded [concrete = constants.%Int.generic] -// CHECK:STDOUT: %a.var: ref %i32 = var constants.%a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %i32 = var_storage constants.%a.var_patt [concrete] // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.5e0)] // CHECK:STDOUT: %Copy.impl_witness_table.367 = impl_witness_table (%Core.import_ref.cd6), @Int.as.Copy.impl [concrete] @@ -149,7 +149,7 @@ var b: i32 = a; // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index f2e6fd92c956..6263307dc799 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -88,7 +88,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -98,7 +98,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %package_a.patt: %pattern_type = ref_binding_pattern package_a [concrete = constants.%package_a.patt] // CHECK:STDOUT: %package_a.var_patt: %pattern_type = var_pattern %package_a.patt [concrete = constants.%package_a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_a.var: ref %empty_tuple.type = var %package_a.var_patt [concrete] +// CHECK:STDOUT: %package_a.var: ref %empty_tuple.type = var_storage %package_a.var_patt [concrete] // CHECK:STDOUT: %.loc6_17.1: type = splice_block %.loc6_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_17.3: type = converted %.loc6_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -165,7 +165,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %b.patt: %pattern_type = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %empty_tuple.type = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -175,7 +175,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: %package_b.patt: %pattern_type = ref_binding_pattern package_b [concrete = constants.%package_b.patt] // CHECK:STDOUT: %package_b.var_patt: %pattern_type = var_pattern %package_b.patt [concrete = constants.%package_b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %package_b.var: ref %empty_tuple.type = var %package_b.var_patt [concrete] +// CHECK:STDOUT: %package_b.var: ref %empty_tuple.type = var_storage %package_b.var_patt [concrete] // CHECK:STDOUT: %.loc8_17.1: type = splice_block %.loc8_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc8_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_17.3: type = converted %.loc8_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/packages/missing_prelude.carbon b/toolchain/check/testdata/packages/missing_prelude.carbon index 0f7895768128..2d8045be547e 100644 --- a/toolchain/check/testdata/packages/missing_prelude.carbon +++ b/toolchain/check/testdata/packages/missing_prelude.carbon @@ -135,7 +135,7 @@ let n: type = i32; // CHECK:STDOUT: %n.patt: = ref_binding_pattern n [concrete = ] // CHECK:STDOUT: %n.var_patt: = var_pattern %n.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref = var %n.var_patt [concrete = ] +// CHECK:STDOUT: %n.var: ref = var_storage %n.var_patt [concrete = ] // CHECK:STDOUT: %.loc8: type = type_literal [concrete = ] // CHECK:STDOUT: %n: = wrapper_binding n, [concrete = ] // CHECK:STDOUT: } @@ -171,7 +171,7 @@ let n: type = i32; // CHECK:STDOUT: %n.patt: = ref_binding_pattern n [concrete = ] // CHECK:STDOUT: %n.var_patt: = var_pattern %n.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref = var %n.var_patt [concrete = ] +// CHECK:STDOUT: %n.var: ref = var_storage %n.var_patt [concrete = ] // CHECK:STDOUT: %.loc10: type = type_literal [concrete = ] // CHECK:STDOUT: %n: = wrapper_binding n, [concrete = ] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/raw_core.carbon b/toolchain/check/testdata/packages/raw_core.carbon index c343c8704b05..685347c156c8 100644 --- a/toolchain/check/testdata/packages/raw_core.carbon +++ b/toolchain/check/testdata/packages/raw_core.carbon @@ -224,7 +224,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: %bound_method.0fb: = bound_method %int_0.5c6, %Core.IntLiteral.as.As.impl.Convert.specific_fn [concrete] // CHECK:STDOUT: %int_0.3c0: %i32 = int_value 0 [concrete] // CHECK:STDOUT: %struct: %struct_type.n = struct_value (%int_0.3c0) [concrete] -// CHECK:STDOUT: %.37f: ref %i32 = class_element_access file.%c.var, element0 [concrete] +// CHECK:STDOUT: %.e0c: ref %i32 = class_element_access file.%c.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -269,7 +269,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: %c.patt: %pattern_type.8dc = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.8dc = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %Core = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %Core = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %Core.ref: type = name_ref r#Core, %Core.decl [concrete = constants.%Core] // CHECK:STDOUT: %c: ref %Core = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -304,7 +304,7 @@ var c: r#Core = {.n = 0 as Core.Int(32)}; // CHECK:STDOUT: %specific_fn.loc6_25.2: = specific_function %impl.elem0.loc6_25.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_25.4: = bound_method %.loc6_25.2, %specific_fn.loc6_25.2 [concrete = constants.%bound_method.28e] // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc6_25.4(%.loc6_25.2) [concrete = constants.%int_0.3c0] -// CHECK:STDOUT: %.loc6_40.2: ref %i32 = class_element_access file.%c.var, element0 [concrete = constants.%.37f] +// CHECK:STDOUT: %.loc6_40.2: ref %i32 = class_element_access file.%c.var, element0 [concrete = constants.%.e0c] // CHECK:STDOUT: %.loc6_40.3: init %i32 to %.loc6_40.2 = in_place_init %Int.as.Copy.impl.Op.call [concrete = constants.%int_0.3c0] // CHECK:STDOUT: %.loc6_40.4: init %Core to file.%c.var = class_init (%.loc6_40.3) [concrete = constants.%Core.val] // CHECK:STDOUT: %.loc6_1: init %Core = converted %.loc6_40.1, %.loc6_40.4 [concrete = constants.%Core.val] diff --git a/toolchain/check/testdata/patterns/underscore.carbon b/toolchain/check/testdata/patterns/underscore.carbon index c294f57e1315..6852116fded8 100644 --- a/toolchain/check/testdata/patterns/underscore.carbon +++ b/toolchain/check/testdata/patterns/underscore.carbon @@ -154,7 +154,7 @@ fn F() -> {} { // CHECK:STDOUT: %_.patt.loc5: %pattern_type.a96 = ref_binding_pattern _ [concrete = constants.%_.patt.7e8] // CHECK:STDOUT: %_.var_patt: %pattern_type.a96 = var_pattern %_.patt.loc5 [concrete = constants.%_.var_patt.d5b] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.var: ref %empty_struct_type = var %_.var_patt +// CHECK:STDOUT: %_.var: ref %empty_struct_type = var_storage %_.var_patt // CHECK:STDOUT: %.loc5_9.1: type = splice_block %.loc5_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc5_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] @@ -180,7 +180,7 @@ fn F() -> {} { // CHECK:STDOUT: %_.patt.loc9: %pattern_type.a96 = ref_binding_pattern _ [concrete = constants.%_.patt.3b4] // CHECK:STDOUT: %_.var_patt: %pattern_type.a96 = var_pattern %_.patt.loc9 [concrete = constants.%_.var_patt.f52] // CHECK:STDOUT: } -// CHECK:STDOUT: %_.var: ref %empty_struct_type = var %_.var_patt +// CHECK:STDOUT: %_.var: ref %empty_struct_type = var_storage %_.var_patt // CHECK:STDOUT: %.loc9_16.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_16.2: init %empty_struct_type = struct_init () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc9_3: init %empty_struct_type = converted %.loc9_16.1, %.loc9_16.2 [concrete = constants.%empty_struct] diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 04b84e6df7cc..9365627e44e7 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -110,7 +110,7 @@ fn F() -> i32 { // CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc16_3.1: = bound_method %int_0, %impl.elem0.loc16 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index 3d69d759cc6c..f4bdeac072cc 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -150,7 +150,7 @@ fn F() { // CHECK:STDOUT: %s.patt: %pattern_type.20e3 = ref_binding_pattern s [concrete = constants.%s.patt] // CHECK:STDOUT: %s.var_patt: %pattern_type.20e3 = var_pattern %s.patt [concrete = constants.%s.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref %struct_type.a.b.b4c = var %s.var_patt +// CHECK:STDOUT: %s.var: ref %struct_type.a.b.b4c = var_storage %s.var_patt // CHECK:STDOUT: %int_1.loc16: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc16: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc16_46.1: %struct_type.a.b.cfd = struct_literal (%int_1.loc16, %int_2.loc16) [concrete = constants.%struct.4aa] @@ -183,7 +183,7 @@ fn F() { // CHECK:STDOUT: %p.patt: %pattern_type.88d = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.88d = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.939 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.939 = var_storage %p.var_patt // CHECK:STDOUT: %s.ref.loc18: ref %struct_type.a.b.b4c = name_ref s, %s // CHECK:STDOUT: %addr.loc18: %ptr.939 = addr_of %s.ref.loc18 // CHECK:STDOUT: %impl.elem0.loc18: %.bc9 = impl_witness_access constants.%Copy.impl_witness.209, element0 [concrete = constants.%ptr.as.Copy.impl.Op.287] @@ -203,7 +203,7 @@ fn F() { // CHECK:STDOUT: %q.patt: %pattern_type.f00 = ref_binding_pattern q [concrete = constants.%q.patt] // CHECK:STDOUT: %q.var_patt: %pattern_type.f00 = var_pattern %q.patt [concrete = constants.%q.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %q.var: ref %ptr.d08 = var %q.var_patt +// CHECK:STDOUT: %q.var: ref %ptr.d08 = var_storage %q.var_patt // CHECK:STDOUT: %s.ref.loc19: ref %struct_type.a.b.b4c = name_ref s, %s // CHECK:STDOUT: %.loc19_26: ref %i32 = struct_access %s.ref.loc19, element0 // CHECK:STDOUT: %addr.loc19: %ptr.d08 = addr_of %.loc19_26 @@ -222,7 +222,7 @@ fn F() { // CHECK:STDOUT: %r.patt: %pattern_type.f00 = ref_binding_pattern r [concrete = constants.%r.patt] // CHECK:STDOUT: %r.var_patt: %pattern_type.f00 = var_pattern %r.patt [concrete = constants.%r.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %r.var: ref %ptr.d08 = var %r.var_patt +// CHECK:STDOUT: %r.var: ref %ptr.d08 = var_storage %r.var_patt // CHECK:STDOUT: %s.ref.loc20: ref %struct_type.a.b.b4c = name_ref s, %s // CHECK:STDOUT: %.loc20_26: ref %i32 = struct_access %s.ref.loc20, element1 // CHECK:STDOUT: %addr.loc20: %ptr.d08 = addr_of %.loc20_26 @@ -241,7 +241,7 @@ fn F() { // CHECK:STDOUT: %t.patt: %pattern_type.394 = ref_binding_pattern t [concrete = constants.%t.patt] // CHECK:STDOUT: %t.var_patt: %pattern_type.394 = var_pattern %t.patt [concrete = constants.%t.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t.var: ref %tuple.type.e55 = var %t.var_patt +// CHECK:STDOUT: %t.var: ref %tuple.type.e55 = var_storage %t.var_patt // CHECK:STDOUT: %int_1.loc22: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %int_2.loc22: Core.IntLiteral = int_value 2 [concrete = constants.%int_2.ecc] // CHECK:STDOUT: %.loc22_28.1: %tuple.type.f94 = tuple_literal (%int_1.loc22, %int_2.loc22) [concrete = constants.%tuple.ad8] @@ -275,7 +275,7 @@ fn F() { // CHECK:STDOUT: %t0.patt: %pattern_type.f00 = ref_binding_pattern t0 [concrete = constants.%t0.patt] // CHECK:STDOUT: %t0.var_patt: %pattern_type.f00 = var_pattern %t0.patt [concrete = constants.%t0.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t0.var: ref %ptr.d08 = var %t0.var_patt +// CHECK:STDOUT: %t0.var: ref %ptr.d08 = var_storage %t0.var_patt // CHECK:STDOUT: %t.ref.loc23: ref %tuple.type.e55 = name_ref t, %t // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] // CHECK:STDOUT: %tuple.elem0.loc23: ref %i32 = tuple_access %t.ref.loc23, element0 @@ -295,7 +295,7 @@ fn F() { // CHECK:STDOUT: %t1.patt: %pattern_type.f00 = ref_binding_pattern t1 [concrete = constants.%t1.patt] // CHECK:STDOUT: %t1.var_patt: %pattern_type.f00 = var_pattern %t1.patt [concrete = constants.%t1.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %t1.var: ref %ptr.d08 = var %t1.var_patt +// CHECK:STDOUT: %t1.var: ref %ptr.d08 = var_storage %t1.var_patt // CHECK:STDOUT: %t.ref.loc24: ref %tuple.type.e55 = name_ref t, %t // CHECK:STDOUT: %int_1.loc24: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %tuple.elem1.loc24: ref %i32 = tuple_access %t.ref.loc24, element1 diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 59c04879cb17..7a8cb474e662 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -129,7 +129,7 @@ fn F() -> i32 { // CHECK:STDOUT: %n.patt: %pattern_type.6b6 = ref_binding_pattern n [concrete = constants.%n.patt] // CHECK:STDOUT: %n.var_patt: %pattern_type.6b6 = var_pattern %n.patt [concrete = constants.%n.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %n.var: ref %i32 = var %n.var_patt +// CHECK:STDOUT: %n.var: ref %i32 = var_storage %n.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc16: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc16_3.1: = bound_method %int_0, %impl.elem0.loc16 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -144,7 +144,7 @@ fn F() -> i32 { // CHECK:STDOUT: %p.patt: %pattern_type.f00 = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type.f00 = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr.d08 = var %p.var_patt +// CHECK:STDOUT: %p.var: ref %ptr.d08 = var_storage %p.var_patt // CHECK:STDOUT: %n.ref: ref %i32 = name_ref n, %n // CHECK:STDOUT: %addr: %ptr.d08 = addr_of %n.ref // CHECK:STDOUT: %impl.elem0.loc17: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 16bca74d1259..11ad22b2d286 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -55,7 +55,7 @@ var p2: i32->foo; // CHECK:STDOUT: %p.patt: = ref_binding_pattern p [concrete = ] // CHECK:STDOUT: %p.var_patt: = var_pattern %p.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref = var %p.var_patt [concrete = ] +// CHECK:STDOUT: %p.var: ref = var_storage %p.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %i32.loc22: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc22: ref = deref %i32.loc22 [concrete = ] @@ -65,7 +65,7 @@ var p2: i32->foo; // CHECK:STDOUT: %p2.patt: = ref_binding_pattern p2 [concrete = ] // CHECK:STDOUT: %p2.var_patt: = var_pattern %p2.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %p2.var: ref = var %p2.var_patt [concrete = ] +// CHECK:STDOUT: %p2.var: ref = var_storage %p2.var_patt [concrete = ] // CHECK:STDOUT: %.2: = splice_block [concrete = ] { // CHECK:STDOUT: %i32.loc27: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc27: ref = deref %i32.loc27 [concrete = ] diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index 8dc629dcf6e1..65aebd47fe92 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -69,7 +69,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %.ac9: type = fn_type_with_self_type %Copy.WithSelf.Op.type.f9d, %Copy.facet [concrete] // CHECK:STDOUT: %ptr.as.Copy.impl.Op.bound: = bound_method %addr, %ptr.as.Copy.impl.Op.d1c [concrete] // CHECK:STDOUT: %ptr.as.Copy.impl.Op.specific_fn: = specific_function %ptr.as.Copy.impl.Op.d1c, @ptr.as.Copy.impl.Op(%i32) [concrete] -// CHECK:STDOUT: %bound_method.c35: = bound_method %addr, %ptr.as.Copy.impl.Op.specific_fn [concrete] +// CHECK:STDOUT: %bound_method.13f: = bound_method %addr, %ptr.as.Copy.impl.Op.specific_fn [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { @@ -100,14 +100,14 @@ var a: i32* = a_ref; // CHECK:STDOUT: %a_orig.patt: %pattern_type.6b6 = ref_binding_pattern a_orig [concrete = constants.%a_orig.patt] // CHECK:STDOUT: %a_orig.var_patt: %pattern_type.6b6 = var_pattern %a_orig.patt [concrete = constants.%a_orig.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_orig.var: ref %i32 = var %a_orig.var_patt [concrete] +// CHECK:STDOUT: %a_orig.var: ref %i32 = var_storage %a_orig.var_patt [concrete] // CHECK:STDOUT: %i32.loc4: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %a_orig: ref %i32 = wrapper_binding a_orig, %a_orig.var [concrete = %a_orig.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %a_ref.patt: %pattern_type.f00 = ref_binding_pattern a_ref [concrete = constants.%a_ref.patt] // CHECK:STDOUT: %a_ref.var_patt: %pattern_type.f00 = var_pattern %a_ref.patt [concrete = constants.%a_ref.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ref.var: ref %ptr.d08 = var %a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %ptr.d08 = var_storage %a_ref.var_patt [concrete] // CHECK:STDOUT: %.loc5: type = splice_block %ptr [concrete = constants.%ptr.d08] { // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32.loc5 [concrete = constants.%ptr.d08] @@ -130,7 +130,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %impl.elem0.loc5: %.ac9 = impl_witness_access constants.%Copy.impl_witness.ce1, element0 [concrete = constants.%ptr.as.Copy.impl.Op.d1c] // CHECK:STDOUT: %bound_method.loc5_19.1: = bound_method %addr, %impl.elem0.loc5 [concrete = constants.%ptr.as.Copy.impl.Op.bound] // CHECK:STDOUT: %specific_fn.loc5: = specific_function %impl.elem0.loc5, @ptr.as.Copy.impl.Op(constants.%i32) [concrete = constants.%ptr.as.Copy.impl.Op.specific_fn] -// CHECK:STDOUT: %bound_method.loc5_19.2: = bound_method %addr, %specific_fn.loc5 [concrete = constants.%bound_method.c35] +// CHECK:STDOUT: %bound_method.loc5_19.2: = bound_method %addr, %specific_fn.loc5 [concrete = constants.%bound_method.13f] // CHECK:STDOUT: %ptr.as.Copy.impl.Op.call: init %ptr.d08 = call %bound_method.loc5_19.2(%addr) [concrete = constants.%addr] // CHECK:STDOUT: assign file.%a_ref.var, %ptr.as.Copy.impl.Op.call // CHECK:STDOUT: return @@ -174,7 +174,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %Implicit.import_ref.499: @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op.type (%ptr.as.Copy.impl.Op.type.ff5) = import_ref Implicit//default, inst{{[0-9A-F]+}} [indirect], loaded [symbolic = @ptr.as.Copy.impl.%ptr.as.Copy.impl.Op (constants.%ptr.as.Copy.impl.Op.ce9)] // CHECK:STDOUT: %Copy.impl_witness_table.90e = impl_witness_table (%Implicit.import_ref.499), @ptr.as.Copy.impl [concrete] // CHECK:STDOUT: %Core.Int: %Int.type = import_ref Core//prelude/parts/int, Int, loaded [concrete = constants.%Int.generic] -// CHECK:STDOUT: %a_ref.var: ref %ptr.d08 = var constants.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %ptr.d08 = var_storage constants.%a_ref.var_patt [concrete] // CHECK:STDOUT: %Core.Copy: type = import_ref Core//prelude/parts/copy, Copy, loaded [concrete = constants.%Copy.type] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -192,7 +192,7 @@ var a: i32* = a_ref; // CHECK:STDOUT: %a.patt: %pattern_type.f00 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.f00 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %ptr.d08 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %ptr.d08 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4: type = splice_block %ptr [concrete = constants.%ptr.d08] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %ptr: type = ptr_type %i32 [concrete = constants.%ptr.d08] diff --git a/toolchain/check/testdata/primitives/type_literals.carbon b/toolchain/check/testdata/primitives/type_literals.carbon index 586ed3986b7e..2c6081dbbd2b 100644 --- a/toolchain/check/testdata/primitives/type_literals.carbon +++ b/toolchain/check/testdata/primitives/type_literals.carbon @@ -336,28 +336,28 @@ var test_str: str = (); // CHECK:STDOUT: %test_i8.patt: %pattern_type.0cf = ref_binding_pattern test_i8 [concrete = constants.%test_i8.patt] // CHECK:STDOUT: %test_i8.var_patt: %pattern_type.0cf = var_pattern %test_i8.patt [concrete = constants.%test_i8.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_i8.var: ref %i8 = var %test_i8.var_patt [concrete] +// CHECK:STDOUT: %test_i8.var: ref %i8 = var_storage %test_i8.var_patt [concrete] // CHECK:STDOUT: %i8: type = type_literal constants.%i8 [concrete = constants.%i8] // CHECK:STDOUT: %test_i8: ref %i8 = wrapper_binding test_i8, %test_i8.var [concrete = %test_i8.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i16.patt: %pattern_type.203 = ref_binding_pattern test_i16 [concrete = constants.%test_i16.patt] // CHECK:STDOUT: %test_i16.var_patt: %pattern_type.203 = var_pattern %test_i16.patt [concrete = constants.%test_i16.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_i16.var: ref %i16 = var %test_i16.var_patt [concrete] +// CHECK:STDOUT: %test_i16.var: ref %i16 = var_storage %test_i16.var_patt [concrete] // CHECK:STDOUT: %i16: type = type_literal constants.%i16 [concrete = constants.%i16] // CHECK:STDOUT: %test_i16: ref %i16 = wrapper_binding test_i16, %test_i16.var [concrete = %test_i16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i32.patt: %pattern_type.6b6 = ref_binding_pattern test_i32 [concrete = constants.%test_i32.patt] // CHECK:STDOUT: %test_i32.var_patt: %pattern_type.6b6 = var_pattern %test_i32.patt [concrete = constants.%test_i32.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_i32.var: ref %i32 = var %test_i32.var_patt [concrete] +// CHECK:STDOUT: %test_i32.var: ref %i32 = var_storage %test_i32.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %test_i32: ref %i32 = wrapper_binding test_i32, %test_i32.var [concrete = %test_i32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_i64.patt: %pattern_type.f57 = ref_binding_pattern test_i64 [concrete = constants.%test_i64.patt] // CHECK:STDOUT: %test_i64.var_patt: %pattern_type.f57 = var_pattern %test_i64.patt [concrete = constants.%test_i64.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_i64.var: ref %i64 = var %test_i64.var_patt [concrete] +// CHECK:STDOUT: %test_i64.var: ref %i64 = var_storage %test_i64.var_patt [concrete] // CHECK:STDOUT: %i64: type = type_literal constants.%i64 [concrete = constants.%i64] // CHECK:STDOUT: %test_i64: ref %i64 = wrapper_binding test_i64, %test_i64.var [concrete = %test_i64.var] // CHECK:STDOUT: } @@ -442,28 +442,28 @@ var test_str: str = (); // CHECK:STDOUT: %test_u8.patt: %pattern_type.186 = ref_binding_pattern test_u8 [concrete = constants.%test_u8.patt] // CHECK:STDOUT: %test_u8.var_patt: %pattern_type.186 = var_pattern %test_u8.patt [concrete = constants.%test_u8.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_u8.var: ref %u8 = var %test_u8.var_patt [concrete] +// CHECK:STDOUT: %test_u8.var: ref %u8 = var_storage %test_u8.var_patt [concrete] // CHECK:STDOUT: %u8: type = type_literal constants.%u8 [concrete = constants.%u8] // CHECK:STDOUT: %test_u8: ref %u8 = wrapper_binding test_u8, %test_u8.var [concrete = %test_u8.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u16.patt: %pattern_type.17c = ref_binding_pattern test_u16 [concrete = constants.%test_u16.patt] // CHECK:STDOUT: %test_u16.var_patt: %pattern_type.17c = var_pattern %test_u16.patt [concrete = constants.%test_u16.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_u16.var: ref %u16 = var %test_u16.var_patt [concrete] +// CHECK:STDOUT: %test_u16.var: ref %u16 = var_storage %test_u16.var_patt [concrete] // CHECK:STDOUT: %u16: type = type_literal constants.%u16 [concrete = constants.%u16] // CHECK:STDOUT: %test_u16: ref %u16 = wrapper_binding test_u16, %test_u16.var [concrete = %test_u16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u32.patt: %pattern_type.668 = ref_binding_pattern test_u32 [concrete = constants.%test_u32.patt] // CHECK:STDOUT: %test_u32.var_patt: %pattern_type.668 = var_pattern %test_u32.patt [concrete = constants.%test_u32.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_u32.var: ref %u32 = var %test_u32.var_patt [concrete] +// CHECK:STDOUT: %test_u32.var: ref %u32 = var_storage %test_u32.var_patt [concrete] // CHECK:STDOUT: %u32: type = type_literal constants.%u32 [concrete = constants.%u32] // CHECK:STDOUT: %test_u32: ref %u32 = wrapper_binding test_u32, %test_u32.var [concrete = %test_u32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_u64.patt: %pattern_type.b35 = ref_binding_pattern test_u64 [concrete = constants.%test_u64.patt] // CHECK:STDOUT: %test_u64.var_patt: %pattern_type.b35 = var_pattern %test_u64.patt [concrete = constants.%test_u64.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_u64.var: ref %u64 = var %test_u64.var_patt [concrete] +// CHECK:STDOUT: %test_u64.var: ref %u64 = var_storage %test_u64.var_patt [concrete] // CHECK:STDOUT: %u64: type = type_literal constants.%u64 [concrete = constants.%u64] // CHECK:STDOUT: %test_u64: ref %u64 = wrapper_binding test_u64, %test_u64.var [concrete = %test_u64.var] // CHECK:STDOUT: } @@ -548,28 +548,28 @@ var test_str: str = (); // CHECK:STDOUT: %test_f16.patt: %pattern_type.7cc = ref_binding_pattern test_f16 [concrete = constants.%test_f16.patt] // CHECK:STDOUT: %test_f16.var_patt: %pattern_type.7cc = var_pattern %test_f16.patt [concrete = constants.%test_f16.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_f16.var: ref %f16.907 = var %test_f16.var_patt [concrete] +// CHECK:STDOUT: %test_f16.var: ref %f16.907 = var_storage %test_f16.var_patt [concrete] // CHECK:STDOUT: %f16: type = type_literal constants.%f16.907 [concrete = constants.%f16.907] // CHECK:STDOUT: %test_f16: ref %f16.907 = wrapper_binding test_f16, %test_f16.var [concrete = %test_f16.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f32.patt: %pattern_type.240 = ref_binding_pattern test_f32 [concrete = constants.%test_f32.patt] // CHECK:STDOUT: %test_f32.var_patt: %pattern_type.240 = var_pattern %test_f32.patt [concrete = constants.%test_f32.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_f32.var: ref %f32.c73 = var %test_f32.var_patt [concrete] +// CHECK:STDOUT: %test_f32.var: ref %f32.c73 = var_storage %test_f32.var_patt [concrete] // CHECK:STDOUT: %f32: type = type_literal constants.%f32.c73 [concrete = constants.%f32.c73] // CHECK:STDOUT: %test_f32: ref %f32.c73 = wrapper_binding test_f32, %test_f32.var [concrete = %test_f32.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f64.patt: %pattern_type.fb7 = ref_binding_pattern test_f64 [concrete = constants.%test_f64.patt] // CHECK:STDOUT: %test_f64.var_patt: %pattern_type.fb7 = var_pattern %test_f64.patt [concrete = constants.%test_f64.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_f64.var: ref %f64.dc1 = var %test_f64.var_patt [concrete] +// CHECK:STDOUT: %test_f64.var: ref %f64.dc1 = var_storage %test_f64.var_patt [concrete] // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: %test_f64: ref %f64.dc1 = wrapper_binding test_f64, %test_f64.var [concrete = %test_f64.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %test_f128.patt: %pattern_type.847 = ref_binding_pattern test_f128 [concrete = constants.%test_f128.patt] // CHECK:STDOUT: %test_f128.var_patt: %pattern_type.847 = var_pattern %test_f128.patt [concrete = constants.%test_f128.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_f128.var: ref %f128.e39 = var %test_f128.var_patt [concrete] +// CHECK:STDOUT: %test_f128.var: ref %f128.e39 = var_storage %test_f128.var_patt [concrete] // CHECK:STDOUT: %f128: type = type_literal constants.%f128.e39 [concrete = constants.%f128.e39] // CHECK:STDOUT: %test_f128: ref %f128.e39 = wrapper_binding test_f128, %test_f128.var [concrete = %test_f128.var] // CHECK:STDOUT: } @@ -709,7 +709,7 @@ var test_str: str = (); // CHECK:STDOUT: %test_type.patt: %pattern_type.98f = ref_binding_pattern test_type [concrete = constants.%test_type.patt] // CHECK:STDOUT: %test_type.var_patt: %pattern_type.98f = var_pattern %test_type.patt [concrete = constants.%test_type.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %test_type.var: ref type = var %test_type.var_patt [concrete] +// CHECK:STDOUT: %test_type.var: ref type = var_storage %test_type.var_patt [concrete] // CHECK:STDOUT: %.loc5: type = type_literal type [concrete = type] // CHECK:STDOUT: %test_type: ref type = wrapper_binding test_type, %test_type.var [concrete = %test_type.var] // 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 6fbaef05cf48..81f83ccd4aec 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -161,7 +161,7 @@ fn G() -> C { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc16_12.1: = bound_method %int_0, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] diff --git a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon index 3626a6564e45..bb330da3984a 100644 --- a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon @@ -87,7 +87,7 @@ fn ForgotReturnType() { // CHECK:STDOUT: %v.patt: %pattern_type.cb1 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.cb1 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage %v.var_patt // CHECK:STDOUT: %.loc12_32.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_32.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_12: init %empty_tuple.type = converted %.loc12_32.1, %.loc12_32.2 [concrete = constants.%empty_tuple] @@ -143,7 +143,7 @@ fn ForgotReturnType() { // CHECK:STDOUT: %v.patt: %pattern_type.cb1 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.cb1 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage %v.var_patt // CHECK:STDOUT: %.loc12_32.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_32.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc12_12: init %empty_tuple.type = converted %.loc12_32.1, %.loc12_32.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index ff4b2d8551ab..0172e6c36a2b 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -146,7 +146,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0.loc17: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc17: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc17_14.1: = bound_method %int_0.loc17, %impl.elem0.loc17 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] @@ -161,7 +161,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt.859340.1] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt.82cc74.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %i32 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %i32 = var_storage %w.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc25: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc25_14.1: = bound_method %int_1, %impl.elem0.loc25 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] @@ -206,7 +206,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0.loc32: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc32: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc32_14.1: = bound_method %int_0.loc32, %impl.elem0.loc32 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] @@ -225,7 +225,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt.859340.2] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt.82cc74.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %i32 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %i32 = var_storage %w.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc41: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc41_16.1: = bound_method %int_1, %impl.elem0.loc41 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 7a844f19a516..bbac487050ce 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -108,7 +108,7 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.fb7 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.fb7 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %f64.dc1 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %f64.dc1 = var_storage %v.var_patt // CHECK:STDOUT: %float: Core.FloatLiteral = float_literal_value 0e-1 [concrete = constants.%float.1f7] // CHECK:STDOUT: %impl.elem0: %.2d7 = impl_witness_access constants.%ImplicitAs.impl_witness.43c, element0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.cf0] // CHECK:STDOUT: %bound_method.loc23_12.1: = bound_method %float, %impl.elem0 [concrete = constants.%Core.FloatLiteral.as.ImplicitAs.impl.Convert.bound] diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index 0be96d358efe..d53410f79206 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -66,7 +66,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: %x.patt: %pattern_type.98f = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.98f = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = type_literal type [concrete = type] // CHECK:STDOUT: %x: ref type = wrapper_binding x, %x.var [concrete = %x.var] // CHECK:STDOUT: %Six.decl: %Six.type = fn_decl @Six [concrete = constants.%Six] { diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 6629e6dcd6d2..1cf8f9681258 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -185,7 +185,7 @@ fn G() -> i32 { // CHECK:STDOUT: %result.patt: %pattern_type.6b6 = ref_binding_pattern result [concrete = constants.%result.patt.808] // CHECK:STDOUT: %result.var_patt: %pattern_type.6b6 = var_pattern %result.patt [concrete = constants.%result.var_patt.a44] // CHECK:STDOUT: } -// CHECK:STDOUT: %result.var: ref %i32 = var %result.var_patt +// CHECK:STDOUT: %result.var: ref %i32 = var_storage %result.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc26_12.1: = bound_method %int_0, %impl.elem0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index c4045f7e6bd1..9213d3459ef1 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -141,7 +141,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0.loc17: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc17: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc17_14.1: = bound_method %int_0.loc17, %impl.elem0.loc17 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] @@ -163,7 +163,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %i32 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %i32 = var_storage %w.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc20: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc20_14.1: = bound_method %int_1, %impl.elem0.loc20 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] @@ -208,7 +208,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %v.patt: %pattern_type.6b6 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.6b6 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %i32 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %i32 = var_storage %v.var_patt // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0.5c6] // CHECK:STDOUT: %impl.elem0.loc27: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc27_14.1: = bound_method %int_0, %impl.elem0.loc27 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.7b4] @@ -229,7 +229,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %w.patt: %pattern_type.6b6 = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type.6b6 = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %i32 = var %w.var_patt +// CHECK:STDOUT: %w.var: ref %i32 = var_storage %w.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %impl.elem0.loc30: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc30_12.1: = bound_method %int_1, %impl.elem0.loc30 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.094] diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 512bd80cadda..c960008e671c 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -36,7 +36,7 @@ var y: {} = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_struct_type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_struct_type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15_9.1: type = splice_block %.loc15_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc15_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc15_9.3: type = converted %.loc15_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] @@ -46,7 +46,7 @@ var y: {} = x; // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %empty_struct_type = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %empty_struct_type = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc16_9.1: type = splice_block %.loc16_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc16_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc16_9.3: type = converted %.loc16_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index cf0e16b779ee..9dc4095e42fc 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -52,7 +52,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %struct_type.a [concrete = constants.%struct_type.a] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index 3cd4442287ff..c0fc85500fae 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -39,7 +39,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.225 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.225 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc19_15: type = splice_block %struct_type.a [concrete = constants.%struct_type.a.225] { // CHECK:STDOUT: %.loc19_14.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc19_14.2: type = converted %.loc19_14.1, constants.%empty_struct_type [concrete = constants.%empty_struct_type] diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index 767982e10fb3..e6cc18754438 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -48,7 +48,7 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_struct_type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_struct_type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc19_9.1: type = splice_block %.loc19_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc19_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc19_9.3: type = converted %.loc19_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index cea5118a4125..ab4840165ff8 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -130,7 +130,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc49: type = splice_block %struct_type.a [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc49: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -140,7 +140,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: %y.patt: %pattern_type.f19 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.f19 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.b.c = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.b.c = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc58: type = splice_block %struct_type.b.c [concrete = constants.%struct_type.b.c] { // CHECK:STDOUT: %i32.loc58_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc58_22: type = type_literal constants.%i32 [concrete = constants.%i32] diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 30a6456c43c1..465cf37bc43c 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -46,7 +46,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [concrete] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [concrete] // CHECK:STDOUT: %struct.48c: %struct_type.a.a6c = struct_value (%int_1.5b8) [concrete] -// CHECK:STDOUT: %.68e: ref %i32 = struct_access file.%a.var, element0 [concrete] +// CHECK:STDOUT: %.46b: ref %i32 = struct_access file.%a.var, element0 [concrete] // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] @@ -68,7 +68,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %pattern_type.20e3: type = pattern_type %struct_type.a.b [concrete] // CHECK:STDOUT: %b.patt: %pattern_type.20e3 = ref_binding_pattern b [concrete] // CHECK:STDOUT: %b.var_patt: %pattern_type.20e3 = var_pattern %b.patt [concrete] -// CHECK:STDOUT: %.27c: ref %i32 = struct_access file.%b.var, element0 [concrete] +// CHECK:STDOUT: %.913: ref %i32 = struct_access file.%b.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -119,7 +119,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %a.patt: %pattern_type.506 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.506 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %struct_type.a.a92 = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %struct_type.a.a92 = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %struct_type.a.loc15 [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc15: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -129,7 +129,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %b.patt: %pattern_type.20e3 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.20e3 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %struct_type.a.b = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %struct_type.a.b = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc20: type = splice_block %struct_type.a.b [concrete = constants.%struct_type.a.b] { // CHECK:STDOUT: %i32.loc20_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc20_22: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -140,7 +140,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc26: type = splice_block %struct_type.a.loc26 [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc26: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc26: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -150,7 +150,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %y.patt: %pattern_type.b29 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.b29 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.b.0bf = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.b.0bf = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc32: type = splice_block %struct_type.b [concrete = constants.%struct_type.b.0bf] { // CHECK:STDOUT: %i32.loc32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.b: type = struct_type {.b: %i32} [concrete = constants.%struct_type.b.0bf] @@ -172,14 +172,14 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %.loc15_1: init %struct_type.a.a92 = converted %.loc15_28.1, %.loc15_28.3 [concrete = constants.%struct.406] // CHECK:STDOUT: assign file.%a.var, %.loc15_1 // CHECK:STDOUT: %a.ref: ref %struct_type.a.a92 = name_ref a, file.%a [concrete = file.%a.var] -// CHECK:STDOUT: %.loc20_29.1: ref %i32 = struct_access %a.ref, element0 [concrete = constants.%.68e] +// CHECK:STDOUT: %.loc20_29.1: ref %i32 = struct_access %a.ref, element0 [concrete = constants.%.46b] // CHECK:STDOUT: %.loc20_29.2: %i32 = acquire_value %.loc20_29.1 // CHECK:STDOUT: %impl.elem0.loc20: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc20_29.1: = bound_method %.loc20_29.2, %impl.elem0.loc20 // CHECK:STDOUT: %specific_fn.loc20: = specific_function %impl.elem0.loc20, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc20_29.2: = bound_method %.loc20_29.2, %specific_fn.loc20 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call: init %i32 = call %bound_method.loc20_29.2(%.loc20_29.2) -// CHECK:STDOUT: %.loc20_29.3: ref %i32 = struct_access file.%b.var, element0 [concrete = constants.%.27c] +// CHECK:STDOUT: %.loc20_29.3: ref %i32 = struct_access file.%b.var, element0 [concrete = constants.%.913] // CHECK:STDOUT: %.loc20_29.4: init %i32 to %.loc20_29.3 = in_place_init %Int.as.Copy.impl.Op.call // CHECK:STDOUT: assign file.%b.var, // CHECK:STDOUT: %int_1.loc26: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index b0ba69a18caa..20ce7f967b07 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -53,7 +53,7 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %struct_type.a [concrete = constants.%struct_type.a] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 7b4748869c25..c27a11ef0ad1 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -85,7 +85,7 @@ var y: i32 = x.b; // CHECK:STDOUT: %x.patt: %pattern_type.6b7 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.6b7 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.752 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.752 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %struct_type.a [concrete = constants.%struct_type.a.752] { // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %f64.dc1} [concrete = constants.%struct_type.a.752] @@ -95,7 +95,7 @@ var y: i32 = x.b; // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index 00c0fec0ff48..9dbedfc35253 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -47,7 +47,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: %s.patt: = ref_binding_pattern s [concrete = ] // CHECK:STDOUT: %s.var_patt: = var_pattern %s.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %s.var: ref = var %s.var_patt [concrete = ] +// CHECK:STDOUT: %s.var: ref = var_storage %s.var_patt [concrete = ] // CHECK:STDOUT: %.loc24: type = splice_block %struct_type.a [concrete = constants.%struct_type.a] { // CHECK:STDOUT: %Incomplete.ref.loc24: type = name_ref Incomplete, %Incomplete.decl [concrete = constants.%Incomplete] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %Incomplete} [concrete = constants.%struct_type.a] @@ -57,7 +57,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: %p.patt: %pattern_type = ref_binding_pattern p [concrete = constants.%p.patt] // CHECK:STDOUT: %p.var_patt: %pattern_type = var_pattern %p.patt [concrete = constants.%p.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %p.var: ref %ptr = var %p.var_patt [concrete] +// CHECK:STDOUT: %p.var: ref %ptr = var_storage %p.var_patt [concrete] // CHECK:STDOUT: %.loc26: type = splice_block %ptr [concrete = constants.%ptr] { // CHECK:STDOUT: %Incomplete.ref.loc26: type = name_ref Incomplete, %Incomplete.decl [concrete = constants.%Incomplete] // CHECK:STDOUT: %ptr: type = ptr_type %Incomplete.ref.loc26 [concrete = constants.%ptr] diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index 2271db25cfe9..f8e7809e46cc 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -79,7 +79,7 @@ var y: i32 = x.b; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %struct_type.a [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -89,7 +89,7 @@ var y: i32 = x.b; // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc20: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 08c82212fb45..daecb82cbdda 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -32,7 +32,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [concrete] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: Core.IntLiteral} [concrete] // CHECK:STDOUT: %struct: %struct_type.a = struct_value (%int_1.5b8) [concrete] -// CHECK:STDOUT: %.2c1: ref %i32 = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.58a: ref %i32 = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] @@ -74,7 +74,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: %x.patt: %pattern_type.20e3 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.20e3 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.b = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.b = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %struct_type.a.b [concrete = constants.%struct_type.a.b] { // CHECK:STDOUT: %i32.loc19_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc19_22: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -93,7 +93,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: %bound_method.loc19_36.2: = bound_method %int_1, %specific_fn [concrete = constants.%bound_method] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method.loc19_36.2(%int_1) [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc19_36.2: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_1.0c6] -// CHECK:STDOUT: %.loc19_36.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.2c1] +// CHECK:STDOUT: %.loc19_36.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.58a] // CHECK:STDOUT: %.loc19_36.4: init %i32 to %.loc19_36.3 = in_place_init %.loc19_36.2 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: assign file.%x.var, // CHECK:STDOUT: return diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index c0c3553a5b57..81740d135932 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -57,7 +57,7 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc22: type = splice_block %struct_type.a [concrete = constants.%struct_type.a] { // CHECK:STDOUT: %i32: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index c0f04bd2f6d3..c295b5f0cdc0 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -50,7 +50,7 @@ var x: {.a = 1}; // CHECK:STDOUT: %x.patt: = ref_binding_pattern x [concrete = ] // CHECK:STDOUT: %x.var_patt: = var_pattern %x.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] +// CHECK:STDOUT: %x.var: ref = var_storage %x.var_patt [concrete = ] // CHECK:STDOUT: %.1: = splice_block [concrete = ] { // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: %.loc22_15.1: %struct_type.a = struct_literal (%int_1) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index 19d0fd80d0af..c27b183d2d74 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -94,7 +94,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %a.var_patt: %pattern_type.506 = var_pattern %a.patt [concrete] // CHECK:STDOUT: %a_ref.patt: %pattern_type.506 = ref_binding_pattern a_ref [concrete] // CHECK:STDOUT: %a_ref.var_patt: %pattern_type.506 = var_pattern %a_ref.patt [concrete] -// CHECK:STDOUT: %.802: ref %i32 = struct_access imports.%a_ref.var, element0 [concrete] +// CHECK:STDOUT: %.359: ref %i32 = struct_access imports.%a_ref.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -115,15 +115,15 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %b.var_patt: %pattern_type.1fb = var_pattern %b.patt [concrete] // CHECK:STDOUT: %b_ref.patt: %pattern_type.1fb = ref_binding_pattern b_ref [concrete] // CHECK:STDOUT: %b_ref.var_patt: %pattern_type.1fb = var_pattern %b_ref.patt [concrete] -// CHECK:STDOUT: %.355: ref %struct_type.b.c = struct_access imports.%b_ref.var, element0 [concrete] -// CHECK:STDOUT: %.8dc: ref %struct_type.b.c = struct_access file.%b.var, element0 [concrete] -// CHECK:STDOUT: %.379: ref %i32 = struct_access %.355, element0 [concrete] -// CHECK:STDOUT: %.ef7: ref %i32 = struct_access %.8dc, element0 [concrete] -// CHECK:STDOUT: %.0c8: ref %tuple.type.a8a = struct_access %.355, element1 [concrete] -// CHECK:STDOUT: %.38c: ref %tuple.type.a8a = struct_access %.8dc, element1 [concrete] -// CHECK:STDOUT: %tuple.elem0.3bb: ref %i32 = tuple_access %.0c8, element0 [concrete] -// CHECK:STDOUT: %.59b: ref %i32 = struct_access imports.%b_ref.var, element1 [concrete] -// CHECK:STDOUT: %.bac: ref %i32 = struct_access file.%b.var, element1 [concrete] +// CHECK:STDOUT: %.c0a: ref %struct_type.b.c = struct_access imports.%b_ref.var, element0 [concrete] +// CHECK:STDOUT: %.731: ref %struct_type.b.c = struct_access file.%b.var, element0 [concrete] +// CHECK:STDOUT: %.024: ref %i32 = struct_access %.c0a, element0 [concrete] +// CHECK:STDOUT: %.e4a: ref %i32 = struct_access %.731, element0 [concrete] +// CHECK:STDOUT: %.136: ref %tuple.type.a8a = struct_access %.c0a, element1 [concrete] +// CHECK:STDOUT: %.23e: ref %tuple.type.a8a = struct_access %.731, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.939: ref %i32 = tuple_access %.136, element0 [concrete] +// CHECK:STDOUT: %.f61: ref %i32 = struct_access imports.%b_ref.var, element1 [concrete] +// CHECK:STDOUT: %.08d: ref %i32 = struct_access file.%b.var, element1 [concrete] // CHECK:STDOUT: %C.type: type = generic_class_type @C [concrete] // CHECK:STDOUT: %C.generic: %C.type = struct_value () [concrete] // CHECK:STDOUT: %struct_type.a.b.b4c: type = struct_type {.a: %i32, .b: %i32} [concrete] @@ -161,10 +161,10 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [concrete = constants.%F] // CHECK:STDOUT: %Implicit.import_ref.717: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Implicit//default, inst{{[0-9A-F]+}} [indirect], loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] // CHECK:STDOUT: %ImplicitAs.impl_witness_table.1f3 = impl_witness_table (%Implicit.import_ref.717), @Core.IntLiteral.as.ImplicitAs.impl [concrete] -// CHECK:STDOUT: %a_ref.var: ref %struct_type.a = var constants.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %struct_type.a = var_storage constants.%a_ref.var_patt [concrete] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.5e0)] // CHECK:STDOUT: %Copy.impl_witness_table.367 = impl_witness_table (%Core.import_ref.cd6), @Int.as.Copy.impl [concrete] -// CHECK:STDOUT: %b_ref.var: ref %struct_type.a.d.01c = var constants.%b_ref.var_patt [concrete] +// CHECK:STDOUT: %b_ref.var: ref %struct_type.a.d.01c = var_storage constants.%b_ref.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -172,7 +172,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %a.patt: %pattern_type.506 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.506 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %struct_type.a = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %struct_type.a = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc5: type = splice_block %struct_type.a [concrete = constants.%struct_type.a] { // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a] @@ -182,7 +182,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %b.patt: %pattern_type.1fb = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.1fb = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %struct_type.a.d.01c = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %struct_type.a.d.01c = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc6_43: type = splice_block %struct_type.a.d [concrete = constants.%struct_type.a.d.01c] { // CHECK:STDOUT: %i32.loc6_18: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc6_28: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -197,7 +197,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %c.patt: %pattern_type.20c = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.20c = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C.8d3 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C.8d3 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc7_26.1: type = splice_block %C [concrete = constants.%C.8d3] { // CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [concrete = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -227,7 +227,7 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a_ref.ref: ref %struct_type.a = name_ref a_ref, imports.%Implicit.a_ref [concrete = imports.%a_ref.var] -// CHECK:STDOUT: %.loc5_20.1: ref %i32 = struct_access %a_ref.ref, element0 [concrete = constants.%.802] +// CHECK:STDOUT: %.loc5_20.1: ref %i32 = struct_access %a_ref.ref, element0 [concrete = constants.%.359] // CHECK:STDOUT: %.loc5_20.2: %i32 = acquire_value %.loc5_20.1 // CHECK:STDOUT: %impl.elem0.loc5: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc5_20.1: = bound_method %.loc5_20.2, %impl.elem0.loc5 @@ -238,39 +238,39 @@ fn F() -> {.x: i32} { // CHECK:STDOUT: %.loc5_1: init %struct_type.a = converted %a_ref.ref, %.loc5_20.3 // CHECK:STDOUT: assign file.%a.var, %.loc5_1 // CHECK:STDOUT: %b_ref.ref: ref %struct_type.a.d.01c = name_ref b_ref, imports.%Implicit.b_ref [concrete = imports.%b_ref.var] -// CHECK:STDOUT: %.loc6_47.1: ref %struct_type.b.c = struct_access %b_ref.ref, element0 [concrete = constants.%.355] -// CHECK:STDOUT: %.loc6_47.2: ref %i32 = struct_access %.loc6_47.1, element0 [concrete = constants.%.379] +// CHECK:STDOUT: %.loc6_47.1: ref %struct_type.b.c = struct_access %b_ref.ref, element0 [concrete = constants.%.c0a] +// CHECK:STDOUT: %.loc6_47.2: ref %i32 = struct_access %.loc6_47.1, element0 [concrete = constants.%.024] // CHECK:STDOUT: %.loc6_47.3: %i32 = acquire_value %.loc6_47.2 // CHECK:STDOUT: %impl.elem0.loc6_47.1: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_47.1: = bound_method %.loc6_47.3, %impl.elem0.loc6_47.1 // CHECK:STDOUT: %specific_fn.loc6_47.1: = specific_function %impl.elem0.loc6_47.1, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_47.2: = bound_method %.loc6_47.3, %specific_fn.loc6_47.1 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_47.1: init %i32 = call %bound_method.loc6_47.2(%.loc6_47.3) -// CHECK:STDOUT: %.loc6_47.4: ref %struct_type.b.c = struct_access file.%b.var, element0 [concrete = constants.%.8dc] -// CHECK:STDOUT: %.loc6_47.5: ref %i32 = struct_access %.loc6_47.4, element0 [concrete = constants.%.ef7] +// CHECK:STDOUT: %.loc6_47.4: ref %struct_type.b.c = struct_access file.%b.var, element0 [concrete = constants.%.731] +// CHECK:STDOUT: %.loc6_47.5: ref %i32 = struct_access %.loc6_47.4, element0 [concrete = constants.%.e4a] // CHECK:STDOUT: %.loc6_47.6: init %i32 to %.loc6_47.5 = in_place_init %Int.as.Copy.impl.Op.call.loc6_47.1 -// CHECK:STDOUT: %.loc6_47.7: ref %tuple.type.a8a = struct_access %.loc6_47.1, element1 [concrete = constants.%.0c8] -// CHECK:STDOUT: %tuple.elem0: ref %i32 = tuple_access %.loc6_47.7, element0 [concrete = constants.%tuple.elem0.3bb] +// CHECK:STDOUT: %.loc6_47.7: ref %tuple.type.a8a = struct_access %.loc6_47.1, element1 [concrete = constants.%.136] +// CHECK:STDOUT: %tuple.elem0: ref %i32 = tuple_access %.loc6_47.7, element0 [concrete = constants.%tuple.elem0.939] // CHECK:STDOUT: %.loc6_47.8: %i32 = acquire_value %tuple.elem0 // CHECK:STDOUT: %impl.elem0.loc6_47.2: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_47.3: = bound_method %.loc6_47.8, %impl.elem0.loc6_47.2 // CHECK:STDOUT: %specific_fn.loc6_47.2: = specific_function %impl.elem0.loc6_47.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_47.4: = bound_method %.loc6_47.8, %specific_fn.loc6_47.2 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_47.2: init %i32 = call %bound_method.loc6_47.4(%.loc6_47.8) -// CHECK:STDOUT: %.loc6_47.9: ref %tuple.type.a8a = struct_access %.loc6_47.4, element1 [concrete = constants.%.38c] +// CHECK:STDOUT: %.loc6_47.9: ref %tuple.type.a8a = struct_access %.loc6_47.4, element1 [concrete = constants.%.23e] // CHECK:STDOUT: %.loc6_47.10: init %tuple.type.a8a to %.loc6_47.9 = tuple_init (%Int.as.Copy.impl.Op.call.loc6_47.2) // CHECK:STDOUT: %.loc6_47.11: init %tuple.type.a8a = converted %.loc6_47.7, %.loc6_47.10 // CHECK:STDOUT: %.loc6_47.12: init %tuple.type.a8a to %.loc6_47.9 = in_place_init %.loc6_47.11 // CHECK:STDOUT: %.loc6_47.13: init %struct_type.b.c to %.loc6_47.4 = struct_init (%.loc6_47.6, %.loc6_47.12) // CHECK:STDOUT: %.loc6_47.14: init %struct_type.b.c = converted %.loc6_47.1, %.loc6_47.13 -// CHECK:STDOUT: %.loc6_47.15: ref %i32 = struct_access %b_ref.ref, element1 [concrete = constants.%.59b] +// CHECK:STDOUT: %.loc6_47.15: ref %i32 = struct_access %b_ref.ref, element1 [concrete = constants.%.f61] // CHECK:STDOUT: %.loc6_47.16: %i32 = acquire_value %.loc6_47.15 // CHECK:STDOUT: %impl.elem0.loc6_47.3: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_47.5: = bound_method %.loc6_47.16, %impl.elem0.loc6_47.3 // CHECK:STDOUT: %specific_fn.loc6_47.3: = specific_function %impl.elem0.loc6_47.3, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_47.6: = bound_method %.loc6_47.16, %specific_fn.loc6_47.3 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_47.3: init %i32 = call %bound_method.loc6_47.6(%.loc6_47.16) -// CHECK:STDOUT: %.loc6_47.17: ref %i32 = struct_access file.%b.var, element1 [concrete = constants.%.bac] +// CHECK:STDOUT: %.loc6_47.17: ref %i32 = struct_access file.%b.var, element1 [concrete = constants.%.08d] // CHECK:STDOUT: %.loc6_47.18: init %i32 to %.loc6_47.17 = in_place_init %Int.as.Copy.impl.Op.call.loc6_47.3 // CHECK:STDOUT: %.loc6_47.19: init %struct_type.a.d.01c to file.%b.var = struct_init (%.loc6_47.14, %.loc6_47.18) // CHECK:STDOUT: %.loc6_1: init %struct_type.a.d.01c = converted %b_ref.ref, %.loc6_47.19 diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 0ca48cbc4f69..6fb0e923e037 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -36,7 +36,7 @@ var z: i32 = y; // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [concrete] // CHECK:STDOUT: %struct_type.a.b.0cc: type = struct_type {.a: Core.FloatLiteral, .b: Core.IntLiteral} [concrete] // CHECK:STDOUT: %struct.877: %struct_type.a.b.0cc = struct_value (%float.1f7, %int_1.5b8) [concrete] -// CHECK:STDOUT: %.c34: ref %f64.dc1 = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.1cd: ref %f64.dc1 = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %ImplicitAs.type.91e: type = facet_type <@ImplicitAs, @ImplicitAs(%f64.dc1)> [concrete] @@ -53,7 +53,7 @@ var z: i32 = y; // CHECK:STDOUT: %Core.FloatLiteral.as.ImplicitAs.impl.Convert.specific_fn: = specific_function %Core.FloatLiteral.as.ImplicitAs.impl.Convert.cf0, @Core.FloatLiteral.as.ImplicitAs.impl.Convert(%int_64) [concrete] // CHECK:STDOUT: %bound_method.819: = bound_method %float.1f7, %Core.FloatLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete] // CHECK:STDOUT: %float.895: %f64.dc1 = float_value 0 [concrete] -// CHECK:STDOUT: %.46a: ref %i32 = struct_access file.%x.var, element1 [concrete] +// CHECK:STDOUT: %.423: ref %i32 = struct_access file.%x.var, element1 [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74: type = fn_type @Core.IntLiteral.as.ImplicitAs.impl.Convert, @Core.IntLiteral.as.ImplicitAs.impl(%To) [symbolic] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.845: %Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74 = struct_value () [symbolic] @@ -118,7 +118,7 @@ var z: i32 = y; // CHECK:STDOUT: %x.patt: %pattern_type.0ed = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.0ed = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.b.09c = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.b.09c = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %struct_type.a.b [concrete = constants.%struct_type.a.b.09c] { // CHECK:STDOUT: %f64: type = type_literal constants.%f64.dc1 [concrete = constants.%f64.dc1] // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -129,14 +129,14 @@ var z: i32 = y; // CHECK:STDOUT: %y.patt: %pattern_type.6b6 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.6b6 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %i32 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %i32 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %y: ref %i32 = wrapper_binding y, %y.var [concrete = %y.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %z.patt: %pattern_type.6b6 = ref_binding_pattern z [concrete = constants.%z.patt] // CHECK:STDOUT: %z.var_patt: %pattern_type.6b6 = var_pattern %z.patt [concrete = constants.%z.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %z.var: ref %i32 = var %z.var_patt [concrete] +// CHECK:STDOUT: %z.var: ref %i32 = var_storage %z.var_patt [concrete] // CHECK:STDOUT: %i32.loc17: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %z: ref %i32 = wrapper_binding z, %z.var [concrete = %z.var] // CHECK:STDOUT: } @@ -152,7 +152,7 @@ var z: i32 = y; // CHECK:STDOUT: %bound_method.loc15_46.2: = bound_method %float, %specific_fn.loc15_46.1 [concrete = constants.%bound_method.819] // CHECK:STDOUT: %Core.FloatLiteral.as.ImplicitAs.impl.Convert.call: init %f64.dc1 = call %bound_method.loc15_46.2(%float) [concrete = constants.%float.895] // CHECK:STDOUT: %.loc15_46.2: init %f64.dc1 = converted %float, %Core.FloatLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%float.895] -// CHECK:STDOUT: %.loc15_46.3: ref %f64.dc1 = struct_access file.%x.var, element0 [concrete = constants.%.c34] +// CHECK:STDOUT: %.loc15_46.3: ref %f64.dc1 = struct_access file.%x.var, element0 [concrete = constants.%.1cd] // CHECK:STDOUT: %.loc15_46.4: init %f64.dc1 to %.loc15_46.3 = in_place_init %.loc15_46.2 [concrete = constants.%float.895] // CHECK:STDOUT: %impl.elem0.loc15_46.2: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc15_46.3: = bound_method %int_1, %impl.elem0.loc15_46.2 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound] @@ -160,13 +160,13 @@ var z: i32 = y; // CHECK:STDOUT: %bound_method.loc15_46.4: = bound_method %int_1, %specific_fn.loc15_46.2 [concrete = constants.%bound_method.953] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method.loc15_46.4(%int_1) [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc15_46.5: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_1.0c6] -// CHECK:STDOUT: %.loc15_46.6: ref %i32 = struct_access file.%x.var, element1 [concrete = constants.%.46a] +// CHECK:STDOUT: %.loc15_46.6: ref %i32 = struct_access file.%x.var, element1 [concrete = constants.%.423] // CHECK:STDOUT: %.loc15_46.7: init %i32 to %.loc15_46.6 = in_place_init %.loc15_46.5 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc15_46.8: init %struct_type.a.b.09c to file.%x.var = struct_init (%.loc15_46.4, %.loc15_46.7) [concrete = constants.%struct.77f] // CHECK:STDOUT: %.loc15_1: init %struct_type.a.b.09c = converted %.loc15_46.1, %.loc15_46.8 [concrete = constants.%struct.77f] // CHECK:STDOUT: assign file.%x.var, %.loc15_1 // CHECK:STDOUT: %x.ref: ref %struct_type.a.b.09c = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc16_15.1: ref %i32 = struct_access %x.ref, element1 [concrete = constants.%.46a] +// CHECK:STDOUT: %.loc16_15.1: ref %i32 = struct_access %x.ref, element1 [concrete = constants.%.423] // CHECK:STDOUT: %.loc16_15.2: %i32 = acquire_value %.loc16_15.1 // CHECK:STDOUT: %impl.elem0.loc16: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc16_15.1: = bound_method %.loc16_15.2, %impl.elem0.loc16 diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index c82a4364e2ba..4aa749d023af 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -89,7 +89,7 @@ fn G() { // CHECK:STDOUT: %v.patt: %pattern_type.28f = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.28f = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %struct_type.a.b.2a0 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %struct_type.a.b.2a0 = var_storage %v.var_patt // CHECK:STDOUT: %F.ref.loc18_68: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc18_81.1: ref %tuple.type.555 = struct_access %v.var, element0 // CHECK:STDOUT: %F.call.loc18_70: init %tuple.type.555 to %.loc18_81.1 = call %F.ref.loc18_68() diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index b9dcd5059b3f..fadc4dceb88d 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -30,7 +30,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %int_4.0c1: Core.IntLiteral = int_value 4 [concrete] // CHECK:STDOUT: %struct_type.a.a6c: type = struct_type {.a: Core.IntLiteral} [concrete] // CHECK:STDOUT: %struct.2cb: %struct_type.a.a6c = struct_value (%int_4.0c1) [concrete] -// CHECK:STDOUT: %.587: ref %i32 = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.fb9: ref %i32 = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] @@ -90,7 +90,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %x.patt: %pattern_type.506 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.506 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.a92 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15: type = splice_block %struct_type.a.loc15 [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc15: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc15: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -100,7 +100,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %y.patt: %pattern_type.506 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.506 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.a.a92 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.a.a92 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc16: type = splice_block %struct_type.a.loc16 [concrete = constants.%struct_type.a.a92] { // CHECK:STDOUT: %i32.loc16: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %struct_type.a.loc16: type = struct_type {.a: %i32} [concrete = constants.%struct_type.a.a92] @@ -122,7 +122,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %.loc15_1: init %struct_type.a.a92 = converted %.loc15_27.1, %.loc15_27.3 [concrete = constants.%struct.751] // CHECK:STDOUT: assign file.%x.var, %.loc15_1 // CHECK:STDOUT: %x.ref: ref %struct_type.a.a92 = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc16_20.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.587] +// CHECK:STDOUT: %.loc16_20.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.fb9] // CHECK:STDOUT: %.loc16_20.2: %i32 = acquire_value %.loc16_20.1 // CHECK:STDOUT: %impl.elem0.loc16: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc16_20.1: = bound_method %.loc16_20.2, %impl.elem0.loc16 diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 9f0b4032312b..db0d94ce24c4 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -36,7 +36,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %tuple.e7e: %tuple.type.985 = tuple_value (%int_2.ecc) [concrete] // CHECK:STDOUT: %struct_type.a.b.057: type = struct_type {.a: Core.IntLiteral, .b: %tuple.type.985} [concrete] // CHECK:STDOUT: %struct.60a: %struct_type.a.b.057 = struct_value (%int_1.5b8, %tuple.e7e) [concrete] -// CHECK:STDOUT: %.537: ref %i32 = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.fa0: ref %i32 = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %ImplicitAs.type.0ff: type = generic_interface_type @ImplicitAs [concrete] // CHECK:STDOUT: %ImplicitAs.generic: %ImplicitAs.type.0ff = struct_value () [concrete] // CHECK:STDOUT: %ImplicitAs.type.914: type = facet_type <@ImplicitAs, @ImplicitAs(%i32)> [concrete] @@ -53,8 +53,8 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn: = specific_function %Core.IntLiteral.as.ImplicitAs.impl.Convert.e39, @Core.IntLiteral.as.ImplicitAs.impl.Convert(%int_32) [concrete] // CHECK:STDOUT: %bound_method.953: = bound_method %int_1.5b8, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete] // CHECK:STDOUT: %int_1.0c6: %i32 = int_value 1 [concrete] -// CHECK:STDOUT: %.a7f: ref %tuple.type.a8a = struct_access file.%x.var, element1 [concrete] -// CHECK:STDOUT: %tuple.elem0.bfa: ref %i32 = tuple_access %.a7f, element0 [concrete] +// CHECK:STDOUT: %.f08: ref %tuple.type.a8a = struct_access file.%x.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.153: ref %i32 = tuple_access %.f08, element0 [concrete] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.9f3: = bound_method %int_2.ecc, %Core.IntLiteral.as.ImplicitAs.impl.Convert.e39 [concrete] // CHECK:STDOUT: %bound_method.3cb: = bound_method %int_2.ecc, %Core.IntLiteral.as.ImplicitAs.impl.Convert.specific_fn [concrete] // CHECK:STDOUT: %int_2.295: %i32 = int_value 2 [concrete] @@ -62,7 +62,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %struct.390: %struct_type.a.b.388 = struct_value (%int_1.0c6, %tuple.b60) [concrete] // CHECK:STDOUT: %y.patt: %pattern_type.227 = ref_binding_pattern y [concrete] // CHECK:STDOUT: %y.var_patt: %pattern_type.227 = var_pattern %y.patt [concrete] -// CHECK:STDOUT: %.377: ref %i32 = struct_access file.%y.var, element0 [concrete] +// CHECK:STDOUT: %.d91: ref %i32 = struct_access file.%y.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -73,7 +73,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %Copy.WithSelf.Op.type.d09: type = fn_type @Copy.WithSelf.Op, @Copy.WithSelf(%Copy.facet) [concrete] // CHECK:STDOUT: %.7a6: type = fn_type_with_self_type %Copy.WithSelf.Op.type.d09, %Copy.facet [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.specific_fn: = specific_function %Int.as.Copy.impl.Op.4f6, @Int.as.Copy.impl.Op(%int_32) [concrete] -// CHECK:STDOUT: %.cf0: ref %tuple.type.a8a = struct_access file.%y.var, element1 [concrete] +// CHECK:STDOUT: %.9fb: ref %tuple.type.a8a = struct_access file.%y.var, element1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { @@ -104,7 +104,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %x.patt: %pattern_type.227 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.227 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.b.388 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.b.388 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15_28: type = splice_block %struct_type.a.b.loc15 [concrete = constants.%struct_type.a.b.388] { // CHECK:STDOUT: %i32.loc15_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc15_23: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -117,7 +117,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %y.patt: %pattern_type.227 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.227 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.a.b.388 = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.a.b.388 = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc16_28: type = splice_block %struct_type.a.b.loc16 [concrete = constants.%struct_type.a.b.388] { // CHECK:STDOUT: %i32.loc16_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc16_23: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -140,7 +140,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %bound_method.loc15_50.2: = bound_method %int_1, %specific_fn.loc15_50 [concrete = constants.%bound_method.953] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc15_50: init %i32 = call %bound_method.loc15_50.2(%int_1) [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc15_50.2: init %i32 = converted %int_1, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc15_50 [concrete = constants.%int_1.0c6] -// CHECK:STDOUT: %.loc15_50.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.537] +// CHECK:STDOUT: %.loc15_50.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.fa0] // CHECK:STDOUT: %.loc15_50.4: init %i32 to %.loc15_50.3 = in_place_init %.loc15_50.2 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %impl.elem0.loc15_49: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc15_49.1: = bound_method %int_2, %impl.elem0.loc15_49 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.9f3] @@ -148,7 +148,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %bound_method.loc15_49.2: = bound_method %int_2, %specific_fn.loc15_49 [concrete = constants.%bound_method.3cb] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc15_49: init %i32 = call %bound_method.loc15_49.2(%int_2) [concrete = constants.%int_2.295] // CHECK:STDOUT: %.loc15_49.2: init %i32 = converted %int_2, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc15_49 [concrete = constants.%int_2.295] -// CHECK:STDOUT: %.loc15_50.5: ref %tuple.type.a8a = struct_access file.%x.var, element1 [concrete = constants.%.a7f] +// CHECK:STDOUT: %.loc15_50.5: ref %tuple.type.a8a = struct_access file.%x.var, element1 [concrete = constants.%.f08] // CHECK:STDOUT: %.loc15_49.3: init %tuple.type.a8a to %.loc15_50.5 = tuple_init (%.loc15_49.2) [concrete = constants.%tuple.b60] // CHECK:STDOUT: %.loc15_50.6: init %tuple.type.a8a = converted %.loc15_49.1, %.loc15_49.3 [concrete = constants.%tuple.b60] // CHECK:STDOUT: %.loc15_50.7: init %tuple.type.a8a to %.loc15_50.5 = in_place_init %.loc15_50.6 [concrete = constants.%tuple.b60] @@ -156,24 +156,24 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc15_1: init %struct_type.a.b.388 = converted %.loc15_50.1, %.loc15_50.8 [concrete = constants.%struct.390] // CHECK:STDOUT: assign file.%x.var, %.loc15_1 // CHECK:STDOUT: %x.ref: ref %struct_type.a.b.388 = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc16_32.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.537] +// CHECK:STDOUT: %.loc16_32.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.fa0] // CHECK:STDOUT: %.loc16_32.2: %i32 = acquire_value %.loc16_32.1 // CHECK:STDOUT: %impl.elem0.loc16_32.1: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc16_32.1: = bound_method %.loc16_32.2, %impl.elem0.loc16_32.1 // CHECK:STDOUT: %specific_fn.loc16_32.1: = specific_function %impl.elem0.loc16_32.1, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc16_32.2: = bound_method %.loc16_32.2, %specific_fn.loc16_32.1 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc16_32.1: init %i32 = call %bound_method.loc16_32.2(%.loc16_32.2) -// CHECK:STDOUT: %.loc16_32.3: ref %i32 = struct_access file.%y.var, element0 [concrete = constants.%.377] +// CHECK:STDOUT: %.loc16_32.3: ref %i32 = struct_access file.%y.var, element0 [concrete = constants.%.d91] // CHECK:STDOUT: %.loc16_32.4: init %i32 to %.loc16_32.3 = in_place_init %Int.as.Copy.impl.Op.call.loc16_32.1 -// CHECK:STDOUT: %.loc16_32.5: ref %tuple.type.a8a = struct_access %x.ref, element1 [concrete = constants.%.a7f] -// CHECK:STDOUT: %tuple.elem0: ref %i32 = tuple_access %.loc16_32.5, element0 [concrete = constants.%tuple.elem0.bfa] +// CHECK:STDOUT: %.loc16_32.5: ref %tuple.type.a8a = struct_access %x.ref, element1 [concrete = constants.%.f08] +// CHECK:STDOUT: %tuple.elem0: ref %i32 = tuple_access %.loc16_32.5, element0 [concrete = constants.%tuple.elem0.153] // CHECK:STDOUT: %.loc16_32.6: %i32 = acquire_value %tuple.elem0 // CHECK:STDOUT: %impl.elem0.loc16_32.2: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc16_32.3: = bound_method %.loc16_32.6, %impl.elem0.loc16_32.2 // CHECK:STDOUT: %specific_fn.loc16_32.2: = specific_function %impl.elem0.loc16_32.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc16_32.4: = bound_method %.loc16_32.6, %specific_fn.loc16_32.2 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc16_32.2: init %i32 = call %bound_method.loc16_32.4(%.loc16_32.6) -// CHECK:STDOUT: %.loc16_32.7: ref %tuple.type.a8a = struct_access file.%y.var, element1 [concrete = constants.%.cf0] +// CHECK:STDOUT: %.loc16_32.7: ref %tuple.type.a8a = struct_access file.%y.var, element1 [concrete = constants.%.9fb] // CHECK:STDOUT: %.loc16_32.8: init %tuple.type.a8a to %.loc16_32.7 = tuple_init (%Int.as.Copy.impl.Op.call.loc16_32.2) // CHECK:STDOUT: %.loc16_32.9: init %tuple.type.a8a = converted %.loc16_32.5, %.loc16_32.8 // CHECK:STDOUT: %.loc16_32.10: init %tuple.type.a8a to %.loc16_32.7 = in_place_init %.loc16_32.9 diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index 29789e1ae2ea..0436a4a715ea 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -56,11 +56,11 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %w.patt: %pattern_type.20e3 = value_binding_pattern w [concrete] // CHECK:STDOUT: %x.patt: %pattern_type.20e3 = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type.20e3 = var_pattern %x.patt [concrete] -// CHECK:STDOUT: %.2c1: ref %i32 = struct_access file.%x.var, element0 [concrete] -// CHECK:STDOUT: %.38d: ref %i32 = struct_access file.%x.var, element1 [concrete] +// CHECK:STDOUT: %.58a: ref %i32 = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.af3: ref %i32 = struct_access file.%x.var, element1 [concrete] // CHECK:STDOUT: %y.patt: %pattern_type.20e3 = ref_binding_pattern y [concrete] // CHECK:STDOUT: %y.var_patt: %pattern_type.20e3 = var_pattern %y.patt [concrete] -// CHECK:STDOUT: %.27d: ref %i32 = struct_access file.%y.var, element0 [concrete] +// CHECK:STDOUT: %.99f: ref %i32 = struct_access file.%y.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -71,7 +71,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %Copy.WithSelf.Op.type.d09: type = fn_type @Copy.WithSelf.Op, @Copy.WithSelf(%Copy.facet) [concrete] // CHECK:STDOUT: %.7a6: type = fn_type_with_self_type %Copy.WithSelf.Op.type.d09, %Copy.facet [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.specific_fn: = specific_function %Int.as.Copy.impl.Op.4f6, @Int.as.Copy.impl.Op(%int_32) [concrete] -// CHECK:STDOUT: %.67e: ref %i32 = struct_access file.%y.var, element1 [concrete] +// CHECK:STDOUT: %.5b7: ref %i32 = struct_access file.%y.var, element1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { @@ -138,7 +138,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %x.patt: %pattern_type.20e3 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.20e3 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.a.b.b4c = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.a.b.b4c = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc18: type = splice_block %struct_type.a.b.loc18 [concrete = constants.%struct_type.a.b.b4c] { // CHECK:STDOUT: %i32.loc18_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc18_22: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -149,7 +149,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %y.patt: %pattern_type.20e3 = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.20e3 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.a.b.b4c = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.a.b.b4c = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc19: type = splice_block %struct_type.a.b.loc19 [concrete = constants.%struct_type.a.b.b4c] { // CHECK:STDOUT: %i32.loc19_13: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %i32.loc19_22: type = type_literal constants.%i32 [concrete = constants.%i32] @@ -173,7 +173,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %bound_method.loc18_44.2: = bound_method %int_1.loc18, %specific_fn.loc18_44.1 [concrete = constants.%bound_method.953] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc18_44.1: init %i32 = call %bound_method.loc18_44.2(%int_1.loc18) [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %.loc18_44.2: init %i32 = converted %int_1.loc18, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc18_44.1 [concrete = constants.%int_1.0c6] -// CHECK:STDOUT: %.loc18_44.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.2c1] +// CHECK:STDOUT: %.loc18_44.3: ref %i32 = struct_access file.%x.var, element0 [concrete = constants.%.58a] // CHECK:STDOUT: %.loc18_44.4: init %i32 to %.loc18_44.3 = in_place_init %.loc18_44.2 [concrete = constants.%int_1.0c6] // CHECK:STDOUT: %impl.elem0.loc18_44.2: %.1c5 = impl_witness_access constants.%ImplicitAs.impl_witness.a23, element0 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.e39] // CHECK:STDOUT: %bound_method.loc18_44.3: = bound_method %int_2.loc18, %impl.elem0.loc18_44.2 [concrete = constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.bound.9f3] @@ -181,29 +181,29 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %bound_method.loc18_44.4: = bound_method %int_2.loc18, %specific_fn.loc18_44.2 [concrete = constants.%bound_method.3cb] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc18_44.2: init %i32 = call %bound_method.loc18_44.4(%int_2.loc18) [concrete = constants.%int_2.295] // CHECK:STDOUT: %.loc18_44.5: init %i32 = converted %int_2.loc18, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call.loc18_44.2 [concrete = constants.%int_2.295] -// CHECK:STDOUT: %.loc18_44.6: ref %i32 = struct_access file.%x.var, element1 [concrete = constants.%.38d] +// CHECK:STDOUT: %.loc18_44.6: ref %i32 = struct_access file.%x.var, element1 [concrete = constants.%.af3] // CHECK:STDOUT: %.loc18_44.7: init %i32 to %.loc18_44.6 = in_place_init %.loc18_44.5 [concrete = constants.%int_2.295] // CHECK:STDOUT: %.loc18_44.8: init %struct_type.a.b.b4c to file.%x.var = struct_init (%.loc18_44.4, %.loc18_44.7) [concrete = constants.%struct.631] // CHECK:STDOUT: %.loc18_1: init %struct_type.a.b.b4c = converted %.loc18_44.1, %.loc18_44.8 [concrete = constants.%struct.631] // CHECK:STDOUT: assign file.%x.var, %.loc18_1 // CHECK:STDOUT: %x.ref: ref %struct_type.a.b.b4c = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc19_29.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.2c1] +// CHECK:STDOUT: %.loc19_29.1: ref %i32 = struct_access %x.ref, element0 [concrete = constants.%.58a] // CHECK:STDOUT: %.loc19_29.2: %i32 = acquire_value %.loc19_29.1 // CHECK:STDOUT: %impl.elem0.loc19_29.1: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc19_29.1: = bound_method %.loc19_29.2, %impl.elem0.loc19_29.1 // CHECK:STDOUT: %specific_fn.loc19_29.1: = specific_function %impl.elem0.loc19_29.1, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc19_29.2: = bound_method %.loc19_29.2, %specific_fn.loc19_29.1 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc19_29.1: init %i32 = call %bound_method.loc19_29.2(%.loc19_29.2) -// CHECK:STDOUT: %.loc19_29.3: ref %i32 = struct_access file.%y.var, element0 [concrete = constants.%.27d] +// CHECK:STDOUT: %.loc19_29.3: ref %i32 = struct_access file.%y.var, element0 [concrete = constants.%.99f] // CHECK:STDOUT: %.loc19_29.4: init %i32 to %.loc19_29.3 = in_place_init %Int.as.Copy.impl.Op.call.loc19_29.1 -// CHECK:STDOUT: %.loc19_29.5: ref %i32 = struct_access %x.ref, element1 [concrete = constants.%.38d] +// CHECK:STDOUT: %.loc19_29.5: ref %i32 = struct_access %x.ref, element1 [concrete = constants.%.af3] // CHECK:STDOUT: %.loc19_29.6: %i32 = acquire_value %.loc19_29.5 // CHECK:STDOUT: %impl.elem0.loc19_29.2: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc19_29.3: = bound_method %.loc19_29.6, %impl.elem0.loc19_29.2 // CHECK:STDOUT: %specific_fn.loc19_29.2: = specific_function %impl.elem0.loc19_29.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc19_29.4: = bound_method %.loc19_29.6, %specific_fn.loc19_29.2 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc19_29.2: init %i32 = call %bound_method.loc19_29.4(%.loc19_29.6) -// CHECK:STDOUT: %.loc19_29.7: ref %i32 = struct_access file.%y.var, element1 [concrete = constants.%.67e] +// CHECK:STDOUT: %.loc19_29.7: ref %i32 = struct_access file.%y.var, element1 [concrete = constants.%.5b7] // CHECK:STDOUT: %.loc19_29.8: init %i32 to %.loc19_29.7 = in_place_init %Int.as.Copy.impl.Op.call.loc19_29.2 // CHECK:STDOUT: %.loc19_29.9: init %struct_type.a.b.b4c to file.%y.var = struct_init (%.loc19_29.4, %.loc19_29.8) // CHECK:STDOUT: %.loc19_1: init %struct_type.a.b.b4c = converted %x.ref, %.loc19_29.9 diff --git a/toolchain/check/testdata/tuple/basics.carbon b/toolchain/check/testdata/tuple/basics.carbon index 026bec4f4ca9..24004771150d 100644 --- a/toolchain/check/testdata/tuple/basics.carbon +++ b/toolchain/check/testdata/tuple/basics.carbon @@ -65,7 +65,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -75,7 +75,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc5_9.1: type = splice_block %.loc5_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc5_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_9.3: type = converted %.loc5_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -108,10 +108,10 @@ var y: ((), ()) = x; // CHECK:STDOUT: %pattern_type: type = pattern_type %tuple.type.6e8 [concrete] // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.d36: ref %tuple.type.bcd = tuple_access file.%x.var, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.b69: ref %empty_tuple.type = tuple_access %tuple.elem0.d36, element0 [concrete] -// CHECK:STDOUT: %tuple.elem1.221: ref %empty_tuple.type = tuple_access %tuple.elem0.d36, element1 [concrete] -// CHECK:STDOUT: %tuple.elem1.7e9: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.b4d: ref %tuple.type.bcd = tuple_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.b4c: ref %empty_tuple.type = tuple_access %tuple.elem0.b4d, element0 [concrete] +// CHECK:STDOUT: %tuple.elem1.ec8: ref %empty_tuple.type = tuple_access %tuple.elem0.b4d, element1 [concrete] +// CHECK:STDOUT: %tuple.elem1.e0a: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -119,7 +119,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %tuple.type.6e8 = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %tuple.type.6e8 = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc4_21.1: type = splice_block %.loc4_21.7 [concrete = constants.%tuple.type.6e8] { // CHECK:STDOUT: %.loc4_11: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_15: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -142,18 +142,18 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc4_33.1: %tuple.type.bcd = tuple_literal (%.loc4_28.1, %.loc4_32.1) [concrete = constants.%tuple.d8f] // CHECK:STDOUT: %.loc4_37.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_38.1: %tuple.type.6e8 = tuple_literal (%.loc4_33.1, %.loc4_37.1) [concrete = constants.%tuple.0ca] -// CHECK:STDOUT: %tuple.elem0.loc4_38: ref %tuple.type.bcd = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.d36] -// CHECK:STDOUT: %tuple.elem0.loc4_33: ref %empty_tuple.type = tuple_access %tuple.elem0.loc4_38, element0 [concrete = constants.%tuple.elem0.b69] +// CHECK:STDOUT: %tuple.elem0.loc4_38: ref %tuple.type.bcd = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.b4d] +// CHECK:STDOUT: %tuple.elem0.loc4_33: ref %empty_tuple.type = tuple_access %tuple.elem0.loc4_38, element0 [concrete = constants.%tuple.elem0.b4c] // CHECK:STDOUT: %.loc4_28.2: init %empty_tuple.type to %tuple.elem0.loc4_33 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_33.2: init %empty_tuple.type = converted %.loc4_28.1, %.loc4_28.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_33.3: init %empty_tuple.type to %tuple.elem0.loc4_33 = in_place_init %.loc4_33.2 [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %tuple.elem1.loc4_33: ref %empty_tuple.type = tuple_access %tuple.elem0.loc4_38, element1 [concrete = constants.%tuple.elem1.221] +// CHECK:STDOUT: %tuple.elem1.loc4_33: ref %empty_tuple.type = tuple_access %tuple.elem0.loc4_38, element1 [concrete = constants.%tuple.elem1.ec8] // CHECK:STDOUT: %.loc4_32.2: init %empty_tuple.type to %tuple.elem1.loc4_33 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_33.4: init %empty_tuple.type = converted %.loc4_32.1, %.loc4_32.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_33.5: init %empty_tuple.type to %tuple.elem1.loc4_33 = in_place_init %.loc4_33.4 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_33.6: init %tuple.type.bcd to %tuple.elem0.loc4_38 = tuple_init (%.loc4_33.3, %.loc4_33.5) [concrete = constants.%tuple.d8f] // CHECK:STDOUT: %.loc4_38.2: init %tuple.type.bcd = converted %.loc4_33.1, %.loc4_33.6 [concrete = constants.%tuple.d8f] -// CHECK:STDOUT: %tuple.elem1.loc4_38: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete = constants.%tuple.elem1.7e9] +// CHECK:STDOUT: %tuple.elem1.loc4_38: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete = constants.%tuple.elem1.e0a] // CHECK:STDOUT: %.loc4_37.2: init %empty_tuple.type to %tuple.elem1.loc4_38 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_38.3: init %empty_tuple.type = converted %.loc4_37.1, %.loc4_37.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_38.4: init %empty_tuple.type to %tuple.elem1.loc4_38 = in_place_init %.loc4_38.3 [concrete = constants.%empty_tuple] @@ -173,10 +173,10 @@ var y: ((), ()) = x; // CHECK:STDOUT: %pattern_type: type = pattern_type %tuple.type [concrete] // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.750: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.0b5: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.918: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.652: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -184,7 +184,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc4_12.1: type = splice_block %.loc4_12.4 [concrete = constants.%tuple.type] { // CHECK:STDOUT: %.loc4_10: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_12.2: %tuple.type = tuple_literal (%.loc4_10) [concrete = constants.%tuple] @@ -196,7 +196,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %tuple.type = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %tuple.type = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc5_12.1: type = splice_block %.loc5_12.4 [concrete = constants.%tuple.type] { // CHECK:STDOUT: %.loc5_10: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_12.2: %tuple.type = tuple_literal (%.loc5_10) [concrete = constants.%tuple] @@ -210,15 +210,15 @@ var y: ((), ()) = x; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc4_18.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.1: %tuple.type = tuple_literal (%.loc4_18.1) [concrete = constants.%tuple] -// CHECK:STDOUT: %tuple.elem0.loc4: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.750] +// CHECK:STDOUT: %tuple.elem0.loc4: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.0b5] // CHECK:STDOUT: %.loc4_18.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.2: init %empty_tuple.type = converted %.loc4_18.1, %.loc4_18.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_20.3: init %tuple.type to file.%x.var = tuple_init (%.loc4_20.2) [concrete = constants.%tuple] // CHECK:STDOUT: %.loc4_1: init %tuple.type = converted %.loc4_20.1, %.loc4_20.3 [concrete = constants.%tuple] // CHECK:STDOUT: assign file.%x.var, %.loc4_1 // CHECK:STDOUT: %x.ref: ref %tuple.type = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %tuple.elem0.loc5_16.1: ref %empty_tuple.type = tuple_access %x.ref, element0 [concrete = constants.%tuple.elem0.750] -// CHECK:STDOUT: %tuple.elem0.loc5_16.2: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete = constants.%tuple.elem0.918] +// CHECK:STDOUT: %tuple.elem0.loc5_16.1: ref %empty_tuple.type = tuple_access %x.ref, element0 [concrete = constants.%tuple.elem0.0b5] +// CHECK:STDOUT: %tuple.elem0.loc5_16.2: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete = constants.%tuple.elem0.652] // CHECK:STDOUT: %.loc5_16.1: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_16.2: init %empty_tuple.type = converted %tuple.elem0.loc5_16.1, %.loc5_16.1 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_16.3: init %tuple.type to file.%y.var = tuple_init (%.loc5_16.2) [concrete = constants.%tuple] @@ -239,12 +239,12 @@ var y: ((), ()) = x; // CHECK:STDOUT: %w.patt: %pattern_type = value_binding_pattern w [concrete] // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.475: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete] -// CHECK:STDOUT: %tuple.elem1.6cc: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.3ef: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem1.12a: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete] // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.9a9: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete] -// CHECK:STDOUT: %tuple.elem1.1af: ref %empty_tuple.type = tuple_access file.%y.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.c86: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem1.b9b: ref %empty_tuple.type = tuple_access file.%y.var, element1 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -282,7 +282,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %tuple.type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %tuple.type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc7_15.1: type = splice_block %.loc7_15.5 [concrete = constants.%tuple.type] { // CHECK:STDOUT: %.loc7_10: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_14: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -296,7 +296,7 @@ var y: ((), ()) = x; // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %tuple.type = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %tuple.type = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc8_15.1: type = splice_block %.loc8_15.5 [concrete = constants.%tuple.type] { // CHECK:STDOUT: %.loc8_10: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_14: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] @@ -317,11 +317,11 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc7_21.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_25.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.1: %tuple.type = tuple_literal (%.loc7_21.1, %.loc7_25.1) [concrete = constants.%tuple] -// CHECK:STDOUT: %tuple.elem0.loc7: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.475] +// CHECK:STDOUT: %tuple.elem0.loc7: ref %empty_tuple.type = tuple_access file.%x.var, element0 [concrete = constants.%tuple.elem0.3ef] // CHECK:STDOUT: %.loc7_21.2: init %empty_tuple.type to %tuple.elem0.loc7 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.2: init %empty_tuple.type = converted %.loc7_21.1, %.loc7_21.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.3: init %empty_tuple.type to %tuple.elem0.loc7 = in_place_init %.loc7_26.2 [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %tuple.elem1.loc7: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete = constants.%tuple.elem1.6cc] +// CHECK:STDOUT: %tuple.elem1.loc7: ref %empty_tuple.type = tuple_access file.%x.var, element1 [concrete = constants.%tuple.elem1.12a] // CHECK:STDOUT: %.loc7_25.2: init %empty_tuple.type to %tuple.elem1.loc7 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.4: init %empty_tuple.type = converted %.loc7_25.1, %.loc7_25.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_26.5: init %empty_tuple.type to %tuple.elem1.loc7 = in_place_init %.loc7_26.4 [concrete = constants.%empty_tuple] @@ -329,13 +329,13 @@ var y: ((), ()) = x; // CHECK:STDOUT: %.loc7_1: init %tuple.type = converted %.loc7_26.1, %.loc7_26.6 [concrete = constants.%tuple] // CHECK:STDOUT: assign file.%x.var, %.loc7_1 // CHECK:STDOUT: %x.ref: ref %tuple.type = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %tuple.elem0.loc8_19.1: ref %empty_tuple.type = tuple_access %x.ref, element0 [concrete = constants.%tuple.elem0.475] -// CHECK:STDOUT: %tuple.elem0.loc8_19.2: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete = constants.%tuple.elem0.9a9] +// CHECK:STDOUT: %tuple.elem0.loc8_19.1: ref %empty_tuple.type = tuple_access %x.ref, element0 [concrete = constants.%tuple.elem0.3ef] +// CHECK:STDOUT: %tuple.elem0.loc8_19.2: ref %empty_tuple.type = tuple_access file.%y.var, element0 [concrete = constants.%tuple.elem0.c86] // CHECK:STDOUT: %.loc8_19.1: init %empty_tuple.type to %tuple.elem0.loc8_19.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_19.2: init %empty_tuple.type = converted %tuple.elem0.loc8_19.1, %.loc8_19.1 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_19.3: init %empty_tuple.type to %tuple.elem0.loc8_19.2 = in_place_init %.loc8_19.2 [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %tuple.elem1.loc8_19.1: ref %empty_tuple.type = tuple_access %x.ref, element1 [concrete = constants.%tuple.elem1.6cc] -// CHECK:STDOUT: %tuple.elem1.loc8_19.2: ref %empty_tuple.type = tuple_access file.%y.var, element1 [concrete = constants.%tuple.elem1.1af] +// CHECK:STDOUT: %tuple.elem1.loc8_19.1: ref %empty_tuple.type = tuple_access %x.ref, element1 [concrete = constants.%tuple.elem1.12a] +// CHECK:STDOUT: %tuple.elem1.loc8_19.2: ref %empty_tuple.type = tuple_access file.%y.var, element1 [concrete = constants.%tuple.elem1.b9b] // CHECK:STDOUT: %.loc8_19.4: init %empty_tuple.type to %tuple.elem1.loc8_19.2 = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_19.5: init %empty_tuple.type = converted %tuple.elem1.loc8_19.1, %.loc8_19.4 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_19.6: init %empty_tuple.type to %tuple.elem1.loc8_19.2 = in_place_init %.loc8_19.5 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/tuple/element_access.carbon b/toolchain/check/testdata/tuple/element_access.carbon index b2d3ca80da99..fcb91b9bf2b7 100644 --- a/toolchain/check/testdata/tuple/element_access.carbon +++ b/toolchain/check/testdata/tuple/element_access.carbon @@ -209,7 +209,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete] // CHECK:STDOUT: %tuple.type.a8a: type = tuple_type (%i32) [concrete] // CHECK:STDOUT: %pattern_type.6b6: type = pattern_type %i32 [concrete] -// CHECK:STDOUT: %tuple.elem0.24b: ref %i32 = tuple_access file.%b.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.332: ref %i32 = tuple_access file.%b.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -235,7 +235,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %c.patt: %pattern_type.6b6 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.6b6 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %i32 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %i32 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %i32.loc6: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %c: ref %i32 = wrapper_binding c, %c.var [concrete = %c.var] // CHECK:STDOUT: } @@ -245,7 +245,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: // CHECK:STDOUT: %b.ref: ref %tuple.type.a8a = name_ref b, file.%b [concrete = file.%b.var] // CHECK:STDOUT: %int_0: Core.IntLiteral = int_value 0 [concrete = constants.%int_0] -// CHECK:STDOUT: %tuple.elem0.loc6: ref %i32 = tuple_access %b.ref, element0 [concrete = constants.%tuple.elem0.24b] +// CHECK:STDOUT: %tuple.elem0.loc6: ref %i32 = tuple_access %b.ref, element0 [concrete = constants.%tuple.elem0.332] // CHECK:STDOUT: %.loc6: %i32 = acquire_value %tuple.elem0.loc6 // CHECK:STDOUT: %impl.elem0.loc6: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_15.1: = bound_method %.loc6, %impl.elem0.loc6 @@ -339,14 +339,14 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %b.patt: %pattern_type.6b6 = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.6b6 = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %i32 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %i32 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %b: ref %i32 = wrapper_binding b, %b.var [concrete = %b.var] // CHECK:STDOUT: name_binding_decl { // CHECK:STDOUT: %c.patt: %pattern_type.cb1 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.cb1 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %empty_tuple.type = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -356,7 +356,7 @@ var b: i32 = a.({.index = 2}.index); // CHECK:STDOUT: %d.patt: %pattern_type.6b6 = ref_binding_pattern d [concrete = constants.%d.patt] // CHECK:STDOUT: %d.var_patt: %pattern_type.6b6 = var_pattern %d.patt [concrete = constants.%d.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %d.var: ref %i32 = var %d.var_patt [concrete] +// CHECK:STDOUT: %d.var: ref %i32 = var_storage %d.var_patt [concrete] // CHECK:STDOUT: %i32.loc7: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %d: ref %i32 = wrapper_binding d, %d.var [concrete = %d.var] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/tuple/import.carbon b/toolchain/check/testdata/tuple/import.carbon index ec026a11a09b..6d4b68910351 100644 --- a/toolchain/check/testdata/tuple/import.carbon +++ b/toolchain/check/testdata/tuple/import.carbon @@ -98,7 +98,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %a.var_patt: %pattern_type.e71 = var_pattern %a.patt [concrete] // CHECK:STDOUT: %a_ref.patt: %pattern_type.e71 = ref_binding_pattern a_ref [concrete] // CHECK:STDOUT: %a_ref.var_patt: %pattern_type.e71 = var_pattern %a_ref.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.8b2: ref %i32 = tuple_access imports.%a_ref.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.4b5: ref %i32 = tuple_access imports.%a_ref.var, element0 [concrete] // CHECK:STDOUT: %Copy.type: type = facet_type <@Copy> [concrete] // CHECK:STDOUT: %Int.as.Copy.impl.Op.type.ac8: type = fn_type @Int.as.Copy.impl.Op, @Int.as.Copy.impl(%N) [symbolic] // CHECK:STDOUT: %Int.as.Copy.impl.Op.5e0: %Int.as.Copy.impl.Op.type.ac8 = struct_value () [symbolic] @@ -123,19 +123,19 @@ fn F() -> (i32,) { // CHECK:STDOUT: %b.var_patt: %pattern_type.05e = var_pattern %b.patt [concrete] // CHECK:STDOUT: %b_ref.patt: %pattern_type.05e = ref_binding_pattern b_ref [concrete] // CHECK:STDOUT: %b_ref.var_patt: %pattern_type.05e = var_pattern %b_ref.patt [concrete] -// CHECK:STDOUT: %tuple.elem0.383: ref %tuple.type.cc8 = tuple_access imports.%b_ref.var, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.92c: ref %tuple.type.cc8 = tuple_access file.%b.var, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.0e5: ref %tuple.type.a8a = tuple_access %tuple.elem0.383, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.1a7: ref %tuple.type.a8a = tuple_access %tuple.elem0.92c, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.3c8: ref %i32 = tuple_access %tuple.elem0.0e5, element0 [concrete] -// CHECK:STDOUT: %tuple.elem1.b0c: ref %i32 = tuple_access %tuple.elem0.383, element1 [concrete] -// CHECK:STDOUT: %tuple.elem1.03c: ref %i32 = tuple_access %tuple.elem0.92c, element1 [concrete] -// CHECK:STDOUT: %tuple.elem1.9f7: ref %tuple.type.e55 = tuple_access imports.%b_ref.var, element1 [concrete] -// CHECK:STDOUT: %tuple.elem1.cfa: ref %tuple.type.e55 = tuple_access file.%b.var, element1 [concrete] -// CHECK:STDOUT: %tuple.elem0.c7d: ref %i32 = tuple_access %tuple.elem1.9f7, element0 [concrete] -// CHECK:STDOUT: %tuple.elem0.c91: ref %i32 = tuple_access %tuple.elem1.cfa, element0 [concrete] -// CHECK:STDOUT: %tuple.elem1.576: ref %i32 = tuple_access %tuple.elem1.9f7, element1 [concrete] -// CHECK:STDOUT: %tuple.elem1.c82: ref %i32 = tuple_access %tuple.elem1.cfa, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.35b: ref %tuple.type.cc8 = tuple_access imports.%b_ref.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.de8: ref %tuple.type.cc8 = tuple_access file.%b.var, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.d1c: ref %tuple.type.a8a = tuple_access %tuple.elem0.35b, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.760: ref %tuple.type.a8a = tuple_access %tuple.elem0.de8, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.ee8: ref %i32 = tuple_access %tuple.elem0.d1c, element0 [concrete] +// CHECK:STDOUT: %tuple.elem1.7f0: ref %i32 = tuple_access %tuple.elem0.35b, element1 [concrete] +// CHECK:STDOUT: %tuple.elem1.3da: ref %i32 = tuple_access %tuple.elem0.de8, element1 [concrete] +// CHECK:STDOUT: %tuple.elem1.3ba: ref %tuple.type.e55 = tuple_access imports.%b_ref.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem1.7c1: ref %tuple.type.e55 = tuple_access file.%b.var, element1 [concrete] +// CHECK:STDOUT: %tuple.elem0.179: ref %i32 = tuple_access %tuple.elem1.3ba, element0 [concrete] +// CHECK:STDOUT: %tuple.elem0.ce1: ref %i32 = tuple_access %tuple.elem1.7c1, element0 [concrete] +// CHECK:STDOUT: %tuple.elem1.fa9: ref %i32 = tuple_access %tuple.elem1.3ba, element1 [concrete] +// CHECK:STDOUT: %tuple.elem1.f93: ref %i32 = tuple_access %tuple.elem1.7c1, element1 [concrete] // CHECK:STDOUT: %C.type: type = generic_class_type @C [concrete] // CHECK:STDOUT: %C.generic: %C.type = struct_value () [concrete] // CHECK:STDOUT: %int_1.5b8: Core.IntLiteral = int_value 1 [concrete] @@ -172,10 +172,10 @@ fn F() -> (i32,) { // CHECK:STDOUT: %Implicit.F: %F.type = import_ref Implicit//default, F, loaded [concrete = constants.%F] // CHECK:STDOUT: %Implicit.import_ref.717: @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert.type (%Core.IntLiteral.as.ImplicitAs.impl.Convert.type.e74) = import_ref Implicit//default, inst{{[0-9A-F]+}} [indirect], loaded [symbolic = @Core.IntLiteral.as.ImplicitAs.impl.%Core.IntLiteral.as.ImplicitAs.impl.Convert (constants.%Core.IntLiteral.as.ImplicitAs.impl.Convert.845)] // CHECK:STDOUT: %ImplicitAs.impl_witness_table.1f3 = impl_witness_table (%Implicit.import_ref.717), @Core.IntLiteral.as.ImplicitAs.impl [concrete] -// CHECK:STDOUT: %a_ref.var: ref %tuple.type.a8a = var constants.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %tuple.type.a8a = var_storage constants.%a_ref.var_patt [concrete] // CHECK:STDOUT: %Core.import_ref.cd6: @Int.as.Copy.impl.%Int.as.Copy.impl.Op.type (%Int.as.Copy.impl.Op.type.ac8) = import_ref Core//prelude/parts/int, loc{{\d+_\d+}}, loaded [symbolic = @Int.as.Copy.impl.%Int.as.Copy.impl.Op (constants.%Int.as.Copy.impl.Op.5e0)] // CHECK:STDOUT: %Copy.impl_witness_table.367 = impl_witness_table (%Core.import_ref.cd6), @Int.as.Copy.impl [concrete] -// CHECK:STDOUT: %b_ref.var: ref %tuple.type.e23 = var constants.%b_ref.var_patt [concrete] +// CHECK:STDOUT: %b_ref.var: ref %tuple.type.e23 = var_storage constants.%b_ref.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -183,7 +183,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %a.patt: %pattern_type.e71 = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type.e71 = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %tuple.type.a8a = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %tuple.type.a8a = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc5_13.1: type = splice_block %.loc5_13.3 [concrete = constants.%tuple.type.a8a] { // CHECK:STDOUT: %i32.loc5: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc5_13.2: %tuple.type.85c = tuple_literal (%i32.loc5) [concrete = constants.%tuple.19c] @@ -194,7 +194,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %b.patt: %pattern_type.05e = ref_binding_pattern b [concrete = constants.%b.patt] // CHECK:STDOUT: %b.var_patt: %pattern_type.05e = var_pattern %b.patt [concrete = constants.%b.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %b.var: ref %tuple.type.e23 = var %b.var_patt [concrete] +// CHECK:STDOUT: %b.var: ref %tuple.type.e23 = var_storage %b.var_patt [concrete] // CHECK:STDOUT: %.loc6_34.1: type = splice_block %.loc6_34.6 [concrete = constants.%tuple.type.e23] { // CHECK:STDOUT: %i32.loc6_11: type = type_literal constants.%i32 [concrete = constants.%i32] // CHECK:STDOUT: %.loc6_15: %tuple.type.85c = tuple_literal (%i32.loc6_11) [concrete = constants.%tuple.19c] @@ -214,7 +214,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: %c.patt: %pattern_type.717 = ref_binding_pattern c [concrete = constants.%c.patt] // CHECK:STDOUT: %c.var_patt: %pattern_type.717 = var_pattern %c.patt [concrete = constants.%c.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %c.var: ref %C.372 = var %c.var_patt [concrete] +// CHECK:STDOUT: %c.var: ref %C.372 = var_storage %c.var_patt [concrete] // CHECK:STDOUT: %.loc7_16.1: type = splice_block %C [concrete = constants.%C.372] { // CHECK:STDOUT: %C.ref: %C.type = name_ref C, imports.%Implicit.C [concrete = constants.%C.generic] // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] @@ -244,7 +244,7 @@ fn F() -> (i32,) { // CHECK:STDOUT: fn @__global_init() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %a_ref.ref: ref %tuple.type.a8a = name_ref a_ref, imports.%Implicit.a_ref [concrete = imports.%a_ref.var] -// CHECK:STDOUT: %tuple.elem0.loc5: ref %i32 = tuple_access %a_ref.ref, element0 [concrete = constants.%tuple.elem0.8b2] +// CHECK:STDOUT: %tuple.elem0.loc5: ref %i32 = tuple_access %a_ref.ref, element0 [concrete = constants.%tuple.elem0.4b5] // CHECK:STDOUT: %.loc5_17.1: %i32 = acquire_value %tuple.elem0.loc5 // CHECK:STDOUT: %impl.elem0.loc5: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc5_17.1: = bound_method %.loc5_17.1, %impl.elem0.loc5 @@ -255,50 +255,50 @@ fn F() -> (i32,) { // CHECK:STDOUT: %.loc5_1: init %tuple.type.a8a = converted %a_ref.ref, %.loc5_17.2 // CHECK:STDOUT: assign file.%a.var, %.loc5_1 // CHECK:STDOUT: %b_ref.ref: ref %tuple.type.e23 = name_ref b_ref, imports.%Implicit.b_ref [concrete = imports.%b_ref.var] -// CHECK:STDOUT: %tuple.elem0.loc6_38.1: ref %tuple.type.cc8 = tuple_access %b_ref.ref, element0 [concrete = constants.%tuple.elem0.383] -// CHECK:STDOUT: %tuple.elem0.loc6_38.2: ref %tuple.type.a8a = tuple_access %tuple.elem0.loc6_38.1, element0 [concrete = constants.%tuple.elem0.0e5] -// CHECK:STDOUT: %tuple.elem0.loc6_38.3: ref %i32 = tuple_access %tuple.elem0.loc6_38.2, element0 [concrete = constants.%tuple.elem0.3c8] +// CHECK:STDOUT: %tuple.elem0.loc6_38.1: ref %tuple.type.cc8 = tuple_access %b_ref.ref, element0 [concrete = constants.%tuple.elem0.35b] +// CHECK:STDOUT: %tuple.elem0.loc6_38.2: ref %tuple.type.a8a = tuple_access %tuple.elem0.loc6_38.1, element0 [concrete = constants.%tuple.elem0.d1c] +// CHECK:STDOUT: %tuple.elem0.loc6_38.3: ref %i32 = tuple_access %tuple.elem0.loc6_38.2, element0 [concrete = constants.%tuple.elem0.ee8] // CHECK:STDOUT: %.loc6_38.1: %i32 = acquire_value %tuple.elem0.loc6_38.3 // CHECK:STDOUT: %impl.elem0.loc6_38.1: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_38.1: = bound_method %.loc6_38.1, %impl.elem0.loc6_38.1 // CHECK:STDOUT: %specific_fn.loc6_38.1: = specific_function %impl.elem0.loc6_38.1, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_38.2: = bound_method %.loc6_38.1, %specific_fn.loc6_38.1 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_38.1: init %i32 = call %bound_method.loc6_38.2(%.loc6_38.1) -// CHECK:STDOUT: %tuple.elem0.loc6_38.4: ref %tuple.type.cc8 = tuple_access file.%b.var, element0 [concrete = constants.%tuple.elem0.92c] -// CHECK:STDOUT: %tuple.elem0.loc6_38.5: ref %tuple.type.a8a = tuple_access %tuple.elem0.loc6_38.4, element0 [concrete = constants.%tuple.elem0.1a7] +// CHECK:STDOUT: %tuple.elem0.loc6_38.4: ref %tuple.type.cc8 = tuple_access file.%b.var, element0 [concrete = constants.%tuple.elem0.de8] +// CHECK:STDOUT: %tuple.elem0.loc6_38.5: ref %tuple.type.a8a = tuple_access %tuple.elem0.loc6_38.4, element0 [concrete = constants.%tuple.elem0.760] // CHECK:STDOUT: %.loc6_38.2: init %tuple.type.a8a to %tuple.elem0.loc6_38.5 = tuple_init (%Int.as.Copy.impl.Op.call.loc6_38.1) // CHECK:STDOUT: %.loc6_38.3: init %tuple.type.a8a = converted %tuple.elem0.loc6_38.2, %.loc6_38.2 // CHECK:STDOUT: %.loc6_38.4: init %tuple.type.a8a to %tuple.elem0.loc6_38.5 = in_place_init %.loc6_38.3 -// CHECK:STDOUT: %tuple.elem1.loc6_38.1: ref %i32 = tuple_access %tuple.elem0.loc6_38.1, element1 [concrete = constants.%tuple.elem1.b0c] +// CHECK:STDOUT: %tuple.elem1.loc6_38.1: ref %i32 = tuple_access %tuple.elem0.loc6_38.1, element1 [concrete = constants.%tuple.elem1.7f0] // CHECK:STDOUT: %.loc6_38.5: %i32 = acquire_value %tuple.elem1.loc6_38.1 // CHECK:STDOUT: %impl.elem0.loc6_38.2: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_38.3: = bound_method %.loc6_38.5, %impl.elem0.loc6_38.2 // CHECK:STDOUT: %specific_fn.loc6_38.2: = specific_function %impl.elem0.loc6_38.2, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_38.4: = bound_method %.loc6_38.5, %specific_fn.loc6_38.2 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_38.2: init %i32 = call %bound_method.loc6_38.4(%.loc6_38.5) -// CHECK:STDOUT: %tuple.elem1.loc6_38.2: ref %i32 = tuple_access %tuple.elem0.loc6_38.4, element1 [concrete = constants.%tuple.elem1.03c] +// CHECK:STDOUT: %tuple.elem1.loc6_38.2: ref %i32 = tuple_access %tuple.elem0.loc6_38.4, element1 [concrete = constants.%tuple.elem1.3da] // CHECK:STDOUT: %.loc6_38.6: init %i32 to %tuple.elem1.loc6_38.2 = in_place_init %Int.as.Copy.impl.Op.call.loc6_38.2 // CHECK:STDOUT: %.loc6_38.7: init %tuple.type.cc8 to %tuple.elem0.loc6_38.4 = tuple_init (%.loc6_38.4, %.loc6_38.6) // CHECK:STDOUT: %.loc6_38.8: init %tuple.type.cc8 = converted %tuple.elem0.loc6_38.1, %.loc6_38.7 -// CHECK:STDOUT: %tuple.elem1.loc6_38.3: ref %tuple.type.e55 = tuple_access %b_ref.ref, element1 [concrete = constants.%tuple.elem1.9f7] -// CHECK:STDOUT: %tuple.elem0.loc6_38.6: ref %i32 = tuple_access %tuple.elem1.loc6_38.3, element0 [concrete = constants.%tuple.elem0.c7d] +// CHECK:STDOUT: %tuple.elem1.loc6_38.3: ref %tuple.type.e55 = tuple_access %b_ref.ref, element1 [concrete = constants.%tuple.elem1.3ba] +// CHECK:STDOUT: %tuple.elem0.loc6_38.6: ref %i32 = tuple_access %tuple.elem1.loc6_38.3, element0 [concrete = constants.%tuple.elem0.179] // CHECK:STDOUT: %.loc6_38.9: %i32 = acquire_value %tuple.elem0.loc6_38.6 // CHECK:STDOUT: %impl.elem0.loc6_38.3: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_38.5: = bound_method %.loc6_38.9, %impl.elem0.loc6_38.3 // CHECK:STDOUT: %specific_fn.loc6_38.3: = specific_function %impl.elem0.loc6_38.3, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_38.6: = bound_method %.loc6_38.9, %specific_fn.loc6_38.3 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_38.3: init %i32 = call %bound_method.loc6_38.6(%.loc6_38.9) -// CHECK:STDOUT: %tuple.elem1.loc6_38.4: ref %tuple.type.e55 = tuple_access file.%b.var, element1 [concrete = constants.%tuple.elem1.cfa] -// CHECK:STDOUT: %tuple.elem0.loc6_38.7: ref %i32 = tuple_access %tuple.elem1.loc6_38.4, element0 [concrete = constants.%tuple.elem0.c91] +// CHECK:STDOUT: %tuple.elem1.loc6_38.4: ref %tuple.type.e55 = tuple_access file.%b.var, element1 [concrete = constants.%tuple.elem1.7c1] +// CHECK:STDOUT: %tuple.elem0.loc6_38.7: ref %i32 = tuple_access %tuple.elem1.loc6_38.4, element0 [concrete = constants.%tuple.elem0.ce1] // CHECK:STDOUT: %.loc6_38.10: init %i32 to %tuple.elem0.loc6_38.7 = in_place_init %Int.as.Copy.impl.Op.call.loc6_38.3 -// CHECK:STDOUT: %tuple.elem1.loc6_38.5: ref %i32 = tuple_access %tuple.elem1.loc6_38.3, element1 [concrete = constants.%tuple.elem1.576] +// CHECK:STDOUT: %tuple.elem1.loc6_38.5: ref %i32 = tuple_access %tuple.elem1.loc6_38.3, element1 [concrete = constants.%tuple.elem1.fa9] // CHECK:STDOUT: %.loc6_38.11: %i32 = acquire_value %tuple.elem1.loc6_38.5 // CHECK:STDOUT: %impl.elem0.loc6_38.4: %.7a6 = impl_witness_access constants.%Copy.impl_witness.0e0, element0 [concrete = constants.%Int.as.Copy.impl.Op.4f6] // CHECK:STDOUT: %bound_method.loc6_38.7: = bound_method %.loc6_38.11, %impl.elem0.loc6_38.4 // CHECK:STDOUT: %specific_fn.loc6_38.4: = specific_function %impl.elem0.loc6_38.4, @Int.as.Copy.impl.Op(constants.%int_32) [concrete = constants.%Int.as.Copy.impl.Op.specific_fn] // CHECK:STDOUT: %bound_method.loc6_38.8: = bound_method %.loc6_38.11, %specific_fn.loc6_38.4 // CHECK:STDOUT: %Int.as.Copy.impl.Op.call.loc6_38.4: init %i32 = call %bound_method.loc6_38.8(%.loc6_38.11) -// CHECK:STDOUT: %tuple.elem1.loc6_38.6: ref %i32 = tuple_access %tuple.elem1.loc6_38.4, element1 [concrete = constants.%tuple.elem1.c82] +// CHECK:STDOUT: %tuple.elem1.loc6_38.6: ref %i32 = tuple_access %tuple.elem1.loc6_38.4, element1 [concrete = constants.%tuple.elem1.f93] // CHECK:STDOUT: %.loc6_38.12: init %i32 to %tuple.elem1.loc6_38.6 = in_place_init %Int.as.Copy.impl.Op.call.loc6_38.4 // CHECK:STDOUT: %.loc6_38.13: init %tuple.type.e55 to %tuple.elem1.loc6_38.4 = tuple_init (%.loc6_38.10, %.loc6_38.12) // CHECK:STDOUT: %.loc6_38.14: init %tuple.type.e55 = converted %tuple.elem1.loc6_38.3, %.loc6_38.13 diff --git a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon index 9eddc10c02ed..079dded44305 100644 --- a/toolchain/check/testdata/tuple/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/tuple/in_place_tuple_init.carbon @@ -90,7 +90,7 @@ fn H() { // CHECK:STDOUT: %v.patt: %pattern_type.394 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.394 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %tuple.type.e55 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %tuple.type.e55 = var_storage %v.var_patt // CHECK:STDOUT: %F.ref.loc7: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %.loc7_3: ref %tuple.type.e55 = splice_block %v.var {} // CHECK:STDOUT: %F.call.loc7: init %tuple.type.e55 to %.loc7_3 = call %F.ref.loc7() @@ -207,7 +207,7 @@ fn H() { // CHECK:STDOUT: %v.patt: %pattern_type.e12 = ref_binding_pattern v [concrete = constants.%v.patt.dde] // CHECK:STDOUT: %v.var_patt: %pattern_type.e12 = var_pattern %v.patt [concrete = constants.%v.var_patt.678] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %tuple.type.015 = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %tuple.type.015 = var_storage %v.var_patt // CHECK:STDOUT: %F.ref.loc7_55: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %tuple.elem0: ref %tuple.type.555 = tuple_access %v.var, element0 // CHECK:STDOUT: %F.call.loc7_57: init %tuple.type.555 to %tuple.elem0 = call %F.ref.loc7_55() @@ -261,7 +261,7 @@ fn H() { // CHECK:STDOUT: %v.patt: %pattern_type.f8e = ref_binding_pattern v [concrete = constants.%v.patt.7e2] // CHECK:STDOUT: %v.var_patt: %pattern_type.f8e = var_pattern %v.patt [concrete = constants.%v.var_patt.409] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %tuple.type.b7e = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %tuple.type.b7e = var_storage %v.var_patt // CHECK:STDOUT: %int_1: Core.IntLiteral = int_value 1 [concrete = constants.%int_1.5b8] // CHECK:STDOUT: %F.ref: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %tuple.elem1: ref %tuple.type.555 = tuple_access %v.var, element1 diff --git a/toolchain/check/testdata/tuple/tuple_pattern.carbon b/toolchain/check/testdata/tuple/tuple_pattern.carbon index 3533a4540d68..0b133617ef99 100644 --- a/toolchain/check/testdata/tuple/tuple_pattern.carbon +++ b/toolchain/check/testdata/tuple/tuple_pattern.carbon @@ -150,7 +150,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc7_34: %pattern_type.de4 = tuple_pattern (%a.patt, %b.patt) [concrete = constants.%.763] // CHECK:STDOUT: %.var_patt.loc7: %pattern_type.de4 = var_pattern %.loc7_34 [concrete = constants.%.var_patt.cb3] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var.loc7: ref %tuple.type.b6b = var %.var_patt.loc7 +// CHECK:STDOUT: %.var.loc7: ref %tuple.type.b6b = var_storage %.var_patt.loc7 // CHECK:STDOUT: %v.ref: %tuple.type.b6b = name_ref v, %v // CHECK:STDOUT: %tuple.elem0.loc7_38.1: %empty_struct_type = tuple_access %v.ref, element0 // CHECK:STDOUT: %tuple.elem0.loc7_38.2: ref %empty_struct_type = tuple_access %.var.loc7, element0 @@ -183,7 +183,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc8_34: %pattern_type.de4 = tuple_pattern (%c.patt, %d.patt) [concrete = constants.%.a7b] // CHECK:STDOUT: %.var_patt.loc8: %pattern_type.de4 = var_pattern %.loc8_34 [concrete = constants.%.var_patt.288] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var.loc8: ref %tuple.type.b6b = var %.var_patt.loc8 +// CHECK:STDOUT: %.var.loc8: ref %tuple.type.b6b = var_storage %.var_patt.loc8 // CHECK:STDOUT: %.loc8_40.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_44.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc8_45.1: %tuple.type.b6b = tuple_literal (%.loc8_40.1, %.loc8_44.1) [concrete = constants.%tuple] @@ -261,7 +261,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %tuple.patt: %pattern_type.de4 = ref_binding_pattern tuple [concrete = constants.%tuple.patt.3eb] // CHECK:STDOUT: %tuple.var_patt: %pattern_type.de4 = var_pattern %tuple.patt [concrete = constants.%tuple.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %tuple.var: ref %tuple.type.b6b = var %tuple.var_patt +// CHECK:STDOUT: %tuple.var: ref %tuple.type.b6b = var_storage %tuple.var_patt // CHECK:STDOUT: %.loc6_27.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_31.1: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc6_32.1: %tuple.type.b6b = tuple_literal (%.loc6_27.1, %.loc6_31.1) [concrete = constants.%tuple] @@ -291,7 +291,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc7_34: %pattern_type.de4 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.4ca32d.1] // CHECK:STDOUT: %.var_patt: %pattern_type.de4 = var_pattern %.loc7_34 [concrete = constants.%.var_patt.c3725e.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var %.var_patt +// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var_storage %.var_patt // CHECK:STDOUT: %tuple.ref: ref %tuple.type.b6b = name_ref tuple, %tuple // CHECK:STDOUT: %tuple.elem0.loc7_38.1: ref %empty_struct_type = tuple_access %tuple.ref, element0 // CHECK:STDOUT: %tuple.elem0.loc7_38.2: ref %empty_struct_type = tuple_access %.var, element0 @@ -361,7 +361,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc14_34: %pattern_type.de4 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.4ca32d.2] // CHECK:STDOUT: %.var_patt: %pattern_type.de4 = var_pattern %.loc14_34 [concrete = constants.%.var_patt.c3725e.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var %.var_patt +// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var_storage %.var_patt // CHECK:STDOUT: %tuple.ref: %tuple.type.b6b = name_ref tuple, %tuple.loc13_12 // CHECK:STDOUT: %tuple.elem0.loc14_38.1: %empty_struct_type = tuple_access %tuple.ref, element0 // CHECK:STDOUT: %tuple.elem0.loc14_38.2: ref %empty_struct_type = tuple_access %.var, element0 @@ -401,7 +401,7 @@ let (a: {}, b: {}) = ({}, {}, {}); // CHECK:STDOUT: %.loc22_34: %pattern_type.de4 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.4ca32d.3] // CHECK:STDOUT: %.var_patt: %pattern_type.de4 = var_pattern %.loc22_34 [concrete = constants.%.var_patt.c3725e.3] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var %.var_patt +// CHECK:STDOUT: %.var: ref %tuple.type.b6b = var_storage %.var_patt // CHECK:STDOUT: %MakeTuple.ref: %MakeTuple.type = name_ref MakeTuple, file.%MakeTuple.decl [concrete = constants.%MakeTuple] // CHECK:STDOUT: %.loc22_3: ref %tuple.type.b6b = splice_block %.var {} // CHECK:STDOUT: %MakeTuple.call: init %tuple.type.b6b to %.loc22_3 = call %MakeTuple.ref() diff --git a/toolchain/check/testdata/var/export_name.carbon b/toolchain/check/testdata/var/export_name.carbon index db9ab5a9f5c8..882037c7f569 100644 --- a/toolchain/check/testdata/var/export_name.carbon +++ b/toolchain/check/testdata/var/export_name.carbon @@ -82,7 +82,7 @@ var w: () = v; // CHECK:STDOUT: %v.patt: %pattern_type.cb1 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.cb1 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -117,7 +117,7 @@ var w: () = v; // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var constants.%v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage constants.%v.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -148,7 +148,7 @@ var w: () = v; // CHECK:STDOUT: import Core//prelude // CHECK:STDOUT: import Core//prelude/... // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var constants.%v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage constants.%v.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -163,7 +163,7 @@ var w: () = v; // CHECK:STDOUT: %w.patt: %pattern_type = ref_binding_pattern w [concrete = constants.%w.patt] // CHECK:STDOUT: %w.var_patt: %pattern_type = var_pattern %w.patt [concrete = constants.%w.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %w.var: ref %empty_tuple.type = var %w.var_patt [concrete] +// CHECK:STDOUT: %w.var: ref %empty_tuple.type = var_storage %w.var_patt [concrete] // CHECK:STDOUT: %.loc6_9.1: type = splice_block %.loc6_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc6_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc6_9.3: type = converted %.loc6_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 1ac170cd4ee9..127614ea9330 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDOUT: %x.patt.loc3: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt.06838d.1] // CHECK:STDOUT: %x.var_patt.loc3: %pattern_type.cb1 = var_pattern %x.patt.loc3 [concrete = constants.%x.var_patt.28d573.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var.loc3: ref %empty_tuple.type = var %x.var_patt.loc3 +// CHECK:STDOUT: %x.var.loc3: ref %empty_tuple.type = var_storage %x.var_patt.loc3 // CHECK:STDOUT: %.loc3_23.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc3_23.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc3_3: init %empty_tuple.type = converted %.loc3_23.1, %.loc3_23.2 [concrete = constants.%empty_tuple] @@ -81,7 +81,7 @@ fn Main() { // CHECK:STDOUT: %x.patt.loc11: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt.06838d.2] // CHECK:STDOUT: %x.var_patt.loc11: %pattern_type.cb1 = var_pattern %x.patt.loc11 [concrete = constants.%x.var_patt.28d573.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var.loc11: ref %empty_tuple.type = var %x.var_patt.loc11 +// CHECK:STDOUT: %x.var.loc11: ref %empty_tuple.type = var_storage %x.var_patt.loc11 // CHECK:STDOUT: %.loc11_23.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_23.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc11_3: init %empty_tuple.type = converted %.loc11_23.1, %.loc11_23.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index b8b326b72322..f5a6ddef0635 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -54,7 +54,7 @@ var x: {} = (); // CHECK:STDOUT: %x.patt: %pattern_type.a96 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.a96 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_struct_type = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %empty_struct_type = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc22_9.1: type = splice_block %.loc22_9.3 [concrete = constants.%empty_struct_type] { // CHECK:STDOUT: %.loc22_9.2: %empty_struct_type = struct_literal () [concrete = constants.%empty_struct] // CHECK:STDOUT: %.loc22_9.3: type = converted %.loc22_9.2, constants.%empty_struct_type [concrete = constants.%empty_struct_type] diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index fde45619a907..dfadfcd80f11 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -68,7 +68,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.cb1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt // CHECK:STDOUT: %x.ref: = name_ref x, [concrete = ] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %.loc14_18.1: type = splice_block %.loc14_18.3 [concrete = constants.%empty_tuple.type] { diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 6364eb6f9133..2ae8dad073c3 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -60,7 +60,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: = ref_binding_pattern x [concrete = ] // CHECK:STDOUT: %x.var_patt: = var_pattern %x.patt [concrete = ] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref = var %x.var_patt [concrete = ] +// CHECK:STDOUT: %x.var: ref = var_storage %x.var_patt [concrete = ] // CHECK:STDOUT: %int_1.loc23_21: Core.IntLiteral = int_value 1 [concrete = constants.%int_1] // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: %.1: = splice_block [concrete = ] { diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index 946668a63985..ab400be28a1f 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -24,7 +24,7 @@ var x: {.v: ()} = {.v = ()}; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] // CHECK:STDOUT: %struct: %struct_type.v = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.267: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.7ba: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -32,7 +32,7 @@ var x: {.v: ()} = {.v = ()}; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.v = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.v = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc14_15: type = splice_block %struct_type.v [concrete = constants.%struct_type.v] { // CHECK:STDOUT: %.loc14_14.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_14.2: type = converted %.loc14_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -45,7 +45,7 @@ var x: {.v: ()} = {.v = ()}; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc14_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_27.1: %struct_type.v = struct_literal (%.loc14_26.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc14_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc14_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc14_26.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_27.3: init %empty_tuple.type = converted %.loc14_26.1, %.loc14_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc14_27.4: init %struct_type.v to file.%x.var = struct_init (%.loc14_27.3) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/var/global_decl_import.carbon b/toolchain/check/testdata/var/global_decl_import.carbon index a82034eae67f..e59c22915c70 100644 --- a/toolchain/check/testdata/var/global_decl_import.carbon +++ b/toolchain/check/testdata/var/global_decl_import.carbon @@ -37,19 +37,19 @@ fn G() -> {.v: ()} { // CHECK:STDOUT: %pattern_type: type = pattern_type %struct_type.v [concrete] // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] -// CHECK:STDOUT: %.267: ref %empty_tuple.type = struct_access imports.%x.var, element0 [concrete] +// CHECK:STDOUT: %.7ba: ref %empty_tuple.type = struct_access imports.%x.var, element0 [concrete] // CHECK:STDOUT: %struct: %struct_type.v = struct_value (%empty_tuple) [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Main.x: ref %struct_type.v = import_ref Main//decl, x, loaded [concrete = %x.var] -// CHECK:STDOUT: %x.var: ref %struct_type.v = var constants.%x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.v = var_storage constants.%x.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> out %return.param: %struct_type.v { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %x.ref: ref %struct_type.v = name_ref x, imports.%Main.x [concrete = imports.%x.var] -// CHECK:STDOUT: %.loc8_10.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc8_10.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc8_10.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_10.3: init %empty_tuple.type = converted %.loc8_10.1, %.loc8_10.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_10.4: init %struct_type.v = struct_init (%.loc8_10.3) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 421b5a1796d4..bb684c50d7f6 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -40,7 +40,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] // CHECK:STDOUT: %struct: %struct_type.v = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.267: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.7ba: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -51,7 +51,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.v = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.v = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc4_15: type = splice_block %struct_type.v [concrete = constants.%struct_type.v] { // CHECK:STDOUT: %.loc4_14.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_14.2: type = converted %.loc4_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -64,7 +64,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc4_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_27.1: %struct_type.v = struct_literal (%.loc4_26.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc4_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc4_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc4_26.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_27.3: init %empty_tuple.type = converted %.loc4_26.1, %.loc4_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_27.4: init %struct_type.v to file.%x.var = struct_init (%.loc4_27.3) [concrete = constants.%struct] @@ -99,7 +99,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %y.var_patt: %pattern_type.cb1 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: %.loc4_22: %pattern_type.5b8 = tuple_pattern (%x.patt, %y.var_patt) [concrete = constants.%.311] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_28: %empty_tuple.type = converted @__global_init.%.loc4_28, %empty_tuple [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.1: type = splice_block %.loc4_10.3 [concrete = constants.%empty_tuple.type] { @@ -153,7 +153,7 @@ var (x: (), y: ()) = ((), ()); // CHECK:STDOUT: %.loc4_18: %pattern_type.5b8 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.c88] // CHECK:STDOUT: %.var_patt: %pattern_type.5b8 = var_pattern %.loc4_18 [concrete = constants.%.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type = var %.var_patt [concrete] +// CHECK:STDOUT: %.var: ref %tuple.type = var_storage %.var_patt [concrete] // CHECK:STDOUT: %tuple.elem0: ref %empty_tuple.type = tuple_access %.var, element0 [concrete = constants.%tuple.elem0] // CHECK:STDOUT: %tuple.elem1: ref %empty_tuple.type = tuple_access %.var, element1 [concrete = constants.%tuple.elem1] // CHECK:STDOUT: %.loc4_10.1: type = splice_block %.loc4_10.3 [concrete = constants.%empty_tuple.type] { diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index e912c6a61fde..69ae164429fe 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -25,10 +25,10 @@ var y: {.v: ()} = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete] // CHECK:STDOUT: %struct: %struct_type.v = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.267: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.7ba: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete] -// CHECK:STDOUT: %.268: ref %empty_tuple.type = struct_access file.%y.var, element0 [concrete] +// CHECK:STDOUT: %.eff: ref %empty_tuple.type = struct_access file.%y.var, element0 [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -40,7 +40,7 @@ var y: {.v: ()} = x; // CHECK:STDOUT: %x.patt: %pattern_type = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.v = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.v = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc15_15: type = splice_block %struct_type.v.loc15 [concrete = constants.%struct_type.v] { // CHECK:STDOUT: %.loc15_14.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_14.2: type = converted %.loc15_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -51,7 +51,7 @@ var y: {.v: ()} = x; // CHECK:STDOUT: %y.patt: %pattern_type = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.v = var %y.var_patt [concrete] +// CHECK:STDOUT: %y.var: ref %struct_type.v = var_storage %y.var_patt [concrete] // CHECK:STDOUT: %.loc16_15: type = splice_block %struct_type.v.loc16 [concrete = constants.%struct_type.v] { // CHECK:STDOUT: %.loc16_14.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_14.2: type = converted %.loc16_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -64,15 +64,15 @@ var y: {.v: ()} = x; // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc15_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_27.1: %struct_type.v = struct_literal (%.loc15_26.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc15_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc15_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc15_26.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_27.3: init %empty_tuple.type = converted %.loc15_26.1, %.loc15_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc15_27.4: init %struct_type.v to file.%x.var = struct_init (%.loc15_27.3) [concrete = constants.%struct] // CHECK:STDOUT: %.loc15_1: init %struct_type.v = converted %.loc15_27.1, %.loc15_27.4 [concrete = constants.%struct] // CHECK:STDOUT: assign file.%x.var, %.loc15_1 // CHECK:STDOUT: %x.ref: ref %struct_type.v = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc16_19.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.267] -// CHECK:STDOUT: %.loc16_19.2: ref %empty_tuple.type = struct_access file.%y.var, element0 [concrete = constants.%.268] +// CHECK:STDOUT: %.loc16_19.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.7ba] +// CHECK:STDOUT: %.loc16_19.2: ref %empty_tuple.type = struct_access file.%y.var, element0 [concrete = constants.%.eff] // CHECK:STDOUT: %.loc16_19.3: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_19.4: init %empty_tuple.type = converted %.loc16_19.1, %.loc16_19.3 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_19.5: init %struct_type.v to file.%y.var = struct_init (%.loc16_19.4) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index fb489233b7cb..22c99a981705 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -30,7 +30,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.c4c = ref_binding_pattern x [concrete] // CHECK:STDOUT: %x.var_patt: %pattern_type.c4c = var_pattern %x.patt [concrete] // CHECK:STDOUT: %struct: %struct_type.v = struct_value (%empty_tuple) [concrete] -// CHECK:STDOUT: %.267: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] +// CHECK:STDOUT: %.7ba: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete] // CHECK:STDOUT: %Main.type: type = fn_type @Main [concrete] // CHECK:STDOUT: %Main: %Main.type = struct_value () [concrete] // CHECK:STDOUT: %y.patt: %pattern_type.c4c = ref_binding_pattern y [concrete] @@ -60,7 +60,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.c4c = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.c4c = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %struct_type.v = var %x.var_patt [concrete] +// CHECK:STDOUT: %x.var: ref %struct_type.v = var_storage %x.var_patt [concrete] // CHECK:STDOUT: %.loc2_15: type = splice_block %struct_type.v [concrete = constants.%struct_type.v] { // CHECK:STDOUT: %.loc2_14.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc2_14.2: type = converted %.loc2_14.1, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -76,9 +76,9 @@ fn Main() { // CHECK:STDOUT: %y.patt: %pattern_type.c4c = ref_binding_pattern y [concrete = constants.%y.patt] // CHECK:STDOUT: %y.var_patt: %pattern_type.c4c = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %struct_type.v = var %y.var_patt +// CHECK:STDOUT: %y.var: ref %struct_type.v = var_storage %y.var_patt // CHECK:STDOUT: %x.ref: ref %struct_type.v = name_ref x, file.%x [concrete = file.%x.var] -// CHECK:STDOUT: %.loc5_28.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc5_28.1: ref %empty_tuple.type = struct_access %x.ref, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc5_28.2: ref %empty_tuple.type = struct_access %y.var, element0 // CHECK:STDOUT: %.loc5_28.3: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_28.4: init %empty_tuple.type = converted %.loc5_28.1, %.loc5_28.3 [concrete = constants.%empty_tuple] @@ -107,7 +107,7 @@ fn Main() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc2_26.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc2_27.1: %struct_type.v = struct_literal (%.loc2_26.1) [concrete = constants.%struct] -// CHECK:STDOUT: %.loc2_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.267] +// CHECK:STDOUT: %.loc2_27.2: ref %empty_tuple.type = struct_access file.%x.var, element0 [concrete = constants.%.7ba] // CHECK:STDOUT: %.loc2_26.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc2_27.3: init %empty_tuple.type = converted %.loc2_26.1, %.loc2_26.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc2_27.4: init %struct_type.v to file.%x.var = struct_init (%.loc2_27.3) [concrete = constants.%struct] diff --git a/toolchain/check/testdata/var/import.carbon b/toolchain/check/testdata/var/import.carbon index 8e4bcc02a38f..ab36b650798f 100644 --- a/toolchain/check/testdata/var/import.carbon +++ b/toolchain/check/testdata/var/import.carbon @@ -42,7 +42,7 @@ var a: () = a_ref; // CHECK:STDOUT: %a_ref.patt: %pattern_type = ref_binding_pattern a_ref [concrete = constants.%a_ref.patt] // CHECK:STDOUT: %a_ref.var_patt: %pattern_type = var_pattern %a_ref.patt [concrete = constants.%a_ref.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a_ref.var: ref %empty_tuple.type = var %a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %empty_tuple.type = var_storage %a_ref.var_patt [concrete] // CHECK:STDOUT: %.loc4_13.1: type = splice_block %.loc4_13.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_13.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_13.3: type = converted %.loc4_13.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -73,7 +73,7 @@ var a: () = a_ref; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Implicit.a_ref: ref %empty_tuple.type = import_ref Implicit//default, a_ref, loaded [concrete = %a_ref.var] -// CHECK:STDOUT: %a_ref.var: ref %empty_tuple.type = var constants.%a_ref.var_patt [concrete] +// CHECK:STDOUT: %a_ref.var: ref %empty_tuple.type = var_storage constants.%a_ref.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -87,7 +87,7 @@ var a: () = a_ref; // CHECK:STDOUT: %a.patt: %pattern_type = ref_binding_pattern a [concrete = constants.%a.patt] // CHECK:STDOUT: %a.var_patt: %pattern_type = var_pattern %a.patt [concrete = constants.%a.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var %a.var_patt [concrete] +// CHECK:STDOUT: %a.var: ref %empty_tuple.type = var_storage %a.var_patt [concrete] // CHECK:STDOUT: %.loc4_9.1: type = splice_block %.loc4_9.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_9.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_9.3: type = converted %.loc4_9.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/var/import_access.carbon b/toolchain/check/testdata/var/import_access.carbon index a6879f1df8d0..b81ce6650017 100644 --- a/toolchain/check/testdata/var/import_access.carbon +++ b/toolchain/check/testdata/var/import_access.carbon @@ -74,7 +74,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %v.patt: %pattern_type = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var %v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage %v.var_patt [concrete] // CHECK:STDOUT: %.loc4_17.1: type = splice_block %.loc4_17.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_17.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_17.3: type = converted %.loc4_17.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -105,7 +105,7 @@ var v2: () = Test.v; // CHECK:STDOUT: // CHECK:STDOUT: imports { // CHECK:STDOUT: %Test.v: ref %empty_tuple.type = import_ref Test//def, v, loaded [concrete = %v.var] -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var constants.%v.var_patt [concrete] +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage constants.%v.var_patt [concrete] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { @@ -119,7 +119,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %v2.patt: %pattern_type = ref_binding_pattern v2 [concrete = constants.%v2.patt] // CHECK:STDOUT: %v2.var_patt: %pattern_type = var_pattern %v2.patt [concrete = constants.%v2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var %v2.var_patt [concrete] +// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var_storage %v2.var_patt [concrete] // CHECK:STDOUT: %.loc4_10.1: type = splice_block %.loc4_10.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc4_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4_10.3: type = converted %.loc4_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -156,7 +156,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %v2.patt: %pattern_type = ref_binding_pattern v2 [concrete = constants.%v2.patt] // CHECK:STDOUT: %v2.var_patt: %pattern_type = var_pattern %v2.patt [concrete = constants.%v2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var %v2.var_patt [concrete] +// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var_storage %v2.var_patt [concrete] // CHECK:STDOUT: %.loc10_10.1: type = splice_block %.loc10_10.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] @@ -198,7 +198,7 @@ var v2: () = Test.v; // CHECK:STDOUT: %v2.patt: %pattern_type = ref_binding_pattern v2 [concrete = constants.%v2.patt] // CHECK:STDOUT: %v2.var_patt: %pattern_type = var_pattern %v2.patt [concrete = constants.%v2.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var %v2.var_patt [concrete] +// CHECK:STDOUT: %v2.var: ref %empty_tuple.type = var_storage %v2.var_patt [concrete] // CHECK:STDOUT: %.loc10_10.1: type = splice_block %.loc10_10.3 [concrete = constants.%empty_tuple.type] { // CHECK:STDOUT: %.loc10_10.2: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_10.3: type = converted %.loc10_10.2, constants.%empty_tuple.type [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/var/initialization.carbon b/toolchain/check/testdata/var/initialization.carbon index e0cf803ff170..cb98e41c90d2 100644 --- a/toolchain/check/testdata/var/initialization.carbon +++ b/toolchain/check/testdata/var/initialization.carbon @@ -84,7 +84,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.cb1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt // CHECK:STDOUT: %.loc8_23.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_23.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_3: init %empty_tuple.type = converted %.loc8_23.1, %.loc8_23.2 [concrete = constants.%empty_tuple] @@ -129,7 +129,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.cb1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt // CHECK:STDOUT: %DefaultOrUnformed.facet: %DefaultOrUnformed.type = facet_value constants.%empty_tuple.type, (constants.%DefaultOrUnformed.impl_witness) [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %.loc8_19.1: %DefaultOrUnformed.type = converted constants.%empty_tuple.type, %DefaultOrUnformed.facet [concrete = constants.%DefaultOrUnformed.facet] // CHECK:STDOUT: %as_type: type = facet_access_type %.loc8_19.1 [concrete = constants.%empty_tuple.type] diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index 770406abecfc..fc56d7d45e39 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -56,7 +56,7 @@ fn Main() { // CHECK:STDOUT: %x.patt: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.cb1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt // CHECK:STDOUT: %.loc16_16.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_16.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc16_3: init %empty_tuple.type = converted %.loc16_16.1, %.loc16_16.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 2651b59f7472..e34f75f70edf 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -75,7 +75,7 @@ fn Main() { // CHECK:STDOUT: %NS.patt: %pattern_type.cb1 = ref_binding_pattern NS [concrete = constants.%NS.patt] // CHECK:STDOUT: %NS.var_patt: %pattern_type.cb1 = var_pattern %NS.patt [concrete = constants.%NS.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %NS.var: ref %empty_tuple.type = var %NS.var_patt +// CHECK:STDOUT: %NS.var: ref %empty_tuple.type = var_storage %NS.var_patt // CHECK:STDOUT: %.loc5_17.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_17.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_3: init %empty_tuple.type = converted %.loc5_17.1, %.loc5_17.2 [concrete = constants.%empty_tuple] @@ -94,7 +94,7 @@ fn Main() { // CHECK:STDOUT: %x.patt.loc8: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt.06838d.1] // CHECK:STDOUT: %x.var_patt.loc8: %pattern_type.cb1 = var_pattern %x.patt.loc8 [concrete = constants.%x.var_patt.28d573.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var.loc8: ref %empty_tuple.type = var %x.var_patt.loc8 +// CHECK:STDOUT: %x.var.loc8: ref %empty_tuple.type = var_storage %x.var_patt.loc8 // CHECK:STDOUT: %.loc8_23.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_23.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_3: init %empty_tuple.type = converted %.loc8_23.1, %.loc8_23.2 [concrete = constants.%empty_tuple] @@ -112,7 +112,7 @@ fn Main() { // CHECK:STDOUT: %x.patt.loc10: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt.06838d.2] // CHECK:STDOUT: %x.var_patt.loc10: %pattern_type.cb1 = var_pattern %x.patt.loc10 [concrete = constants.%x.var_patt.28d573.2] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var.loc10: ref %empty_tuple.type = var %x.var_patt.loc10 +// CHECK:STDOUT: %x.var.loc10: ref %empty_tuple.type = var_storage %x.var_patt.loc10 // CHECK:STDOUT: %.loc10_18.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_18.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc10_5: init %empty_tuple.type = converted %.loc10_18.1, %.loc10_18.2 [concrete = constants.%empty_tuple] diff --git a/toolchain/check/testdata/var/var_pattern.carbon b/toolchain/check/testdata/var/var_pattern.carbon index c2a66fd6d594..eafacfcacb81 100644 --- a/toolchain/check/testdata/var/var_pattern.carbon +++ b/toolchain/check/testdata/var/var_pattern.carbon @@ -220,7 +220,7 @@ fn Call() { // CHECK:STDOUT: %x.patt: %pattern_type.cb1 = ref_binding_pattern x [concrete = constants.%x.patt] // CHECK:STDOUT: %x.var_patt: %pattern_type.cb1 = var_pattern %x.patt [concrete = constants.%x.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var %x.var_patt +// CHECK:STDOUT: %x.var: ref %empty_tuple.type = var_storage %x.var_patt // CHECK:STDOUT: %.loc5_27.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_27.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_7: init %empty_tuple.type = converted %.loc5_27.1, %.loc5_27.2 [concrete = constants.%empty_tuple] @@ -283,7 +283,7 @@ fn Call() { // CHECK:STDOUT: %y.var_patt: %pattern_type.cb1 = var_pattern %y.patt [concrete = constants.%y.var_patt] // CHECK:STDOUT: %.loc5_38: %pattern_type.5b8 = tuple_pattern (%x.patt, %y.var_patt) [concrete = constants.%.5ae] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var %y.var_patt +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage %y.var_patt // CHECK:STDOUT: %.loc5_44.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_48.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_49: %tuple.type = tuple_literal (%.loc5_44.1, %.loc5_48.1) [concrete = constants.%tuple] @@ -355,7 +355,7 @@ fn Call() { // CHECK:STDOUT: %.loc5_34: %pattern_type.5b8 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.8b4] // CHECK:STDOUT: %.var_patt: %pattern_type.5b8 = var_pattern %.loc5_34 [concrete = constants.%.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type = var %.var_patt +// CHECK:STDOUT: %.var: ref %tuple.type = var_storage %.var_patt // CHECK:STDOUT: %.loc5_40.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_44.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_45.1: %tuple.type = tuple_literal (%.loc5_40.1, %.loc5_44.1) [concrete = constants.%tuple] @@ -440,7 +440,7 @@ fn Call() { // CHECK:STDOUT: %.loc5_38: %pattern_type.5b8 = tuple_pattern (%x.patt, %y.patt) [concrete = constants.%.8b4] // CHECK:STDOUT: %.var_patt: %pattern_type.5b8 = var_pattern %.loc5_38 [concrete = constants.%.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %.var: ref %tuple.type = var %.var_patt +// CHECK:STDOUT: %.var: ref %tuple.type = var_storage %.var_patt // CHECK:STDOUT: %.loc5_44.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_48.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc5_49.1: %tuple.type = tuple_literal (%.loc5_44.1, %.loc5_48.1) [concrete = constants.%tuple] @@ -546,7 +546,7 @@ fn Call() { // CHECK:STDOUT: %v.patt: %pattern_type.cb1 = ref_binding_pattern v [concrete = constants.%v.patt] // CHECK:STDOUT: %v.var_patt: %pattern_type.cb1 = var_pattern %v.patt [concrete = constants.%v.var_patt] // CHECK:STDOUT: } -// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var %v.var_patt +// CHECK:STDOUT: %v.var: ref %empty_tuple.type = var_storage %v.var_patt // CHECK:STDOUT: %.loc7_16.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_16.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_3: init %empty_tuple.type = converted %.loc7_16.1, %.loc7_16.2 [concrete = constants.%empty_tuple] @@ -561,7 +561,7 @@ fn Call() { // CHECK:STDOUT: %.loc8_9.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %tuple: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc8_5: %empty_tuple.type = converted %v.ref, %tuple [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var @F.%y.param_patt +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage @F.%y.param_patt // CHECK:STDOUT: %.loc8_9.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc4: init %empty_tuple.type = converted %.loc8_9.1, %.loc8_9.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: assign %y.var, %.loc4 @@ -741,7 +741,7 @@ fn Call() { // CHECK:STDOUT: %.loc7_12.1: %empty_tuple.type = tuple_literal () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %empty_tuple: %empty_tuple.type = tuple_value () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.loc7_8.2: %empty_tuple.type = converted %.loc7_8.1, %empty_tuple [concrete = constants.%empty_tuple] -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var constants.%y.param_patt +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage constants.%y.param_patt // CHECK:STDOUT: %.loc7_12.2: init %empty_tuple.type = tuple_init () [concrete = constants.%empty_tuple] // CHECK:STDOUT: %.1: init %empty_tuple.type = converted %.loc7_12.1, %.loc7_12.2 [concrete = constants.%empty_tuple] // CHECK:STDOUT: assign %y.var, %.1 @@ -885,7 +885,7 @@ fn Call() { // CHECK:STDOUT: %z.patt: %pattern_type.cb1 = value_binding_pattern z [concrete = constants.%z.patt] // CHECK:STDOUT: %.loc8_52: %pattern_type.8c1 = tuple_pattern (%x.patt, %y.var_patt, %z.patt) [concrete = constants.%.b14] // CHECK:STDOUT: } -// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var %y.var_patt +// CHECK:STDOUT: %y.var: ref %empty_tuple.type = var_storage %y.var_patt // CHECK:STDOUT: %F.ref.loc8_57: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] // CHECK:STDOUT: %F.call.loc8_59: init %empty_tuple.type = call %F.ref.loc8_57() // CHECK:STDOUT: %F.ref.loc8_62: %F.type = name_ref F, file.%F.decl [concrete = constants.%F] @@ -962,7 +962,7 @@ fn Call() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %TakeVar.ref: %TakeVar.type = name_ref TakeVar, file.%TakeVar.decl [concrete = constants.%TakeVar] // CHECK:STDOUT: %MakeInit.ref: %MakeInit.type = name_ref MakeInit, file.%MakeInit.decl [concrete = constants.%MakeInit] -// CHECK:STDOUT: %a.var: ref %X = var @TakeVar.%a.param_patt +// CHECK:STDOUT: %a.var: ref %X = var_storage @TakeVar.%a.param_patt // CHECK:STDOUT: %MakeInit.call: init %X to %a.var = call %MakeInit.ref() // CHECK:STDOUT: assign %a.var, %MakeInit.call // CHECK:STDOUT: %TakeVar.call: init %empty_tuple.type = call %TakeVar.ref(%a.var) @@ -1037,7 +1037,7 @@ fn Call() { // CHECK:STDOUT: %bound_method.loc5_12.2: = bound_method %int_123, %specific_fn [concrete = constants.%bound_method] // CHECK:STDOUT: %Core.IntLiteral.as.ImplicitAs.impl.Convert.call: init %i32 = call %bound_method.loc5_12.2(%int_123) [concrete = constants.%int_123.2bf] // CHECK:STDOUT: %.loc5: init %i32 = converted %int_123, %Core.IntLiteral.as.ImplicitAs.impl.Convert.call [concrete = constants.%int_123.2bf] -// CHECK:STDOUT: %n.var: ref %i32 = var @TakeVar.%n.param_patt +// CHECK:STDOUT: %n.var: ref %i32 = var_storage @TakeVar.%n.param_patt // CHECK:STDOUT: assign %n.var, %.loc5 // CHECK:STDOUT: %TakeVar.call: init %empty_tuple.type = call %TakeVar.ref(%n.var) // CHECK:STDOUT: %Destroy.Op.bound: = bound_method %n.var, constants.%Destroy.Op.1a2547.2 diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 77ab0195b770..28bbef87a7ef 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -2323,7 +2323,7 @@ struct VarPattern { struct VarStorage { // TODO: Make Parse::NodeId more specific. static constexpr auto Kind = InstKind::VarStorage.Define( - {.ir_name = "var", + {.ir_name = "var_storage", .expr_category = ExprCategory::DurableRef, .constant_kind = InstConstantKind::ConditionalUnique, .constant_needs_inst_id = InstConstantNeedsInstIdKind::Permanent,