From 2425e28e3a8c7e4dcdd66d4bdfa3ebc5452bc28b Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Tue, 22 Aug 2023 11:55:31 -0700 Subject: [PATCH] Collapse names into VarStorage (#3116) This removes BindName, putting name information directly on VarStorage. As a side-effect of updating semantics_ir_test for this change, I also noted that function bodies were being generated as invalid YAML so am fixing that (just `{}` to `[]` bracketing, otherwise the test wouldn't work anymore). Because names are now available, I've updated lowering to use them for vars. In the SemIR formatter, the name is now repeated because it's a parameter to VarStorage. I believe this is just default behavior, and we'd have to special-case VarStorage to remove it because it's automatic argument printing in action. On the balance, it felt like letting it print was reasonable. I've noted in places that the name on VarStorage is expected to be optional, but am not adding support because I'd have no way of testing it at present. --- toolchain/lowering/lowering_context.cpp | 9 +- toolchain/lowering/lowering_handle.cpp | 12 +- .../testdata/array/assign_return_value.carbon | 4 +- toolchain/lowering/testdata/array/base.carbon | 142 +++++++++--------- .../function/call/empty_struct.carbon | 4 +- .../testdata/function/call/empty_tuple.carbon | 4 +- .../testdata/function/call/i32.carbon | 4 +- .../call/implicit_empty_tuple_as_arg.carbon | 4 +- .../function/call/return_implicit.carbon | 4 +- .../testdata/function/call/var_param.carbon | 6 +- .../index/array_element_access.carbon | 26 ++-- .../index/tuple_element_access.carbon | 18 +-- .../index/tuple_return_value_access.carbon | 4 +- .../testdata/operators/assignment.carbon | 18 +-- .../testdata/pointer/address_of_field.carbon | 6 +- .../lowering/testdata/pointer/basic.carbon | 6 +- toolchain/lowering/testdata/return/var.carbon | 6 +- .../lowering/testdata/struct/empty.carbon | 10 +- .../testdata/struct/member_access.carbon | 18 +-- .../lowering/testdata/struct/one_entry.carbon | 10 +- .../testdata/struct/two_entries.carbon | 10 +- .../lowering/testdata/tuple/empty.carbon | 10 +- .../lowering/testdata/tuple/one_entry.carbon | 10 +- .../testdata/tuple/two_entries.carbon | 10 +- toolchain/lowering/testdata/var/local.carbon | 6 +- .../semantics/semantics_handle_function.cpp | 4 +- .../semantics_handle_pattern_binding.cpp | 9 +- .../semantics/semantics_handle_variable.cpp | 15 +- toolchain/semantics/semantics_ir.cpp | 8 - toolchain/semantics/semantics_ir.h | 2 +- .../semantics/semantics_ir_formatter.cpp | 57 +++---- toolchain/semantics/semantics_ir_test.cpp | 20 +-- toolchain/semantics/semantics_node.h | 10 +- toolchain/semantics/semantics_node_kind.def | 1 - .../testdata/array/assign_return_value.carbon | 14 +- .../testdata/array/assign_var.carbon | 32 ++-- .../semantics/testdata/array/base.carbon | 76 +++++----- .../testdata/array/fail_invalid_type.carbon | 6 +- .../testdata/array/fail_out_of_bound.carbon | 20 ++- .../testdata/array/fail_type_mismatch.carbon | 16 +- .../testdata/basics/builtin_types.carbon | 32 ++-- .../testdata/basics/fail_name_lookup.carbon | 2 +- .../basics/fail_non_type_as_type.carbon | 6 +- .../basics/fail_qualifier_unsupported.carbon | 14 +- .../semantics/testdata/basics/parens.carbon | 10 +- .../semantics/testdata/const/collapse.carbon | 14 +- .../testdata/const/fail_collapse.carbon | 16 +- .../function/call/empty_struct.carbon | 26 ++-- .../testdata/function/call/empty_tuple.carbon | 26 ++-- .../function/call/fail_param_count.carbon | 74 +++++---- .../function/call/fail_param_type.carbon | 28 ++-- .../call/fail_return_type_mismatch.carbon | 10 +- .../testdata/function/call/i32.carbon | 34 ++--- .../function/call/more_param_ir.carbon | 54 +++---- .../testdata/function/call/params_one.carbon | 28 ++-- .../function/call/params_one_comma.carbon | 32 ++-- .../testdata/function/call/params_two.carbon | 32 ++-- .../function/call/params_two_comma.carbon | 38 +++-- .../testdata/function/call/params_zero.carbon | 4 +- .../function/call/return_implicit.carbon | 12 +- .../function/declaration/simple.carbon | 2 +- .../fail_param_name_conflict.carbon | 22 ++- .../testdata/function/definition/order.carbon | 6 +- .../function/definition/params_one.carbon | 12 +- .../definition/params_one_comma.carbon | 12 +- .../function/definition/params_two.carbon | 22 ++- .../definition/params_two_comma.carbon | 22 ++- .../function/definition/params_zero.carbon | 2 +- .../definition/same_param_name.carbon | 22 ++- toolchain/semantics/testdata/if/else.carbon | 28 ++-- .../if/fail_reachable_fallthrough.carbon | 62 ++++---- .../semantics/testdata/if/fail_scope.carbon | 26 ++-- .../semantics/testdata/if/no_else.carbon | 22 ++- .../if/unreachable_fallthrough.carbon | 22 ++- .../testdata/if_expression/basic.carbon | 46 +++--- .../if_expression/constant_condition.carbon | 8 +- .../if_expression/control_flow.carbon | 26 ++-- .../testdata/if_expression/nested.carbon | 82 +++++----- .../index/array_element_access.carbon | 48 +++--- .../index/fail_array_large_index.carbon | 24 ++- .../index/fail_array_non_int_indexing.carbon | 24 ++- .../fail_array_out_of_bound_access.carbon | 24 ++- .../index/fail_empty_tuple_access.carbon | 4 +- .../testdata/index/fail_name_not_found.carbon | 8 +- .../index/fail_negative_indexing.carbon | 18 +-- .../index/fail_non_deterministic_type.carbon | 32 ++-- .../index/fail_non_tuple_access.carbon | 2 +- .../index/fail_tuple_large_index.carbon | 30 ++-- .../index/fail_tuple_non_int_indexing.carbon | 24 ++- .../fail_tuple_out_of_bound_access.carbon | 24 ++- .../index/tuple_element_access.carbon | 32 ++-- .../index/tuple_return_value_access.carbon | 4 +- .../ir/duplicate_name_same_line.carbon | 24 ++- .../testdata/namespace/fail_duplicate.carbon | 4 +- .../namespace/fail_unresolved_scope.carbon | 2 +- .../testdata/namespace/function.carbon | 6 +- .../testdata/namespace/nested.carbon | 4 +- .../semantics/testdata/operators/and.carbon | 6 +- .../testdata/operators/assignment.carbon | 110 +++++++------- .../testdata/operators/binary_op.carbon | 2 +- .../fail_assigment_to_non_assignable.carbon | 88 ++++++----- .../operators/fail_type_mismatch.carbon | 2 +- .../fail_type_mismatch_assignment.carbon | 12 +- .../operators/fail_type_mismatch_once.carbon | 2 +- .../semantics/testdata/operators/or.carbon | 6 +- .../testdata/operators/unary_op.carbon | 14 +- .../testdata/pointer/address_of_deref.carbon | 20 ++- .../testdata/pointer/address_of_lvalue.carbon | 140 ++++++++--------- .../semantics/testdata/pointer/basic.carbon | 24 ++- .../pointer/fail_address_of_value.carbon | 10 +- .../fail_dereference_not_pointer.carbon | 20 ++- .../pointer/fail_dereference_type.carbon | 6 +- .../pointer/fail_type_mismatch.carbon | 16 +- .../testdata/pointer/nested_const.carbon | 18 +-- .../semantics/testdata/pointer/types.carbon | 36 ++--- .../testdata/return/code_after_return.carbon | 9 +- .../return/code_after_return_value.carbon | 21 ++- .../return/fail_missing_return.carbon | 2 +- .../fail_missing_return_empty_tuple.carbon | 2 +- .../testdata/return/fail_type_mismatch.carbon | 2 +- .../return/fail_value_disallowed.carbon | 2 +- .../testdata/return/fail_value_missing.carbon | 2 +- .../missing_return_no_return_type.carbon | 2 +- .../semantics/testdata/return/no_value.carbon | 2 +- .../semantics/testdata/return/struct.carbon | 2 +- .../semantics/testdata/return/tuple.carbon | 2 +- .../semantics/testdata/return/value.carbon | 2 +- .../semantics/testdata/struct/empty.carbon | 16 +- .../struct/fail_access_into_invalid.carbon | 2 +- .../testdata/struct/fail_assign_empty.carbon | 8 +- .../testdata/struct/fail_assign_nested.carbon | 16 +- .../struct/fail_assign_to_empty.carbon | 18 +-- .../struct/fail_field_name_mismatch.carbon | 16 +- .../struct/fail_field_type_mismatch.carbon | 16 +- .../struct/fail_member_access_type.carbon | 24 ++- .../struct/fail_non_member_access.carbon | 24 ++- .../struct/fail_too_few_values.carbon | 16 +- .../testdata/struct/fail_type_assign.carbon | 8 +- .../testdata/struct/fail_value_as_type.carbon | 6 +- .../testdata/struct/member_access.carbon | 40 +++-- .../testdata/struct/one_entry.carbon | 28 ++-- .../testdata/struct/tuple_as_element.carbon | 40 +++-- .../testdata/struct/two_entries.carbon | 34 ++--- .../semantics/testdata/tuples/empty.carbon | 16 +- .../testdata/tuples/fail_assign_empty.carbon | 8 +- .../testdata/tuples/fail_assign_nested.carbon | 42 +++--- .../tuples/fail_assign_to_empty.carbon | 6 +- .../tuples/fail_element_type_mismatch.carbon | 16 +- .../tuples/fail_too_few_element.carbon | 12 +- .../testdata/tuples/fail_type_assign.carbon | 8 +- .../testdata/tuples/fail_value_as_type.carbon | 6 +- .../testdata/tuples/nested_tuple.carbon | 24 ++- .../testdata/tuples/one_element.carbon | 22 ++- .../testdata/tuples/two_elements.carbon | 26 ++-- toolchain/semantics/testdata/var/decl.carbon | 8 +- .../testdata/var/decl_with_init.carbon | 10 +- .../testdata/var/fail_duplicate_decl.carbon | 18 +-- .../var/fail_init_type_mismatch.carbon | 8 +- .../testdata/var/fail_init_with_self.carbon | 8 +- .../var/fail_lookup_outside_scope.carbon | 18 +-- .../var/fail_storage_is_literal.carbon | 8 +- .../semantics/testdata/var/global_decl.carbon | 6 +- .../testdata/var/global_decl_with_init.carbon | 8 +- .../testdata/var/global_lookup.carbon | 16 +- .../var/global_lookup_in_scope.carbon | 20 +-- .../semantics/testdata/var/lookup.carbon | 10 +- 166 files changed, 1381 insertions(+), 1762 deletions(-) diff --git a/toolchain/lowering/lowering_context.cpp b/toolchain/lowering/lowering_context.cpp index 895ae25e34df..ef13e3d19874 100644 --- a/toolchain/lowering/lowering_context.cpp +++ b/toolchain/lowering/lowering_context.cpp @@ -78,9 +78,8 @@ auto LoweringContext::BuildFunctionDeclaration(SemanticsFunctionId function_id) // Set parameter names. for (int i = 0; i < static_cast(param_refs.size()); ++i) { - auto [param_name_id, _] = - semantics_ir().GetNode(param_refs[i]).GetAsBindName(); - llvm_function->getArg(i)->setName(semantics_ir().GetString(param_name_id)); + auto name_id = semantics_ir().GetNode(param_refs[i]).GetAsVarStorage(); + llvm_function->getArg(i)->setName(semantics_ir().GetString(name_id)); } return llvm_function; @@ -101,9 +100,7 @@ auto LoweringContext::BuildFunctionDefinition(SemanticsFunctionId function_id) // Add parameters to locals. auto param_refs = semantics_ir().GetNodeBlock(function.param_refs_id); for (int i = 0; i < static_cast(param_refs.size()); ++i) { - auto param_storage = - semantics_ir().GetNode(param_refs[i]).GetAsBindName().second; - function_lowering.SetLocal(param_storage, llvm_function->getArg(i)); + function_lowering.SetLocal(param_refs[i], llvm_function->getArg(i)); } // Lower all blocks. diff --git a/toolchain/lowering/lowering_handle.cpp b/toolchain/lowering/lowering_handle.cpp index 755d66ff8236..691dbe5f3173 100644 --- a/toolchain/lowering/lowering_handle.cpp +++ b/toolchain/lowering/lowering_handle.cpp @@ -363,14 +363,12 @@ auto LoweringHandleUnaryOperatorNot(LoweringFunctionContext& context, auto LoweringHandleVarStorage(LoweringFunctionContext& context, SemanticsNodeId node_id, SemanticsNode node) -> void { - // TODO: This should provide a name, not just `var`. Also, LLVM requires - // globals to have a name. Do we want to generate a name, which would need to - // be consistent across translation units, or use the given name, which - // requires either looking ahead for BindName or restructuring semantics, - // either of which affects the destructuring due to the difference in - // storage? + // TODO: Eventually this name will be optional, and we'll want to provide + // something like `var` as a default. However, that's not possible right now + // so cannot be tested. + auto name = context.semantics_ir().GetString(node.GetAsVarStorage()); auto* alloca = context.builder().CreateAlloca(context.GetType(node.type_id()), - /*ArraySize=*/nullptr, "var"); + /*ArraySize=*/nullptr, name); context.SetLocal(node_id, alloca); } diff --git a/toolchain/lowering/testdata/array/assign_return_value.carbon b/toolchain/lowering/testdata/array/assign_return_value.carbon index e660a23a3af6..2c280ed42ae2 100644 --- a/toolchain/lowering/testdata/array/assign_return_value.carbon +++ b/toolchain/lowering/testdata/array/assign_return_value.carbon @@ -24,7 +24,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define void @Run() { -// CHECK:STDOUT: %var = alloca [2 x i32], align 4 +// CHECK:STDOUT: %t = alloca [2 x i32], align 4 // CHECK:STDOUT: %F = call { i32, i32 } @F() // CHECK:STDOUT: %array = alloca [2 x i32], align 4 // CHECK:STDOUT: %array.element = extractvalue { i32, i32 } %F, 0 @@ -34,6 +34,6 @@ fn Run() { // CHECK:STDOUT: %2 = getelementptr inbounds [2 x i32], ptr %array, i32 0, i32 1 // CHECK:STDOUT: store i32 %array.element1, ptr %2, align 4 // CHECK:STDOUT: %3 = load [2 x i32], ptr %array, align 4 -// CHECK:STDOUT: store [2 x i32] %3, ptr %var, align 4 +// CHECK:STDOUT: store [2 x i32] %3, ptr %t, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/array/base.carbon b/toolchain/lowering/testdata/array/base.carbon index ad1b14626573..7535f326707b 100644 --- a/toolchain/lowering/testdata/array/base.carbon +++ b/toolchain/lowering/testdata/array/base.carbon @@ -18,7 +18,7 @@ fn Run() { // CHECK:STDOUT: %type = type {} // CHECK:STDOUT: // CHECK:STDOUT: define void @Run() { -// CHECK:STDOUT: %var = alloca [1 x i32], align 4 +// CHECK:STDOUT: %a = alloca [1 x i32], align 4 // CHECK:STDOUT: %tuple = alloca { i32 }, align 8 // CHECK:STDOUT: %1 = getelementptr inbounds { i32 }, ptr %tuple, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %1, align 4 @@ -28,97 +28,97 @@ fn Run() { // CHECK:STDOUT: %3 = getelementptr inbounds [1 x i32], ptr %array, i32 0, i32 0 // CHECK:STDOUT: store i32 %2, ptr %3, align 4 // CHECK:STDOUT: %4 = load [1 x i32], ptr %array, align 4 -// CHECK:STDOUT: store [1 x i32] %4, ptr %var, align 4 -// CHECK:STDOUT: %var1 = alloca [2 x double], align 8 -// CHECK:STDOUT: %tuple2 = alloca { double, double }, align 8 -// CHECK:STDOUT: %5 = getelementptr inbounds { double, double }, ptr %tuple2, i32 0, i32 0 +// CHECK:STDOUT: store [1 x i32] %4, ptr %a, align 4 +// CHECK:STDOUT: %b = alloca [2 x double], align 8 +// CHECK:STDOUT: %tuple1 = alloca { double, double }, align 8 +// CHECK:STDOUT: %5 = getelementptr inbounds { double, double }, ptr %tuple1, i32 0, i32 0 // CHECK:STDOUT: store double 0x4026333333333334, ptr %5, align 8 -// CHECK:STDOUT: %6 = getelementptr inbounds { double, double }, ptr %tuple2, i32 0, i32 1 +// CHECK:STDOUT: %6 = getelementptr inbounds { double, double }, ptr %tuple1, i32 0, i32 1 // CHECK:STDOUT: store double 2.200000e+00, ptr %6, align 8 -// CHECK:STDOUT: %array3 = alloca [2 x double], align 8 -// CHECK:STDOUT: %array.element4 = getelementptr inbounds { double, double }, ptr %tuple2, i32 0, i32 0 -// CHECK:STDOUT: %7 = load double, ptr %array.element4, align 8 -// CHECK:STDOUT: %8 = getelementptr inbounds [2 x double], ptr %array3, i32 0, i32 0 +// CHECK:STDOUT: %array2 = alloca [2 x double], align 8 +// CHECK:STDOUT: %array.element3 = getelementptr inbounds { double, double }, ptr %tuple1, i32 0, i32 0 +// CHECK:STDOUT: %7 = load double, ptr %array.element3, align 8 +// CHECK:STDOUT: %8 = getelementptr inbounds [2 x double], ptr %array2, i32 0, i32 0 // CHECK:STDOUT: store double %7, ptr %8, align 8 -// CHECK:STDOUT: %array.element5 = getelementptr inbounds { double, double }, ptr %tuple2, i32 0, i32 1 -// CHECK:STDOUT: %9 = load double, ptr %array.element5, align 8 -// CHECK:STDOUT: %10 = getelementptr inbounds [2 x double], ptr %array3, i32 0, i32 1 +// CHECK:STDOUT: %array.element4 = getelementptr inbounds { double, double }, ptr %tuple1, i32 0, i32 1 +// CHECK:STDOUT: %9 = load double, ptr %array.element4, align 8 +// CHECK:STDOUT: %10 = getelementptr inbounds [2 x double], ptr %array2, i32 0, i32 1 // CHECK:STDOUT: store double %9, ptr %10, align 8 -// CHECK:STDOUT: %11 = load [2 x double], ptr %array3, align 8 -// CHECK:STDOUT: store [2 x double] %11, ptr %var1, align 8 +// CHECK:STDOUT: %11 = load [2 x double], ptr %array2, align 8 +// CHECK:STDOUT: store [2 x double] %11, ptr %b, align 8 +// CHECK:STDOUT: %tuple5 = alloca {}, align 8 +// CHECK:STDOUT: %c = alloca [5 x {}], align 8 // CHECK:STDOUT: %tuple6 = alloca {}, align 8 -// CHECK:STDOUT: %var7 = alloca [5 x {}], align 8 +// CHECK:STDOUT: %tuple7 = alloca {}, align 8 // CHECK:STDOUT: %tuple8 = alloca {}, align 8 // CHECK:STDOUT: %tuple9 = alloca {}, align 8 // CHECK:STDOUT: %tuple10 = alloca {}, align 8 -// CHECK:STDOUT: %tuple11 = alloca {}, align 8 -// CHECK:STDOUT: %tuple12 = alloca {}, align 8 -// CHECK:STDOUT: %tuple13 = alloca { {}, {}, {}, {}, {} }, align 8 -// CHECK:STDOUT: %12 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 0 -// CHECK:STDOUT: store ptr %tuple8, ptr %12, align 8 -// CHECK:STDOUT: %13 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 1 -// CHECK:STDOUT: store ptr %tuple9, ptr %13, align 8 -// CHECK:STDOUT: %14 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 2 -// CHECK:STDOUT: store ptr %tuple10, ptr %14, align 8 -// CHECK:STDOUT: %15 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 3 -// CHECK:STDOUT: store ptr %tuple11, ptr %15, align 8 -// CHECK:STDOUT: %16 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 4 -// CHECK:STDOUT: store ptr %tuple12, ptr %16, align 8 -// CHECK:STDOUT: %array14 = alloca [5 x {}], align 8 -// CHECK:STDOUT: %array.element15 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 0 -// CHECK:STDOUT: %17 = load {}, ptr %array.element15, align 1 -// CHECK:STDOUT: %18 = getelementptr inbounds [5 x {}], ptr %array14, i32 0, i32 0 +// CHECK:STDOUT: %tuple11 = alloca { {}, {}, {}, {}, {} }, align 8 +// CHECK:STDOUT: %12 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 0 +// CHECK:STDOUT: store ptr %tuple6, ptr %12, align 8 +// CHECK:STDOUT: %13 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 1 +// CHECK:STDOUT: store ptr %tuple7, ptr %13, align 8 +// CHECK:STDOUT: %14 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 2 +// CHECK:STDOUT: store ptr %tuple8, ptr %14, align 8 +// CHECK:STDOUT: %15 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 3 +// CHECK:STDOUT: store ptr %tuple9, ptr %15, align 8 +// CHECK:STDOUT: %16 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 4 +// CHECK:STDOUT: store ptr %tuple10, ptr %16, align 8 +// CHECK:STDOUT: %array12 = alloca [5 x {}], align 8 +// CHECK:STDOUT: %array.element13 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 0 +// CHECK:STDOUT: %17 = load {}, ptr %array.element13, align 1 +// CHECK:STDOUT: %18 = getelementptr inbounds [5 x {}], ptr %array12, i32 0, i32 0 // CHECK:STDOUT: store {} %17, ptr %18, align 1 -// CHECK:STDOUT: %array.element16 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 1 -// CHECK:STDOUT: %19 = load {}, ptr %array.element16, align 1 -// CHECK:STDOUT: %20 = getelementptr inbounds [5 x {}], ptr %array14, i32 0, i32 1 +// CHECK:STDOUT: %array.element14 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 1 +// CHECK:STDOUT: %19 = load {}, ptr %array.element14, align 1 +// CHECK:STDOUT: %20 = getelementptr inbounds [5 x {}], ptr %array12, i32 0, i32 1 // CHECK:STDOUT: store {} %19, ptr %20, align 1 -// CHECK:STDOUT: %array.element17 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 2 -// CHECK:STDOUT: %21 = load {}, ptr %array.element17, align 1 -// CHECK:STDOUT: %22 = getelementptr inbounds [5 x {}], ptr %array14, i32 0, i32 2 +// CHECK:STDOUT: %array.element15 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 2 +// CHECK:STDOUT: %21 = load {}, ptr %array.element15, align 1 +// CHECK:STDOUT: %22 = getelementptr inbounds [5 x {}], ptr %array12, i32 0, i32 2 // CHECK:STDOUT: store {} %21, ptr %22, align 1 -// CHECK:STDOUT: %array.element18 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 3 -// CHECK:STDOUT: %23 = load {}, ptr %array.element18, align 1 -// CHECK:STDOUT: %24 = getelementptr inbounds [5 x {}], ptr %array14, i32 0, i32 3 +// CHECK:STDOUT: %array.element16 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 3 +// CHECK:STDOUT: %23 = load {}, ptr %array.element16, align 1 +// CHECK:STDOUT: %24 = getelementptr inbounds [5 x {}], ptr %array12, i32 0, i32 3 // CHECK:STDOUT: store {} %23, ptr %24, align 1 -// CHECK:STDOUT: %array.element19 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple13, i32 0, i32 4 -// CHECK:STDOUT: %25 = load {}, ptr %array.element19, align 1 -// CHECK:STDOUT: %26 = getelementptr inbounds [5 x {}], ptr %array14, i32 0, i32 4 +// CHECK:STDOUT: %array.element17 = getelementptr inbounds { {}, {}, {}, {}, {} }, ptr %tuple11, i32 0, i32 4 +// CHECK:STDOUT: %25 = load {}, ptr %array.element17, align 1 +// CHECK:STDOUT: %26 = getelementptr inbounds [5 x {}], ptr %array12, i32 0, i32 4 // CHECK:STDOUT: store {} %25, ptr %26, align 1 -// CHECK:STDOUT: %27 = load [5 x {}], ptr %array14, align 1 -// CHECK:STDOUT: store [5 x {}] %27, ptr %var7, align 1 -// CHECK:STDOUT: %tuple20 = alloca { %type, %type, %type }, align 8 -// CHECK:STDOUT: %28 = getelementptr inbounds { %type, %type, %type }, ptr %tuple20, i32 0, i32 0 +// CHECK:STDOUT: %27 = load [5 x {}], ptr %array12, align 1 +// CHECK:STDOUT: store [5 x {}] %27, ptr %c, align 1 +// CHECK:STDOUT: %tuple18 = alloca { %type, %type, %type }, align 8 +// CHECK:STDOUT: %28 = getelementptr inbounds { %type, %type, %type }, ptr %tuple18, i32 0, i32 0 // CHECK:STDOUT: store %type zeroinitializer, ptr %28, align 1 -// CHECK:STDOUT: %29 = getelementptr inbounds { %type, %type, %type }, ptr %tuple20, i32 0, i32 1 +// CHECK:STDOUT: %29 = getelementptr inbounds { %type, %type, %type }, ptr %tuple18, i32 0, i32 1 // CHECK:STDOUT: store %type zeroinitializer, ptr %29, align 1 -// CHECK:STDOUT: %30 = getelementptr inbounds { %type, %type, %type }, ptr %tuple20, i32 0, i32 2 +// CHECK:STDOUT: %30 = getelementptr inbounds { %type, %type, %type }, ptr %tuple18, i32 0, i32 2 // CHECK:STDOUT: store %type zeroinitializer, ptr %30, align 1 -// CHECK:STDOUT: %var21 = alloca { i32, i32, i32 }, align 8 -// CHECK:STDOUT: %tuple22 = alloca { i32, i32, i32 }, align 8 -// CHECK:STDOUT: %31 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple22, i32 0, i32 0 +// CHECK:STDOUT: %d = alloca { i32, i32, i32 }, align 8 +// CHECK:STDOUT: %tuple19 = alloca { i32, i32, i32 }, align 8 +// CHECK:STDOUT: %31 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple19, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %31, align 4 -// CHECK:STDOUT: %32 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple22, i32 0, i32 1 +// CHECK:STDOUT: %32 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple19, i32 0, i32 1 // CHECK:STDOUT: store i32 2, ptr %32, align 4 -// CHECK:STDOUT: %33 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple22, i32 0, i32 2 +// CHECK:STDOUT: %33 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple19, i32 0, i32 2 // CHECK:STDOUT: store i32 3, ptr %33, align 4 -// CHECK:STDOUT: %34 = load { i32, i32, i32 }, ptr %tuple22, align 4 -// CHECK:STDOUT: store { i32, i32, i32 } %34, ptr %var21, align 4 -// CHECK:STDOUT: %var23 = alloca [3 x i32], align 4 -// CHECK:STDOUT: %array24 = alloca [3 x i32], align 4 -// CHECK:STDOUT: %array.element25 = getelementptr inbounds { i32, i32, i32 }, ptr %var21, i32 0, i32 0 -// CHECK:STDOUT: %35 = load i32, ptr %array.element25, align 4 -// CHECK:STDOUT: %36 = getelementptr inbounds [3 x i32], ptr %array24, i32 0, i32 0 +// CHECK:STDOUT: %34 = load { i32, i32, i32 }, ptr %tuple19, align 4 +// CHECK:STDOUT: store { i32, i32, i32 } %34, ptr %d, align 4 +// CHECK:STDOUT: %e = alloca [3 x i32], align 4 +// CHECK:STDOUT: %array20 = alloca [3 x i32], align 4 +// CHECK:STDOUT: %array.element21 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 0 +// CHECK:STDOUT: %35 = load i32, ptr %array.element21, align 4 +// CHECK:STDOUT: %36 = getelementptr inbounds [3 x i32], ptr %array20, i32 0, i32 0 // CHECK:STDOUT: store i32 %35, ptr %36, align 4 -// CHECK:STDOUT: %array.element26 = getelementptr inbounds { i32, i32, i32 }, ptr %var21, i32 0, i32 1 -// CHECK:STDOUT: %37 = load i32, ptr %array.element26, align 4 -// CHECK:STDOUT: %38 = getelementptr inbounds [3 x i32], ptr %array24, i32 0, i32 1 +// CHECK:STDOUT: %array.element22 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 1 +// CHECK:STDOUT: %37 = load i32, ptr %array.element22, align 4 +// CHECK:STDOUT: %38 = getelementptr inbounds [3 x i32], ptr %array20, i32 0, i32 1 // CHECK:STDOUT: store i32 %37, ptr %38, align 4 -// CHECK:STDOUT: %array.element27 = getelementptr inbounds { i32, i32, i32 }, ptr %var21, i32 0, i32 2 -// CHECK:STDOUT: %39 = load i32, ptr %array.element27, align 4 -// CHECK:STDOUT: %40 = getelementptr inbounds [3 x i32], ptr %array24, i32 0, i32 2 +// CHECK:STDOUT: %array.element23 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 2 +// CHECK:STDOUT: %39 = load i32, ptr %array.element23, align 4 +// CHECK:STDOUT: %40 = getelementptr inbounds [3 x i32], ptr %array20, i32 0, i32 2 // CHECK:STDOUT: store i32 %39, ptr %40, align 4 -// CHECK:STDOUT: %41 = load [3 x i32], ptr %array24, align 4 -// CHECK:STDOUT: store [3 x i32] %41, ptr %var23, align 4 +// CHECK:STDOUT: %41 = load [3 x i32], ptr %array20, align 4 +// CHECK:STDOUT: store [3 x i32] %41, ptr %e, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/empty_struct.carbon b/toolchain/lowering/testdata/function/call/empty_struct.carbon index 42e7921df508..8fc7bbbf4f68 100644 --- a/toolchain/lowering/testdata/function/call/empty_struct.carbon +++ b/toolchain/lowering/testdata/function/call/empty_struct.carbon @@ -23,10 +23,10 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { // CHECK:STDOUT: %struct = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %b = alloca {}, align 8 // CHECK:STDOUT: %struct1 = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %struct1, align 1 // CHECK:STDOUT: %Echo = call {} @Echo({} %1) -// CHECK:STDOUT: store {} %Echo, ptr %var, align 1 +// CHECK:STDOUT: store {} %Echo, ptr %b, align 1 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/empty_tuple.carbon b/toolchain/lowering/testdata/function/call/empty_tuple.carbon index 2fc119f21f44..365751a58c4f 100644 --- a/toolchain/lowering/testdata/function/call/empty_tuple.carbon +++ b/toolchain/lowering/testdata/function/call/empty_tuple.carbon @@ -21,10 +21,10 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { // CHECK:STDOUT: %tuple = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %b = alloca {}, align 8 // CHECK:STDOUT: %tuple1 = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %tuple1, align 1 // CHECK:STDOUT: %Echo = call {} @Echo({} %1) -// CHECK:STDOUT: store {} %Echo, ptr %var, align 1 +// CHECK:STDOUT: store {} %Echo, ptr %b, align 1 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/i32.carbon b/toolchain/lowering/testdata/function/call/i32.carbon index 6dfb51ecb3c4..4b6dcc9298f9 100644 --- a/toolchain/lowering/testdata/function/call/i32.carbon +++ b/toolchain/lowering/testdata/function/call/i32.carbon @@ -20,8 +20,8 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { -// CHECK:STDOUT: %var = alloca i32, align 4 +// CHECK:STDOUT: %b = alloca i32, align 4 // CHECK:STDOUT: %Echo = call i32 @Echo(i32 1) -// CHECK:STDOUT: store i32 %Echo, ptr %var, align 4 +// CHECK:STDOUT: store i32 %Echo, ptr %b, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon b/toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon index 7d603339bb92..6720acfde74d 100644 --- a/toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon +++ b/toolchain/lowering/testdata/function/call/implicit_empty_tuple_as_arg.carbon @@ -26,11 +26,11 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { // CHECK:STDOUT: %tuple = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %x = alloca {}, align 8 // CHECK:STDOUT: call void @Foo() // CHECK:STDOUT: %call.result = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %call.result, align 1 // CHECK:STDOUT: %Bar = call {} @Bar({} %1) -// CHECK:STDOUT: store {} %Bar, ptr %var, align 1 +// CHECK:STDOUT: store {} %Bar, ptr %x, align 1 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/return_implicit.carbon b/toolchain/lowering/testdata/function/call/return_implicit.carbon index f047a30c1b7d..7346a5808751 100644 --- a/toolchain/lowering/testdata/function/call/return_implicit.carbon +++ b/toolchain/lowering/testdata/function/call/return_implicit.carbon @@ -21,10 +21,10 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { // CHECK:STDOUT: %tuple = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %b = alloca {}, align 8 // CHECK:STDOUT: call void @MakeImplicitEmptyTuple() // CHECK:STDOUT: %call.result = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %call.result, align 1 -// CHECK:STDOUT: store {} %1, ptr %var, align 1 +// CHECK:STDOUT: store {} %1, ptr %b, align 1 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/function/call/var_param.carbon b/toolchain/lowering/testdata/function/call/var_param.carbon index ef42b8a12e81..8b0c1ba787ca 100644 --- a/toolchain/lowering/testdata/function/call/var_param.carbon +++ b/toolchain/lowering/testdata/function/call/var_param.carbon @@ -19,9 +19,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { -// CHECK:STDOUT: %var = alloca i32, align 4 -// CHECK:STDOUT: store i32 0, ptr %var, align 4 -// CHECK:STDOUT: %1 = load i32, ptr %var, align 4 +// CHECK:STDOUT: %a = alloca i32, align 4 +// CHECK:STDOUT: store i32 0, ptr %a, align 4 +// CHECK:STDOUT: %1 = load i32, ptr %a, align 4 // CHECK:STDOUT: call void @DoNothing(i32 %1) // CHECK:STDOUT: %call.result = alloca {}, align 8 // CHECK:STDOUT: ret void diff --git a/toolchain/lowering/testdata/index/array_element_access.carbon b/toolchain/lowering/testdata/index/array_element_access.carbon index b24836c855aa..b90963cf8813 100644 --- a/toolchain/lowering/testdata/index/array_element_access.carbon +++ b/toolchain/lowering/testdata/index/array_element_access.carbon @@ -47,7 +47,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define void @Run() { -// CHECK:STDOUT: %var = alloca [2 x i32], align 4 +// CHECK:STDOUT: %a = alloca [2 x i32], align 4 // CHECK:STDOUT: %A = call { i32, i32 } @A() // CHECK:STDOUT: %array = alloca [2 x i32], align 4 // CHECK:STDOUT: %array.element = extractvalue { i32, i32 } %A, 0 @@ -57,19 +57,19 @@ fn Run() { // CHECK:STDOUT: %2 = getelementptr inbounds [2 x i32], ptr %array, i32 0, i32 1 // CHECK:STDOUT: store i32 %array.element1, ptr %2, align 4 // CHECK:STDOUT: %3 = load [2 x i32], ptr %array, align 4 -// CHECK:STDOUT: store [2 x i32] %3, ptr %var, align 4 -// CHECK:STDOUT: %var2 = alloca i32, align 4 -// CHECK:STDOUT: %A3 = call { i32, i32 } @A() -// CHECK:STDOUT: %tuple.index = extractvalue { i32, i32 } %A3, 0 -// CHECK:STDOUT: store i32 %tuple.index, ptr %var2, align 4 -// CHECK:STDOUT: %var4 = alloca i32, align 4 -// CHECK:STDOUT: %4 = load i32, ptr %var2, align 4 -// CHECK:STDOUT: %array.index = getelementptr inbounds [2 x i32], ptr %var, i32 %4 +// CHECK:STDOUT: store [2 x i32] %3, ptr %a, align 4 +// CHECK:STDOUT: %b = alloca i32, align 4 +// CHECK:STDOUT: %A2 = call { i32, i32 } @A() +// CHECK:STDOUT: %tuple.index = extractvalue { i32, i32 } %A2, 0 +// CHECK:STDOUT: store i32 %tuple.index, ptr %b, align 4 +// CHECK:STDOUT: %c = alloca i32, align 4 +// CHECK:STDOUT: %4 = load i32, ptr %b, align 4 +// CHECK:STDOUT: %array.index = getelementptr inbounds [2 x i32], ptr %a, i32 %4 // CHECK:STDOUT: %5 = load i32, ptr %array.index, align 4 -// CHECK:STDOUT: store i32 %5, ptr %var4, align 4 -// CHECK:STDOUT: %var5 = alloca i32, align 4 +// CHECK:STDOUT: store i32 %5, ptr %c, align 4 +// CHECK:STDOUT: %d = alloca i32, align 4 // CHECK:STDOUT: %B = call [2 x i32] @B() -// CHECK:STDOUT: %array.index6 = extractvalue [2 x i32] %B, 1 -// CHECK:STDOUT: store i32 %array.index6, ptr %var5, align 4 +// CHECK:STDOUT: %array.index3 = extractvalue [2 x i32] %B, 1 +// CHECK:STDOUT: store i32 %array.index3, ptr %d, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/index/tuple_element_access.carbon b/toolchain/lowering/testdata/index/tuple_element_access.carbon index ede4b5cbdc81..fa565fd07dd5 100644 --- a/toolchain/lowering/testdata/index/tuple_element_access.carbon +++ b/toolchain/lowering/testdata/index/tuple_element_access.carbon @@ -24,7 +24,7 @@ fn Run() -> i32 { // CHECK:STDOUT: store %type zeroinitializer, ptr %2, align 1 // CHECK:STDOUT: %3 = getelementptr inbounds { %type, %type, %type }, ptr %tuple, i32 0, i32 2 // CHECK:STDOUT: store %type zeroinitializer, ptr %3, align 1 -// CHECK:STDOUT: %var = alloca { i32, i32, i32 }, align 8 +// CHECK:STDOUT: %a = alloca { i32, i32, i32 }, align 8 // CHECK:STDOUT: %tuple1 = alloca { i32, i32, i32 }, align 8 // CHECK:STDOUT: %4 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple1, i32 0, i32 0 // CHECK:STDOUT: store i32 0, ptr %4, align 4 @@ -33,14 +33,14 @@ fn Run() -> i32 { // CHECK:STDOUT: %6 = getelementptr inbounds { i32, i32, i32 }, ptr %tuple1, i32 0, i32 2 // CHECK:STDOUT: store i32 2, ptr %6, align 4 // CHECK:STDOUT: %7 = load { i32, i32, i32 }, ptr %tuple1, align 4 -// CHECK:STDOUT: store { i32, i32, i32 } %7, ptr %var, align 4 -// CHECK:STDOUT: %var2 = alloca i32, align 4 -// CHECK:STDOUT: %tuple.index = getelementptr inbounds { i32, i32, i32 }, ptr %var, i32 0, i32 0 +// CHECK:STDOUT: store { i32, i32, i32 } %7, ptr %a, align 4 +// CHECK:STDOUT: %b = alloca i32, align 4 +// CHECK:STDOUT: %tuple.index = getelementptr inbounds { i32, i32, i32 }, ptr %a, i32 0, i32 0 // CHECK:STDOUT: %8 = load i32, ptr %tuple.index, align 4 -// CHECK:STDOUT: store i32 %8, ptr %var2, align 4 -// CHECK:STDOUT: %var3 = alloca i32, align 4 -// CHECK:STDOUT: %tuple.index4 = getelementptr inbounds { i32, i32, i32 }, ptr %var, i32 0, i32 2 -// CHECK:STDOUT: %9 = load i32, ptr %tuple.index4, align 4 -// CHECK:STDOUT: store i32 %9, ptr %var3, align 4 +// CHECK:STDOUT: store i32 %8, ptr %b, align 4 +// CHECK:STDOUT: %c = alloca i32, align 4 +// CHECK:STDOUT: %tuple.index2 = getelementptr inbounds { i32, i32, i32 }, ptr %a, i32 0, i32 2 +// CHECK:STDOUT: %9 = load i32, ptr %tuple.index2, align 4 +// CHECK:STDOUT: store i32 %9, ptr %c, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/index/tuple_return_value_access.carbon b/toolchain/lowering/testdata/index/tuple_return_value_access.carbon index 18878150d178..ad2ddc83fbad 100644 --- a/toolchain/lowering/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/lowering/testdata/index/tuple_return_value_access.carbon @@ -24,9 +24,9 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define void @Run() { -// CHECK:STDOUT: %var = alloca i32, align 4 +// CHECK:STDOUT: %t = alloca i32, align 4 // CHECK:STDOUT: %F = call { i32, i32 } @F() // CHECK:STDOUT: %tuple.index = extractvalue { i32, i32 } %F, 1 -// CHECK:STDOUT: store i32 %tuple.index, ptr %var, align 4 +// CHECK:STDOUT: store i32 %tuple.index, ptr %t, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/operators/assignment.carbon b/toolchain/lowering/testdata/operators/assignment.carbon index ad1089e721e1..6c2b75c2a0bd 100644 --- a/toolchain/lowering/testdata/operators/assignment.carbon +++ b/toolchain/lowering/testdata/operators/assignment.carbon @@ -17,21 +17,21 @@ fn Main() { // CHECK:STDOUT: %type = type {} // CHECK:STDOUT: // CHECK:STDOUT: define void @Main() { -// CHECK:STDOUT: %var = alloca i32, align 4 -// CHECK:STDOUT: store i32 12, ptr %var, align 4 -// CHECK:STDOUT: store i32 -7, ptr %var, align 4 +// CHECK:STDOUT: %a = alloca i32, align 4 +// CHECK:STDOUT: store i32 12, ptr %a, align 4 +// CHECK:STDOUT: store i32 -7, ptr %a, align 4 // CHECK:STDOUT: %tuple = alloca { %type, %type }, align 8 // CHECK:STDOUT: %1 = getelementptr inbounds { %type, %type }, ptr %tuple, i32 0, i32 0 // CHECK:STDOUT: store %type zeroinitializer, ptr %1, align 1 // CHECK:STDOUT: %2 = getelementptr inbounds { %type, %type }, ptr %tuple, i32 0, i32 1 // CHECK:STDOUT: store %type zeroinitializer, ptr %2, align 1 -// CHECK:STDOUT: %var1 = alloca { i32, i32 }, align 8 -// CHECK:STDOUT: %tuple2 = alloca { i32, i32 }, align 8 -// CHECK:STDOUT: %3 = getelementptr inbounds { i32, i32 }, ptr %tuple2, i32 0, i32 0 +// CHECK:STDOUT: %b = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %tuple1 = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %3 = getelementptr inbounds { i32, i32 }, ptr %tuple1, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %3, align 4 -// CHECK:STDOUT: %4 = getelementptr inbounds { i32, i32 }, ptr %tuple2, i32 0, i32 1 +// CHECK:STDOUT: %4 = getelementptr inbounds { i32, i32 }, ptr %tuple1, i32 0, i32 1 // CHECK:STDOUT: store i32 2, ptr %4, align 4 -// CHECK:STDOUT: %5 = load { i32, i32 }, ptr %tuple2, align 4 -// CHECK:STDOUT: store { i32, i32 } %5, ptr %var1, align 4 +// CHECK:STDOUT: %5 = load { i32, i32 }, ptr %tuple1, align 4 +// CHECK:STDOUT: store { i32, i32 } %5, ptr %b, align 4 // CHECK:STDOUT: ret void // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/pointer/address_of_field.carbon b/toolchain/lowering/testdata/pointer/address_of_field.carbon index 10e39443ab8c..d5596aaac8a7 100644 --- a/toolchain/lowering/testdata/pointer/address_of_field.carbon +++ b/toolchain/lowering/testdata/pointer/address_of_field.carbon @@ -18,15 +18,15 @@ fn F() { // CHECK:STDOUT: declare void @G(ptr) // CHECK:STDOUT: // CHECK:STDOUT: define void @F() { -// CHECK:STDOUT: %var = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %s = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %struct = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %a = getelementptr inbounds { i32, i32 }, ptr %struct, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %a, align 4 // CHECK:STDOUT: %b = getelementptr inbounds { i32, i32 }, ptr %struct, i32 0, i32 1 // CHECK:STDOUT: store i32 2, ptr %b, align 4 // CHECK:STDOUT: %1 = load { i32, i32 }, ptr %struct, align 4 -// CHECK:STDOUT: store { i32, i32 } %1, ptr %var, align 4 -// CHECK:STDOUT: %b1 = getelementptr inbounds { i32, i32 }, ptr %var, i32 0, i32 1 +// CHECK:STDOUT: store { i32, i32 } %1, ptr %s, align 4 +// CHECK:STDOUT: %b1 = getelementptr inbounds { i32, i32 }, ptr %s, i32 0, i32 1 // CHECK:STDOUT: %2 = load ptr, ptr %b1, align 8 // CHECK:STDOUT: call void @G(ptr %2) // CHECK:STDOUT: %call.result = alloca {}, align 8 diff --git a/toolchain/lowering/testdata/pointer/basic.carbon b/toolchain/lowering/testdata/pointer/basic.carbon index d3c94a24572d..6a10ba48de41 100644 --- a/toolchain/lowering/testdata/pointer/basic.carbon +++ b/toolchain/lowering/testdata/pointer/basic.carbon @@ -22,9 +22,9 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: define i32 @F() { -// CHECK:STDOUT: %var = alloca i32, align 4 -// CHECK:STDOUT: store i32 0, ptr %var, align 4 -// CHECK:STDOUT: %1 = load ptr, ptr %var, align 8 +// CHECK:STDOUT: %n = alloca i32, align 4 +// CHECK:STDOUT: store i32 0, ptr %n, align 4 +// CHECK:STDOUT: %1 = load ptr, ptr %n, align 8 // CHECK:STDOUT: %G = call i32 @G(ptr %1) // CHECK:STDOUT: ret i32 %G // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/return/var.carbon b/toolchain/lowering/testdata/return/var.carbon index f71db91a52db..0e6934ac584b 100644 --- a/toolchain/lowering/testdata/return/var.carbon +++ b/toolchain/lowering/testdata/return/var.carbon @@ -13,8 +13,8 @@ fn Main() -> i32 { // CHECK:STDOUT: source_filename = "var.carbon" // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Main() { -// CHECK:STDOUT: %var = alloca i32, align 4 -// CHECK:STDOUT: store i32 0, ptr %var, align 4 -// CHECK:STDOUT: %1 = load i32, ptr %var, align 4 +// CHECK:STDOUT: %x = alloca i32, align 4 +// CHECK:STDOUT: store i32 0, ptr %x, align 4 +// CHECK:STDOUT: %1 = load i32, ptr %x, align 4 // CHECK:STDOUT: ret i32 %1 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/struct/empty.carbon b/toolchain/lowering/testdata/struct/empty.carbon index bd85f2c5e1e5..ed29c045e7df 100644 --- a/toolchain/lowering/testdata/struct/empty.carbon +++ b/toolchain/lowering/testdata/struct/empty.carbon @@ -15,13 +15,13 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { // CHECK:STDOUT: %struct = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %x = alloca {}, align 8 // CHECK:STDOUT: %struct1 = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %struct1, align 1 -// CHECK:STDOUT: store {} %1, ptr %var, align 1 +// CHECK:STDOUT: store {} %1, ptr %x, align 1 // CHECK:STDOUT: %struct2 = alloca {}, align 8 -// CHECK:STDOUT: %var3 = alloca {}, align 8 -// CHECK:STDOUT: %2 = load {}, ptr %var, align 1 -// CHECK:STDOUT: store {} %2, ptr %var3, align 1 +// CHECK:STDOUT: %y = alloca {}, align 8 +// CHECK:STDOUT: %2 = load {}, ptr %x, align 1 +// CHECK:STDOUT: store {} %2, ptr %y, align 1 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/struct/member_access.carbon b/toolchain/lowering/testdata/struct/member_access.carbon index 6fc05eb2509c..fc7c669bb24c 100644 --- a/toolchain/lowering/testdata/struct/member_access.carbon +++ b/toolchain/lowering/testdata/struct/member_access.carbon @@ -15,20 +15,20 @@ fn Run() -> i32 { // CHECK:STDOUT: source_filename = "member_access.carbon" // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { -// CHECK:STDOUT: %var = alloca { double, i32 }, align 8 +// CHECK:STDOUT: %x = alloca { double, i32 }, align 8 // CHECK:STDOUT: %struct = alloca { double, i32 }, align 8 // CHECK:STDOUT: %a = getelementptr inbounds { double, i32 }, ptr %struct, i32 0, i32 0 // CHECK:STDOUT: store double 0.000000e+00, ptr %a, align 8 // CHECK:STDOUT: %b = getelementptr inbounds { double, i32 }, ptr %struct, i32 0, i32 1 // CHECK:STDOUT: store i32 1, ptr %b, align 4 // CHECK:STDOUT: %1 = load { double, i32 }, ptr %struct, align 8 -// CHECK:STDOUT: store { double, i32 } %1, ptr %var, align 8 -// CHECK:STDOUT: %var1 = alloca i32, align 4 -// CHECK:STDOUT: %b2 = getelementptr inbounds { double, i32 }, ptr %var, i32 0, i32 1 -// CHECK:STDOUT: %2 = load i32, ptr %b2, align 4 -// CHECK:STDOUT: store i32 %2, ptr %var1, align 4 -// CHECK:STDOUT: %var3 = alloca i32, align 4 -// CHECK:STDOUT: %3 = load i32, ptr %var1, align 4 -// CHECK:STDOUT: store i32 %3, ptr %var3, align 4 +// CHECK:STDOUT: store { double, i32 } %1, ptr %x, align 8 +// CHECK:STDOUT: %y = alloca i32, align 4 +// CHECK:STDOUT: %b1 = getelementptr inbounds { double, i32 }, ptr %x, i32 0, i32 1 +// CHECK:STDOUT: %2 = load i32, ptr %b1, align 4 +// CHECK:STDOUT: store i32 %2, ptr %y, align 4 +// CHECK:STDOUT: %z = alloca i32, align 4 +// CHECK:STDOUT: %3 = load i32, ptr %y, align 4 +// CHECK:STDOUT: store i32 %3, ptr %z, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/struct/one_entry.carbon b/toolchain/lowering/testdata/struct/one_entry.carbon index 1c48cbcff7f6..2c0679af396b 100644 --- a/toolchain/lowering/testdata/struct/one_entry.carbon +++ b/toolchain/lowering/testdata/struct/one_entry.carbon @@ -14,14 +14,14 @@ fn Run() -> i32 { // CHECK:STDOUT: source_filename = "one_entry.carbon" // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { -// CHECK:STDOUT: %var = alloca { i32 }, align 8 +// CHECK:STDOUT: %x = alloca { i32 }, align 8 // CHECK:STDOUT: %struct = alloca { i32 }, align 8 // CHECK:STDOUT: %a = getelementptr inbounds { i32 }, ptr %struct, i32 0, i32 0 // CHECK:STDOUT: store i32 4, ptr %a, align 4 // CHECK:STDOUT: %1 = load { i32 }, ptr %struct, align 4 -// CHECK:STDOUT: store { i32 } %1, ptr %var, align 4 -// CHECK:STDOUT: %var1 = alloca { i32 }, align 8 -// CHECK:STDOUT: %2 = load { i32 }, ptr %var, align 4 -// CHECK:STDOUT: store { i32 } %2, ptr %var1, align 4 +// CHECK:STDOUT: store { i32 } %1, ptr %x, align 4 +// CHECK:STDOUT: %y = alloca { i32 }, align 8 +// CHECK:STDOUT: %2 = load { i32 }, ptr %x, align 4 +// CHECK:STDOUT: store { i32 } %2, ptr %y, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/struct/two_entries.carbon b/toolchain/lowering/testdata/struct/two_entries.carbon index 236faf73cab1..3eb0c53c8650 100644 --- a/toolchain/lowering/testdata/struct/two_entries.carbon +++ b/toolchain/lowering/testdata/struct/two_entries.carbon @@ -14,16 +14,16 @@ fn Run() -> i32 { // CHECK:STDOUT: source_filename = "two_entries.carbon" // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { -// CHECK:STDOUT: %var = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %x = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %struct = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %a = getelementptr inbounds { i32, i32 }, ptr %struct, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %a, align 4 // CHECK:STDOUT: %b = getelementptr inbounds { i32, i32 }, ptr %struct, i32 0, i32 1 // CHECK:STDOUT: store i32 2, ptr %b, align 4 // CHECK:STDOUT: %1 = load { i32, i32 }, ptr %struct, align 4 -// CHECK:STDOUT: store { i32, i32 } %1, ptr %var, align 4 -// CHECK:STDOUT: %var1 = alloca { i32, i32 }, align 8 -// CHECK:STDOUT: %2 = load { i32, i32 }, ptr %var, align 4 -// CHECK:STDOUT: store { i32, i32 } %2, ptr %var1, align 4 +// CHECK:STDOUT: store { i32, i32 } %1, ptr %x, align 4 +// CHECK:STDOUT: %y = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %2 = load { i32, i32 }, ptr %x, align 4 +// CHECK:STDOUT: store { i32, i32 } %2, ptr %y, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/tuple/empty.carbon b/toolchain/lowering/testdata/tuple/empty.carbon index 4bcf94734492..9345a13094e3 100644 --- a/toolchain/lowering/testdata/tuple/empty.carbon +++ b/toolchain/lowering/testdata/tuple/empty.carbon @@ -15,13 +15,13 @@ fn Run() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { // CHECK:STDOUT: %tuple = alloca {}, align 8 -// CHECK:STDOUT: %var = alloca {}, align 8 +// CHECK:STDOUT: %x = alloca {}, align 8 // CHECK:STDOUT: %tuple1 = alloca {}, align 8 // CHECK:STDOUT: %1 = load {}, ptr %tuple1, align 1 -// CHECK:STDOUT: store {} %1, ptr %var, align 1 +// CHECK:STDOUT: store {} %1, ptr %x, align 1 // CHECK:STDOUT: %tuple2 = alloca {}, align 8 -// CHECK:STDOUT: %var3 = alloca {}, align 8 -// CHECK:STDOUT: %2 = load {}, ptr %var, align 1 -// CHECK:STDOUT: store {} %2, ptr %var3, align 1 +// CHECK:STDOUT: %y = alloca {}, align 8 +// CHECK:STDOUT: %2 = load {}, ptr %x, align 1 +// CHECK:STDOUT: store {} %2, ptr %y, align 1 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/tuple/one_entry.carbon b/toolchain/lowering/testdata/tuple/one_entry.carbon index 8b39469934e8..039e21658b1d 100644 --- a/toolchain/lowering/testdata/tuple/one_entry.carbon +++ b/toolchain/lowering/testdata/tuple/one_entry.carbon @@ -19,17 +19,17 @@ fn Run() -> i32 { // CHECK:STDOUT: %tuple = alloca { %type }, align 8 // CHECK:STDOUT: %1 = getelementptr inbounds { %type }, ptr %tuple, i32 0, i32 0 // CHECK:STDOUT: store %type zeroinitializer, ptr %1, align 1 -// CHECK:STDOUT: %var = alloca { i32 }, align 8 +// CHECK:STDOUT: %x = alloca { i32 }, align 8 // CHECK:STDOUT: %tuple1 = alloca { i32 }, align 8 // CHECK:STDOUT: %2 = getelementptr inbounds { i32 }, ptr %tuple1, i32 0, i32 0 // CHECK:STDOUT: store i32 1, ptr %2, align 4 // CHECK:STDOUT: %3 = load { i32 }, ptr %tuple1, align 4 -// CHECK:STDOUT: store { i32 } %3, ptr %var, align 4 +// CHECK:STDOUT: store { i32 } %3, ptr %x, align 4 // CHECK:STDOUT: %tuple2 = alloca { %type }, align 8 // CHECK:STDOUT: %4 = getelementptr inbounds { %type }, ptr %tuple2, i32 0, i32 0 // CHECK:STDOUT: store %type zeroinitializer, ptr %4, align 1 -// CHECK:STDOUT: %var3 = alloca { i32 }, align 8 -// CHECK:STDOUT: %5 = load { i32 }, ptr %var, align 4 -// CHECK:STDOUT: store { i32 } %5, ptr %var3, align 4 +// CHECK:STDOUT: %y = alloca { i32 }, align 8 +// CHECK:STDOUT: %5 = load { i32 }, ptr %x, align 4 +// CHECK:STDOUT: store { i32 } %5, ptr %y, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/tuple/two_entries.carbon b/toolchain/lowering/testdata/tuple/two_entries.carbon index 6c93199c73f2..33b3ce7a3b24 100644 --- a/toolchain/lowering/testdata/tuple/two_entries.carbon +++ b/toolchain/lowering/testdata/tuple/two_entries.carbon @@ -21,21 +21,21 @@ fn Run() -> i32 { // CHECK:STDOUT: store %type zeroinitializer, ptr %1, align 1 // CHECK:STDOUT: %2 = getelementptr inbounds { %type, %type }, ptr %tuple, i32 0, i32 1 // CHECK:STDOUT: store %type zeroinitializer, ptr %2, align 1 -// CHECK:STDOUT: %var = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %x = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %tuple1 = alloca { i32, i32 }, align 8 // CHECK:STDOUT: %3 = getelementptr inbounds { i32, i32 }, ptr %tuple1, i32 0, i32 0 // CHECK:STDOUT: store i32 12, ptr %3, align 4 // CHECK:STDOUT: %4 = getelementptr inbounds { i32, i32 }, ptr %tuple1, i32 0, i32 1 // CHECK:STDOUT: store i32 7, ptr %4, align 4 // CHECK:STDOUT: %5 = load { i32, i32 }, ptr %tuple1, align 4 -// CHECK:STDOUT: store { i32, i32 } %5, ptr %var, align 4 +// CHECK:STDOUT: store { i32, i32 } %5, ptr %x, align 4 // CHECK:STDOUT: %tuple2 = alloca { %type, %type }, align 8 // CHECK:STDOUT: %6 = getelementptr inbounds { %type, %type }, ptr %tuple2, i32 0, i32 0 // CHECK:STDOUT: store %type zeroinitializer, ptr %6, align 1 // CHECK:STDOUT: %7 = getelementptr inbounds { %type, %type }, ptr %tuple2, i32 0, i32 1 // CHECK:STDOUT: store %type zeroinitializer, ptr %7, align 1 -// CHECK:STDOUT: %var3 = alloca { i32, i32 }, align 8 -// CHECK:STDOUT: %8 = load { i32, i32 }, ptr %var, align 4 -// CHECK:STDOUT: store { i32, i32 } %8, ptr %var3, align 4 +// CHECK:STDOUT: %y = alloca { i32, i32 }, align 8 +// CHECK:STDOUT: %8 = load { i32, i32 }, ptr %x, align 4 +// CHECK:STDOUT: store { i32, i32 } %8, ptr %y, align 4 // CHECK:STDOUT: ret i32 0 // CHECK:STDOUT: } diff --git a/toolchain/lowering/testdata/var/local.carbon b/toolchain/lowering/testdata/var/local.carbon index 49c010f6c76c..bd7ad13283ea 100644 --- a/toolchain/lowering/testdata/var/local.carbon +++ b/toolchain/lowering/testdata/var/local.carbon @@ -13,8 +13,8 @@ fn Run() -> i32 { // CHECK:STDOUT: source_filename = "local.carbon" // CHECK:STDOUT: // CHECK:STDOUT: define i32 @Run() { -// CHECK:STDOUT: %var = alloca i32, align 4 -// CHECK:STDOUT: store i32 1, ptr %var, align 4 -// CHECK:STDOUT: %1 = load i32, ptr %var, align 4 +// CHECK:STDOUT: %x = alloca i32, align 4 +// CHECK:STDOUT: store i32 1, ptr %x, align 4 +// CHECK:STDOUT: %1 = load i32, ptr %x, align 4 // CHECK:STDOUT: ret i32 %1 // CHECK:STDOUT: } diff --git a/toolchain/semantics/semantics_handle_function.cpp b/toolchain/semantics/semantics_handle_function.cpp index e6d7cd2eb492..321cb6254327 100644 --- a/toolchain/semantics/semantics_handle_function.cpp +++ b/toolchain/semantics/semantics_handle_function.cpp @@ -91,8 +91,8 @@ auto SemanticsHandleFunctionDefinitionStart(SemanticsContext& context, for (auto ref_id : context.semantics_ir().GetNodeBlock(function.param_refs_id)) { auto ref = context.semantics_ir().GetNode(ref_id); - auto [name_id, target_id] = ref.GetAsBindName(); - context.AddNameToLookup(ref.parse_node(), name_id, target_id); + auto name_id = ref.GetAsVarStorage(); + context.AddNameToLookup(ref.parse_node(), name_id, ref_id); } context.node_stack().Push(parse_node, function_id); diff --git a/toolchain/semantics/semantics_handle_pattern_binding.cpp b/toolchain/semantics/semantics_handle_pattern_binding.cpp index 7e7350f25180..1cda0ac96d7b 100644 --- a/toolchain/semantics/semantics_handle_pattern_binding.cpp +++ b/toolchain/semantics/semantics_handle_pattern_binding.cpp @@ -28,13 +28,8 @@ auto SemanticsHandlePatternBinding(SemanticsContext& context, context.node_stack().PopWithParseNode(); // Allocate storage, linked to the name for error locations. - auto storage_id = - context.AddNode(SemanticsNode::VarStorage::Make(name_node, cast_type_id)); - - // Bind the name to storage. - context.AddNodeAndPush(parse_node, - SemanticsNode::BindName::Make(name_node, cast_type_id, - name_id, storage_id)); + context.AddNodeAndPush(parse_node, SemanticsNode::VarStorage::Make( + name_node, cast_type_id, name_id)); return true; } diff --git a/toolchain/semantics/semantics_handle_variable.cpp b/toolchain/semantics/semantics_handle_variable.cpp index e8f54bcf6e19..d530a4fee064 100644 --- a/toolchain/semantics/semantics_handle_variable.cpp +++ b/toolchain/semantics/semantics_handle_variable.cpp @@ -21,18 +21,17 @@ auto SemanticsHandleVariableDeclaration(SemanticsContext& context, } // Get the storage and add it to name lookup. - SemanticsNodeId binding_id = + SemanticsNodeId var_id = context.node_stack().Pop(); - auto binding = context.semantics_ir().GetNode(binding_id); - auto [name_id, storage_id] = binding.GetAsBindName(); - context.AddNameToLookup(binding.parse_node(), name_id, storage_id); + auto var = context.semantics_ir().GetNode(var_id); + auto name_id = var.GetAsVarStorage(); + context.AddNameToLookup(var.parse_node(), name_id, var_id); // If there was an initializer, assign it to storage. if (has_init) { - auto cast_value_id = context.ImplicitAsRequired( - parse_node, expr_node_id, - context.semantics_ir().GetNode(storage_id).type_id()); + auto cast_value_id = + context.ImplicitAsRequired(parse_node, expr_node_id, var.type_id()); context.AddNode( - SemanticsNode::Assign::Make(parse_node, storage_id, cast_value_id)); + SemanticsNode::Assign::Make(parse_node, var_id, cast_value_id)); } context.node_stack() diff --git a/toolchain/semantics/semantics_ir.cpp b/toolchain/semantics/semantics_ir.cpp index d69b9f62259b..b09afd57a644 100644 --- a/toolchain/semantics/semantics_ir.cpp +++ b/toolchain/semantics/semantics_ir.cpp @@ -226,7 +226,6 @@ static auto GetTypePrecedence(SemanticsNodeKind kind) -> int { case SemanticsNodeKind::ArrayValue: case SemanticsNodeKind::Assign: case SemanticsNodeKind::BinaryOperatorAdd: - case SemanticsNodeKind::BindName: case SemanticsNodeKind::BlockArg: case SemanticsNodeKind::BoolLiteral: case SemanticsNodeKind::Branch: @@ -381,7 +380,6 @@ auto SemanticsIR::StringifyType(SemanticsTypeId type_id, case SemanticsNodeKind::ArrayValue: case SemanticsNodeKind::Assign: case SemanticsNodeKind::BinaryOperatorAdd: - case SemanticsNodeKind::BindName: case SemanticsNodeKind::BlockArg: case SemanticsNodeKind::BoolLiteral: case SemanticsNodeKind::Branch: @@ -459,12 +457,6 @@ auto GetSemanticsExpressionCategory(const SemanticsIR& semantics_ir, // TODO: This should eventually be Initializing. return SemanticsExpressionCategory::Value; - case SemanticsNodeKind::BindName: { - auto [name_id, value_id] = node.GetAsBindName(); - node_id = value_id; - continue; - } - case SemanticsNodeKind::AddressOf: case SemanticsNodeKind::ArrayType: case SemanticsNodeKind::BinaryOperatorAdd: diff --git a/toolchain/semantics/semantics_ir.h b/toolchain/semantics/semantics_ir.h index 0ff4d2c1bbc9..d4aad6d85022 100644 --- a/toolchain/semantics/semantics_ir.h +++ b/toolchain/semantics/semantics_ir.h @@ -24,7 +24,7 @@ struct SemanticsFunction { } if (!body_block_ids.empty()) { out << llvm::formatv( - ", body: {{{0}}}", + ", body: [{0}]", llvm::make_range(body_block_ids.begin(), body_block_ids.end())); } out << "}"; diff --git a/toolchain/semantics/semantics_ir_formatter.cpp b/toolchain/semantics/semantics_ir_formatter.cpp index 7b4194d3bd98..89bb25038f6d 100644 --- a/toolchain/semantics/semantics_ir_formatter.cpp +++ b/toolchain/semantics/semantics_ir_formatter.cpp @@ -326,20 +326,10 @@ class NodeNamer { Scope& scope = GetScopeInfo(scope_idx); - // Use bound names where available. The BindName node appears after the node - // that it's giving a name to, so we need to do this before assigning - // fallback names. + // Use bound names where available. Otherwise, assign a backup name. for (auto node_id : semantics_ir_.GetNodeBlock(block_id)) { auto node = semantics_ir_.GetNode(node_id); switch (node.kind()) { - case SemanticsNodeKind::BindName: { - auto [name_id, named_node_id] = node.GetAsBindName(); - nodes[named_node_id.index] = { - scope_idx, - scope.nodes.AllocateName(*this, node.parse_node(), - semantics_ir_.GetString(name_id).str())}; - break; - } case SemanticsNodeKind::Branch: { auto dest_id = node.GetAsBranch(); AddBlockLabel(scope_idx, dest_id, node); @@ -355,20 +345,24 @@ class NodeNamer { AddBlockLabel(scope_idx, dest_id, node); break; } - default: + case SemanticsNodeKind::VarStorage: { + // TODO: Eventually this name will be optional, and we'll want to + // provide something like `var` as a default. However, that's not + // possible right now so cannot be tested. + auto name_id = node.GetAsVarStorage(); + nodes[node_id.index] = { + scope_idx, + scope.nodes.AllocateName(*this, node.parse_node(), + semantics_ir_.GetString(name_id).str())}; + break; + } + default: { + // Sequentially number all remaining values. + if (node.kind().value_kind() != SemanticsNodeValueKind::None) { + nodes[node_id.index] = { + scope_idx, scope.nodes.AllocateName(*this, node.parse_node())}; + } break; - } - } - - // Sequentially number all remaining values. - for (auto node_id : semantics_ir_.GetNodeBlock(block_id)) { - auto node = semantics_ir_.GetNode(node_id); - if (node.kind() != SemanticsNodeKind::BindName && - node.kind().value_kind() != SemanticsNodeValueKind::None) { - auto& name = nodes[node_id.index]; - if (!name.second) { - name = {scope_idx, - scope.nodes.AllocateName(*this, node.parse_node())}; } } } @@ -429,11 +423,9 @@ class SemanticsIRFormatter { for (const SemanticsNodeId param_id : semantics_ir_.GetNodeBlock(fn.param_refs_id)) { out_ << sep; - auto param = semantics_ir_.GetNode(param_id); - auto [name_id, node_id] = param.GetAsBindName(); - FormatNodeName(node_id); + FormatNodeName(param_id); out_ << ": "; - FormatType(param.type_id()); + FormatType(semantics_ir_.GetNode(param_id).type_id()); } out_ << ")"; if (fn.return_type_id.is_valid()) { @@ -521,15 +513,6 @@ class SemanticsIRFormatter { FormatArgs(Kind::Get(node)); } - // BindName is handled by the NodeNamer and doesn't appear in the output. - // These nodes are currently used simply to give a name to another node, and - // are never referenced themselves. - // TODO: Include BindName nodes in the output if we start referring to them. - template <> - auto FormatInstruction(SemanticsNodeId /*node_id*/, - SemanticsNode /*node*/) - -> void {} - template <> auto FormatInstructionRHS(SemanticsNode node) -> void { diff --git a/toolchain/semantics/semantics_ir_test.cpp b/toolchain/semantics/semantics_ir_test.cpp index 489df4b0ed39..7e948a70500f 100644 --- a/toolchain/semantics/semantics_ir_test.cpp +++ b/toolchain/semantics/semantics_ir_test.cpp @@ -25,11 +25,13 @@ using ::testing::ElementsAre; using ::testing::IsEmpty; using ::testing::MatchesRegex; using ::testing::Pair; +using ::testing::SizeIs; TEST(SemanticsIRTest, YAML) { llvm::vfs::InMemoryFileSystem fs; - CARBON_CHECK(fs.addFile("test.carbon", /*ModificationTime=*/0, - llvm::MemoryBuffer::getMemBuffer("var x: i32 = 0;"))); + CARBON_CHECK(fs.addFile( + "test.carbon", /*ModificationTime=*/0, + llvm::MemoryBuffer::getMemBuffer("fn F() { var x: i32 = 0; return; }"))); TestRawOstream print_stream; Driver d(fs, print_stream, llvm::errs()); d.RunCommand( @@ -45,10 +47,10 @@ TEST(SemanticsIRTest, YAML) { Yaml::Value::FromText(print_stream.TakeStr()), ElementsAre(Yaml::Mapping(ElementsAre( Pair("cross_reference_irs_size", "1"), - Pair("functions", Yaml::Sequence(IsEmpty())), + Pair("functions", Yaml::Sequence(SizeIs(1))), Pair("integer_literals", Yaml::Sequence(ElementsAre("0"))), Pair("real_literals", Yaml::Sequence(IsEmpty())), - Pair("strings", Yaml::Sequence(ElementsAre("x"))), + Pair("strings", Yaml::Sequence(ElementsAre("F", "x"))), Pair("types", Yaml::Sequence(ElementsAre(node_builtin))), Pair("type_blocks", Yaml::Sequence(IsEmpty())), Pair("nodes", @@ -56,19 +58,19 @@ TEST(SemanticsIRTest, YAML) { // kind is required, other parts are optional. Each(Yaml::Mapping(Contains(Pair("kind", _)))), // A 0-arg node. - Contains(Yaml::Mapping(ElementsAre( - Pair("kind", "VarStorage"), Pair("type", type_id)))), + Contains(Yaml::Mapping(ElementsAre(Pair("kind", "Return")))), // A 1-arg node. Contains(Yaml::Mapping(ElementsAre( Pair("kind", "IntegerLiteral"), Pair("arg0", "int0"), Pair("type", type_id)))), // A 2-arg node. Contains(Yaml::Mapping(ElementsAre( - Pair("kind", "BindName"), Pair("arg0", "str0"), - Pair("arg1", node_id), Pair("type", type_id))))))), - // This production has only one node block. + Pair("kind", "Assign"), Pair("arg0", node_id), + Pair("arg1", node_id))))))), + // This production has only two node blocks. Pair("node_blocks", Yaml::Sequence(ElementsAre(Yaml::Sequence(IsEmpty()), + Yaml::Sequence(Each(node_id)), Yaml::Sequence(Each(node_id))))))))); } diff --git a/toolchain/semantics/semantics_node.h b/toolchain/semantics/semantics_node.h index f098659e7131..1ba6b0848aae 100644 --- a/toolchain/semantics/semantics_node.h +++ b/toolchain/semantics/semantics_node.h @@ -331,10 +331,6 @@ class SemanticsNode { SemanticsNodeId /*lhs_id*/, SemanticsNodeId /*rhs_id*/>; - using BindName = SemanticsNode::Factory; - using BlockArg = Factory; @@ -448,8 +444,10 @@ class SemanticsNode { using UnaryOperatorNot = Factory; - using VarStorage = Factory; - SemanticsNode() + using VarStorage = + Factory; + + explicit SemanticsNode() : SemanticsNode(ParseTree::Node::Invalid, SemanticsNodeKind::Invalid, SemanticsTypeId::Invalid) {} diff --git a/toolchain/semantics/semantics_node_kind.def b/toolchain/semantics/semantics_node_kind.def index b95bb001f784..15a1c55ff18a 100644 --- a/toolchain/semantics/semantics_node_kind.def +++ b/toolchain/semantics/semantics_node_kind.def @@ -51,7 +51,6 @@ CARBON_SEMANTICS_NODE_KIND_IMPL(ArrayType, "array_type", Typed, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(ArrayValue, "array_value", Typed, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(Assign, "assign", None, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(BinaryOperatorAdd, "add", Typed, NotTerminator) -CARBON_SEMANTICS_NODE_KIND_IMPL(BindName, "bind_name", Typed, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(BlockArg, "block_arg", Typed, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(BoolLiteral, "bool_literal", Typed, NotTerminator) CARBON_SEMANTICS_NODE_KIND_IMPL(Branch, "br", None, Terminator) diff --git a/toolchain/semantics/testdata/array/assign_return_value.carbon b/toolchain/semantics/testdata/array/assign_return_value.carbon index 22728b513c7f..04ce03c41ed4 100644 --- a/toolchain/semantics/testdata/array/assign_return_value.carbon +++ b/toolchain/semantics/testdata/array/assign_return_value.carbon @@ -12,8 +12,8 @@ fn Run() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: {block3}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: [block3]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -53,11 +53,10 @@ fn Run() { // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+10, arg1: type1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type3}, // CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function0, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+14, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+15}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+13, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+14}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -91,7 +90,6 @@ fn Run() { // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -116,7 +114,7 @@ fn Run() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc10_16: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_17: type = array_type %.loc10_16, i32 -// CHECK:STDOUT: %t: [i32; 1] = var +// CHECK:STDOUT: %t: [i32; 1] = var "t" // CHECK:STDOUT: %.loc10_22.1: (i32,) = call @F() // CHECK:STDOUT: %.loc10_22.2: [i32; 1] = array_value %.loc10_22.1 // CHECK:STDOUT: assign %t, %.loc10_22.2 diff --git a/toolchain/semantics/testdata/array/assign_var.carbon b/toolchain/semantics/testdata/array/assign_var.carbon index 0e0c16061a24..e9f7ebb4efce 100644 --- a/toolchain/semantics/testdata/array/assign_var.carbon +++ b/toolchain/semantics/testdata/array/assign_var.carbon @@ -26,7 +26,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: node+3, // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+17, +// CHECK:STDOUT: node+16, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -47,22 +47,20 @@ var b: [i32; 3] = a; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+6, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+10, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+14}, +// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+13}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type1}, -// CHECK:STDOUT: {kind: ArrayType, arg0: node+16, arg1: type1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+18, type: type3}, +// CHECK:STDOUT: {kind: ArrayType, arg0: node+15, arg1: type1, type: typeTypeType}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type3}, // CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+20}, +// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: node+18}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -88,8 +86,6 @@ var b: [i32; 3] = a; // CHECK:STDOUT: node+17, // CHECK:STDOUT: node+18, // CHECK:STDOUT: node+19, -// CHECK:STDOUT: node+20, -// CHECK:STDOUT: node+21, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -97,9 +93,9 @@ var b: [i32; 3] = a; // CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -110,7 +106,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: %.loc7_22.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc7_22.2: (type, type, type) = tuple_value (%.loc7_9, %.loc7_14, %.loc7_19) // CHECK:STDOUT: %.loc7_22.3: type = tuple_type (i32, i32, i32) -// CHECK:STDOUT: %a: (i32, i32, i32) = var +// CHECK:STDOUT: %a: (i32, i32, i32) = var "a" // CHECK:STDOUT: %.loc7_27.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_27.2: i32 = stub_reference %.loc7_27.1 // CHECK:STDOUT: %.loc7_30.1: i32 = int_literal 2 @@ -121,7 +117,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: assign %a, %.loc7_34 // CHECK:STDOUT: %.loc8_14: i32 = int_literal 3 // CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, i32 -// CHECK:STDOUT: %b: [i32; 3] = var +// CHECK:STDOUT: %b: [i32; 3] = var "b" // CHECK:STDOUT: %.loc7_5: [i32; 3] = array_value %a // CHECK:STDOUT: assign %b, %.loc7_5 // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/array/base.carbon b/toolchain/semantics/testdata/array/base.carbon index 7cc6c1a14b6c..f8741af26398 100644 --- a/toolchain/semantics/testdata/array/base.carbon +++ b/toolchain/semantics/testdata/array/base.carbon @@ -29,13 +29,13 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: nodeFloatingPointType, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+22, -// CHECK:STDOUT: node+25, -// CHECK:STDOUT: node+38, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+20, +// CHECK:STDOUT: node+23, +// CHECK:STDOUT: node+35, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -58,46 +58,43 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+7, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: ArrayType, arg0: node+10, arg1: type3, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type4}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type4}, +// CHECK:STDOUT: {kind: ArrayType, arg0: node+9, arg1: type3, type: typeTypeType}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type4}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type3}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type3}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type3}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real1, type: type3}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type3}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type3}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type5}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+19, type: type4}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+20}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+17, type: type4}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+18}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: ArrayType, arg0: node+24, arg1: type6, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type7}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+26, type: type7}, +// CHECK:STDOUT: {kind: ArrayType, arg0: node+22, arg1: type6, type: typeTypeType}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type7}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+28, type: type6}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+25, type: type6}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+30, type: type6}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+27, type: type6}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+32, type: type6}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+29, type: type6}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+34, type: type6}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+31, type: type6}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+36, type: type6}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type6}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock3, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type8}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+39, type: type7}, -// CHECK:STDOUT: {kind: Assign, arg0: node+26, arg1: node+40}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+36, type: type7}, +// CHECK:STDOUT: {kind: Assign, arg0: node+24, arg1: node+37}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -142,30 +139,27 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: node+36, // CHECK:STDOUT: node+37, // CHECK:STDOUT: node+38, -// CHECK:STDOUT: node+39, -// CHECK:STDOUT: node+40, -// CHECK:STDOUT: node+41, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+13, // CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+29, -// CHECK:STDOUT: node+31, -// CHECK:STDOUT: node+33, -// CHECK:STDOUT: node+35, -// CHECK:STDOUT: node+37, +// CHECK:STDOUT: node+26, +// CHECK:STDOUT: node+28, +// CHECK:STDOUT: node+30, +// CHECK:STDOUT: node+32, +// CHECK:STDOUT: node+34, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 -// CHECK:STDOUT: %a: [i32; 1] = var +// CHECK:STDOUT: %a: [i32; 1] = var "a" // CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1 // CHECK:STDOUT: %.loc7_22.1: type = tuple_type (i32) @@ -174,7 +168,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: assign %a, %.loc7_22.3 // CHECK:STDOUT: %.loc8_14: i32 = int_literal 2 // CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, f64 -// CHECK:STDOUT: %b: [f64; 2] = var +// CHECK:STDOUT: %b: [f64; 2] = var "b" // CHECK:STDOUT: %.loc8_20.1: f64 = real_literal 111e-1 // CHECK:STDOUT: %.loc8_20.2: f64 = stub_reference %.loc8_20.1 // CHECK:STDOUT: %.loc8_26.1: f64 = real_literal 22e-1 @@ -187,7 +181,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: %.loc9_10.2: () = tuple_value () // CHECK:STDOUT: %.loc9_13: i32 = int_literal 5 // CHECK:STDOUT: %.loc9_14: type = array_type %.loc9_13, () -// CHECK:STDOUT: %c: [(); 5] = var +// CHECK:STDOUT: %c: [(); 5] = var "c" // CHECK:STDOUT: %.loc9_20.1: () = tuple_value () // CHECK:STDOUT: %.loc9_20.2: () = stub_reference %.loc9_20.1 // CHECK:STDOUT: %.loc9_24.1: () = tuple_value () diff --git a/toolchain/semantics/testdata/array/fail_invalid_type.carbon b/toolchain/semantics/testdata/array/fail_invalid_type.carbon index 1297873819a2..f85793588661 100644 --- a/toolchain/semantics/testdata/array/fail_invalid_type.carbon +++ b/toolchain/semantics/testdata/array/fail_invalid_type.carbon @@ -31,8 +31,7 @@ var a: [1; 1]; // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+1, arg1: typeError, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+3, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -42,7 +41,6 @@ var a: [1; 1]; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -50,5 +48,5 @@ var a: [1; 1]; // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, -// CHECK:STDOUT: %a: [; 1] = var +// CHECK:STDOUT: %a: [; 1] = var "a" // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/array/fail_out_of_bound.carbon b/toolchain/semantics/testdata/array/fail_out_of_bound.carbon index ab69bbaa4d82..bb53acd0342c 100644 --- a/toolchain/semantics/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/semantics/testdata/array/fail_out_of_bound.carbon @@ -26,7 +26,7 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -38,14 +38,13 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -66,19 +65,18 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 -// CHECK:STDOUT: %a: [i32; 1] = var +// CHECK:STDOUT: %a: [i32; 1] = var "a" // CHECK:STDOUT: %.loc10_20.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_20.2: i32 = stub_reference %.loc10_20.1 // CHECK:STDOUT: %.loc10_23.1: i32 = int_literal 2 diff --git a/toolchain/semantics/testdata/array/fail_type_mismatch.carbon b/toolchain/semantics/testdata/array/fail_type_mismatch.carbon index 884eb02fada6..cdf9ff8e96aa 100644 --- a/toolchain/semantics/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/array/fail_type_mismatch.carbon @@ -26,7 +26,7 @@ var a: [i32; 2] = (1, 2.5); // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, // CHECK:STDOUT: nodeFloatingPointType, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -37,12 +37,11 @@ var a: [i32; 2] = (1, 2.5); // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type2}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type3}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -61,18 +60,17 @@ var a: [i32; 2] = (1, 2.5); // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 2 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 -// CHECK:STDOUT: %a: [i32; 2] = var +// CHECK:STDOUT: %a: [i32; 2] = var "a" // CHECK:STDOUT: %.loc10_20.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_20.2: i32 = stub_reference %.loc10_20.1 // CHECK:STDOUT: %.loc10_23.1: f64 = real_literal 25e-1 diff --git a/toolchain/semantics/testdata/basics/builtin_types.carbon b/toolchain/semantics/testdata/basics/builtin_types.carbon index b9da04af8707..c818f38d50f2 100644 --- a/toolchain/semantics/testdata/basics/builtin_types.carbon +++ b/toolchain/semantics/testdata/basics/builtin_types.carbon @@ -33,21 +33,17 @@ var test_type: type = i32; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+6}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+8, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type2}, // CHECK:STDOUT: {kind: StringLiteral, arg0: str3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+8, arg1: node+10}, -// CHECK:STDOUT: {kind: VarStorage, type: typeTypeType}, -// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+12, type: typeTypeType}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+7}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: typeTypeType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -64,23 +60,19 @@ var test_type: type = i32; // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %test_i32: i32 = var +// CHECK:STDOUT: %test_i32: i32 = var "test_i32" // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %test_i32, %.loc7 -// CHECK:STDOUT: %test_f64: f64 = var +// CHECK:STDOUT: %test_f64: f64 = var "test_f64" // CHECK:STDOUT: %.loc8: f64 = real_literal 1e-1 // CHECK:STDOUT: assign %test_f64, %.loc8 -// CHECK:STDOUT: %test_str: String = var +// CHECK:STDOUT: %test_str: String = var "test_str" // CHECK:STDOUT: %.loc9: String = string_literal "Test" // CHECK:STDOUT: assign %test_str, %.loc9 -// CHECK:STDOUT: %test_type: type = var +// CHECK:STDOUT: %test_type: type = var "test_type" // CHECK:STDOUT: assign %test_type, i32 // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon index 950b2d732164..842441baafd6 100644 --- a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon b/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon index 28a3523a0fd7..292abd670db3 100644 --- a/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/semantics/testdata/basics/fail_non_type_as_type.carbon @@ -26,8 +26,7 @@ var x: type = 42; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: typeTypeType}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: typeTypeType}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: typeTypeType}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: nodeError}, // CHECK:STDOUT: ] @@ -38,12 +37,11 @@ var x: type = 42; // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: type = var +// CHECK:STDOUT: %x: type = var "x" // CHECK:STDOUT: %.loc10: i32 = int_literal 42 // CHECK:STDOUT: assign %x, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/basics/fail_qualifier_unsupported.carbon b/toolchain/semantics/testdata/basics/fail_qualifier_unsupported.carbon index 781ad17a9616..70b7681a6f43 100644 --- a/toolchain/semantics/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/semantics/testdata/basics/fail_qualifier_unsupported.carbon @@ -28,11 +28,9 @@ var y: i32 = x.b; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -41,13 +39,11 @@ var y: i32 = x.b; // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: i32 = var -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/basics/parens.carbon b/toolchain/semantics/testdata/basics/parens.carbon index a4aed23c15d5..ef5110ba0906 100644 --- a/toolchain/semantics/testdata/basics/parens.carbon +++ b/toolchain/semantics/testdata/basics/parens.carbon @@ -24,12 +24,11 @@ var test_i32: i32 = ((1) + (2)); // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+2, arg1: node+3, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+4}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+1, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+3}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -40,12 +39,11 @@ var test_i32: i32 = ((1) + (2)); // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %test_i32: i32 = var +// CHECK:STDOUT: %test_i32: i32 = var "test_i32" // CHECK:STDOUT: %.loc7_23: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_29: i32 = int_literal 2 // CHECK:STDOUT: %.loc7_26: i32 = add %.loc7_23, %.loc7_29 diff --git a/toolchain/semantics/testdata/const/collapse.carbon b/toolchain/semantics/testdata/const/collapse.carbon index 7df8e3619694..05b7f2d03c8d 100644 --- a/toolchain/semantics/testdata/const/collapse.carbon +++ b/toolchain/semantics/testdata/const/collapse.carbon @@ -14,7 +14,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type3, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type3, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -36,8 +36,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type1, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+3, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type3}, // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: ConstType, arg0: type1, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type1, type: typeTypeType}, @@ -53,20 +52,19 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/const/fail_collapse.carbon b/toolchain/semantics/testdata/const/fail_collapse.carbon index ef1b627b542a..824fdb1b30c0 100644 --- a/toolchain/semantics/testdata/const/fail_collapse.carbon +++ b/toolchain/semantics/testdata/const/fail_collapse.carbon @@ -16,7 +16,7 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type5, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type5, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -31,8 +31,8 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] @@ -41,8 +41,7 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: {kind: ConstType, arg0: type1, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type1, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type3}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type4, type: typeTypeType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, @@ -57,18 +56,17 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/empty_struct.carbon b/toolchain/semantics/testdata/function/call/empty_struct.carbon index 6533c2ce21cc..b3ea739a688e 100644 --- a/toolchain/semantics/testdata/function/call/empty_struct.carbon +++ b/toolchain/semantics/testdata/function/call/empty_struct.carbon @@ -14,8 +14,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -34,14 +34,13 @@ fn Main() { // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -52,27 +51,26 @@ fn Main() { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/empty_tuple.carbon b/toolchain/semantics/testdata/function/call/empty_tuple.carbon index 166590da46e5..49ba22edfded 100644 --- a/toolchain/semantics/testdata/function/call/empty_tuple.carbon +++ b/toolchain/semantics/testdata/function/call/empty_tuple.carbon @@ -14,8 +14,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -36,14 +36,13 @@ fn Main() { // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -54,27 +53,26 @@ fn Main() { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/fail_param_count.carbon b/toolchain/semantics/testdata/function/call/fail_param_count.carbon index 767074959551..4215cb6f5e30 100644 --- a/toolchain/semantics/testdata/function/call/fail_param_count.carbon +++ b/toolchain/semantics/testdata/function/call/fail_param_count.carbon @@ -57,10 +57,10 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block4, body: {block5}}}, -// CHECK:STDOUT: {name: str3, param_refs: block7, body: {block8}}}, -// CHECK:STDOUT: {name: str5, param_refs: block0, body: {block9}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block4, body: [block5]}, +// CHECK:STDOUT: {name: str3, param_refs: block7, body: [block8]}, +// CHECK:STDOUT: {name: str5, param_refs: block0, body: [block9]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -88,29 +88,26 @@ fn Main() { // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+6, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+8, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function2}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+10, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+21, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+18, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+23, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+20, type: type0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -118,37 +115,37 @@ fn Main() { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+12, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, @@ -159,23 +156,20 @@ fn Main() { // CHECK:STDOUT: node+20, // CHECK:STDOUT: node+21, // CHECK:STDOUT: node+22, -// CHECK:STDOUT: node+23, -// CHECK:STDOUT: node+24, -// CHECK:STDOUT: node+25, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+18, +// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+20, -// CHECK:STDOUT: node+22, +// CHECK:STDOUT: node+17, +// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+24, +// CHECK:STDOUT: node+21, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/fail_param_type.carbon b/toolchain/semantics/testdata/function/call/fail_param_type.carbon index 42b1a2ab3e13..48b8a1b08996 100644 --- a/toolchain/semantics/testdata/function/call/fail_param_type.carbon +++ b/toolchain/semantics/testdata/function/call/fail_param_type.carbon @@ -18,8 +18,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -38,13 +38,12 @@ fn Main() { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type1}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -52,26 +51,25 @@ fn Main() { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon index ab04dc2892f4..6b0c49b693c5 100644 --- a/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon @@ -15,8 +15,8 @@ fn Run() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -39,8 +39,7 @@ fn Run() { // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function0, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeError}, // CHECK:STDOUT: {kind: Return}, @@ -61,7 +60,6 @@ fn Run() { // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -78,7 +76,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc13: f64 = call @Foo() // CHECK:STDOUT: assign %x, // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/function/call/i32.carbon b/toolchain/semantics/testdata/function/call/i32.carbon index 65e51527a2d0..d4389cd5663a 100644 --- a/toolchain/semantics/testdata/function/call/i32.carbon +++ b/toolchain/semantics/testdata/function/call/i32.carbon @@ -14,8 +14,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -34,17 +34,15 @@ fn Main() { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+5, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+9}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+7}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -52,29 +50,27 @@ fn Main() { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -90,7 +86,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc12_21.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc12_21.2: i32 = stub_reference %.loc12_21.1 // CHECK:STDOUT: %.loc12_20: i32 = call @Echo(%.loc12_21.2) diff --git a/toolchain/semantics/testdata/function/call/more_param_ir.carbon b/toolchain/semantics/testdata/function/call/more_param_ir.carbon index e56940ce894c..ebcda6700798 100644 --- a/toolchain/semantics/testdata/function/call/more_param_ir.carbon +++ b/toolchain/semantics/testdata/function/call/more_param_ir.carbon @@ -13,8 +13,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str4, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str4, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -35,34 +35,31 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+21, +// CHECK:STDOUT: node+18, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+4, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+9, arg1: node+10, type: type0}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+6, arg1: node+7, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+11, arg1: node+12, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type0}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+8, arg1: node+9, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+10, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+15, arg1: node+16, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type0}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+12, arg1: node+13, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: Return}, @@ -74,23 +71,23 @@ fn Main() { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+7, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, @@ -103,14 +100,11 @@ fn Main() { // CHECK:STDOUT: node+18, // CHECK:STDOUT: node+19, // CHECK:STDOUT: node+20, -// CHECK:STDOUT: node+21, -// CHECK:STDOUT: node+22, -// CHECK:STDOUT: node+23, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+14, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+20, +// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+15, +// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/params_one.carbon b/toolchain/semantics/testdata/function/call/params_one.carbon index 252495205fa3..cb08c1e1c366 100644 --- a/toolchain/semantics/testdata/function/call/params_one.carbon +++ b/toolchain/semantics/testdata/function/call/params_one.carbon @@ -12,8 +12,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -27,20 +27,19 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: Return}, @@ -50,27 +49,26 @@ fn Main() { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/params_one_comma.carbon b/toolchain/semantics/testdata/function/call/params_one_comma.carbon index e1d7d9025a82..b33a0f3e667b 100644 --- a/toolchain/semantics/testdata/function/call/params_one_comma.carbon +++ b/toolchain/semantics/testdata/function/call/params_one_comma.carbon @@ -13,8 +13,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -29,24 +29,23 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block7, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -55,19 +54,19 @@ fn Main() { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, @@ -75,13 +74,12 @@ fn Main() { // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/params_two.carbon b/toolchain/semantics/testdata/function/call/params_two.carbon index da85124cb701..91ef7e088017 100644 --- a/toolchain/semantics/testdata/function/call/params_two.carbon +++ b/toolchain/semantics/testdata/function/call/params_two.carbon @@ -12,8 +12,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str3, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str3, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -29,24 +29,22 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: Return}, @@ -57,32 +55,30 @@ fn Main() { // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/params_two_comma.carbon b/toolchain/semantics/testdata/function/call/params_two_comma.carbon index e2c5fc5e6123..e6d6d809302c 100644 --- a/toolchain/semantics/testdata/function/call/params_two_comma.carbon +++ b/toolchain/semantics/testdata/function/call/params_two_comma.carbon @@ -13,8 +13,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str3, param_refs: block0, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str3, param_refs: block0, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -32,30 +32,28 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: Call, arg0: block6, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block7, arg1: function0, type: type1}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -65,21 +63,21 @@ fn Main() { // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, @@ -90,16 +88,14 @@ fn Main() { // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+14, -// CHECK:STDOUT: node+16, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/function/call/params_zero.carbon b/toolchain/semantics/testdata/function/call/params_zero.carbon index d0f487a3ed37..961433889ab2 100644 --- a/toolchain/semantics/testdata/function/call/params_zero.carbon +++ b/toolchain/semantics/testdata/function/call/params_zero.carbon @@ -12,8 +12,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/call/return_implicit.carbon b/toolchain/semantics/testdata/function/call/return_implicit.carbon index 46c8f4c53af8..6b5c6e7f7208 100644 --- a/toolchain/semantics/testdata/function/call/return_implicit.carbon +++ b/toolchain/semantics/testdata/function/call/return_implicit.carbon @@ -13,8 +13,8 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -38,10 +38,9 @@ fn Main() { // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+7}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+6}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -61,7 +60,6 @@ fn Main() { // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -79,7 +77,7 @@ fn Main() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc11_11.1: type = tuple_type () // CHECK:STDOUT: %.loc11_11.2: () = tuple_value () -// CHECK:STDOUT: %b: () = var +// CHECK:STDOUT: %b: () = var "b" // CHECK:STDOUT: %.loc11_37: () = call @MakeImplicitEmptyTuple() // CHECK:STDOUT: assign %b, %.loc11_37 // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/function/declaration/simple.carbon b/toolchain/semantics/testdata/function/declaration/simple.carbon index 49f83992d85e..7e6f830f4434 100644 --- a/toolchain/semantics/testdata/function/declaration/simple.carbon +++ b/toolchain/semantics/testdata/function/declaration/simple.carbon @@ -11,7 +11,7 @@ fn G() { F(); } // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ // CHECK:STDOUT: {name: str0, param_refs: block0}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon b/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon index 10564800d4f0..dff99d6f16de 100644 --- a/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon @@ -14,7 +14,7 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -30,10 +30,8 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -43,19 +41,17 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/definition/order.carbon b/toolchain/semantics/testdata/function/definition/order.carbon index c25d83e6b858..35caac424bae 100644 --- a/toolchain/semantics/testdata/function/definition/order.carbon +++ b/toolchain/semantics/testdata/function/definition/order.carbon @@ -10,9 +10,9 @@ fn Baz() {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_one.carbon b/toolchain/semantics/testdata/function/definition/params_one.carbon index aeb7f565c89c..3a4b02694433 100644 --- a/toolchain/semantics/testdata/function/definition/params_one.carbon +++ b/toolchain/semantics/testdata/function/definition/params_one.carbon @@ -8,7 +8,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -24,8 +24,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -34,7 +33,9 @@ fn Foo(a: i32) {} // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -42,9 +43,6 @@ fn Foo(a: i32) {} // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/definition/params_one_comma.carbon b/toolchain/semantics/testdata/function/definition/params_one_comma.carbon index 16112373c0f6..d71482929ab9 100644 --- a/toolchain/semantics/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/semantics/testdata/function/definition/params_one_comma.carbon @@ -8,7 +8,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -24,8 +24,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -34,7 +33,9 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -42,9 +43,6 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/definition/params_two.carbon b/toolchain/semantics/testdata/function/definition/params_two.carbon index 79fe959089ba..51fc469c24c6 100644 --- a/toolchain/semantics/testdata/function/definition/params_two.carbon +++ b/toolchain/semantics/testdata/function/definition/params_two.carbon @@ -8,7 +8,7 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -25,10 +25,8 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -38,19 +36,17 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/definition/params_two_comma.carbon b/toolchain/semantics/testdata/function/definition/params_two_comma.carbon index 0f9dd11865c5..662d543e66f5 100644 --- a/toolchain/semantics/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/semantics/testdata/function/definition/params_two_comma.carbon @@ -8,7 +8,7 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -25,10 +25,8 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -38,19 +36,17 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/function/definition/params_zero.carbon b/toolchain/semantics/testdata/function/definition/params_zero.carbon index dc8d12d7a304..3d3cdb4eaeff 100644 --- a/toolchain/semantics/testdata/function/definition/params_zero.carbon +++ b/toolchain/semantics/testdata/function/definition/params_zero.carbon @@ -8,7 +8,7 @@ fn Foo() {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/same_param_name.carbon b/toolchain/semantics/testdata/function/definition/same_param_name.carbon index d71c24d8c374..bff407d2afca 100644 --- a/toolchain/semantics/testdata/function/definition/same_param_name.carbon +++ b/toolchain/semantics/testdata/function/definition/same_param_name.carbon @@ -9,8 +9,8 @@ fn Bar(a: i32) {} // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block6, body: {block7}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block6, body: [block7]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -27,12 +27,10 @@ fn Bar(a: i32) {} // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -41,28 +39,26 @@ fn Bar(a: i32) {} // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { diff --git a/toolchain/semantics/testdata/if/else.carbon b/toolchain/semantics/testdata/if/else.carbon index c751f6679d41..06d51ba96eca 100644 --- a/toolchain/semantics/testdata/if/else.carbon +++ b/toolchain/semantics/testdata/if/else.carbon @@ -19,10 +19,10 @@ fn If(b: bool) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block4}}}, -// CHECK:STDOUT: {name: str3, param_refs: block6, body: {block7, block8, block9, block10}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block4]}, +// CHECK:STDOUT: {name: str3, param_refs: block6, body: [block7, block8, block9, block10]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -37,7 +37,7 @@ fn If(b: bool) { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeBoolType, -// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+10, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -50,8 +50,7 @@ fn If(b: bool) { // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function2}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+6, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function3}, // CHECK:STDOUT: {kind: BranchIf, arg0: block8, arg1: node+6}, // CHECK:STDOUT: {kind: Branch, arg0: block9}, @@ -70,7 +69,7 @@ fn If(b: bool) { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -83,27 +82,26 @@ fn If(b: bool) { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+13, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+12, // CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, // CHECK:STDOUT: node+15, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon index 7a1f89c3ce2f..4651e633b558 100644 --- a/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/semantics/testdata/if/fail_reachable_fallthrough.carbon @@ -35,9 +35,9 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4, block5, block6, block7}}}, -// CHECK:STDOUT: {name: str2, param_refs: block9, return_type: type1, body: {block10, block11, block12, block13}}}, -// CHECK:STDOUT: {name: str3, param_refs: block15, return_type: type1, body: {block16, block17, block18}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4, block5, block6, block7]}, +// CHECK:STDOUT: {name: str2, param_refs: block9, return_type: type1, body: [block10, block11, block12, block13]}, +// CHECK:STDOUT: {name: str3, param_refs: block15, return_type: type1, body: [block16, block17, block18]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -59,29 +59,26 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: BranchIf, arg0: block5, arg1: node+0}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+5}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+4}, // CHECK:STDOUT: {kind: Branch, arg0: block7}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+8, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+8}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+7}, // CHECK:STDOUT: {kind: Branch, arg0: block12}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+13}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+11}, // CHECK:STDOUT: {kind: Branch, arg0: block13}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+16, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function2}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block17, arg1: node+16}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block17, arg1: node+14}, // CHECK:STDOUT: {kind: Branch, arg0: block18}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+21}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+18}, // CHECK:STDOUT: {kind: Branch, arg0: block18}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -89,63 +86,60 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+16, // CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+18, // CHECK:STDOUT: node+19, -// CHECK:STDOUT: node+20, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+21, -// CHECK:STDOUT: node+22, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: ], diff --git a/toolchain/semantics/testdata/if/fail_scope.carbon b/toolchain/semantics/testdata/if/fail_scope.carbon index c153ef49f60a..aee59cde3a55 100644 --- a/toolchain/semantics/testdata/if/fail_scope.carbon +++ b/toolchain/semantics/testdata/if/fail_scope.carbon @@ -17,7 +17,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4, block5, block6}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4, block5, block6]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 2, @@ -36,16 +36,14 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: BranchIf, arg0: block5, arg1: node+0}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+7}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+5}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+5}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+4}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: nodeError}, // CHECK:STDOUT: ] @@ -54,27 +52,25 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -87,7 +83,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: if %b br !if.then else br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.then: -// CHECK:STDOUT: %n: i32 = var +// CHECK:STDOUT: %n: i32 = var "n" // CHECK:STDOUT: %.loc9: i32 = int_literal 2 // CHECK:STDOUT: assign %n, %.loc9 // CHECK:STDOUT: return %n diff --git a/toolchain/semantics/testdata/if/no_else.carbon b/toolchain/semantics/testdata/if/no_else.carbon index 1d9ada405f9d..49d04ca6bbb3 100644 --- a/toolchain/semantics/testdata/if/no_else.carbon +++ b/toolchain/semantics/testdata/if/no_else.carbon @@ -16,9 +16,9 @@ fn If(b: bool) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block5, body: {block6, block7, block8}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block5, body: [block6, block7, block8]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -32,7 +32,7 @@ fn If(b: bool) { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeBoolType, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -43,8 +43,7 @@ fn If(b: bool) { // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+4, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function2}, // CHECK:STDOUT: {kind: BranchIf, arg0: block7, arg1: node+4}, // CHECK:STDOUT: {kind: Branch, arg0: block8}, @@ -60,7 +59,7 @@ fn If(b: bool) { // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -70,23 +69,22 @@ fn If(b: bool) { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon b/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon index 3081fc8801f3..7e7a920c04e8 100644 --- a/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/semantics/testdata/if/unreachable_fallthrough.carbon @@ -15,7 +15,7 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4, block5, block6}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4, block5, block6]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -34,40 +34,38 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: BranchIf, arg0: block5, arg1: node+0}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+5}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+4}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+7}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/if_expression/basic.carbon b/toolchain/semantics/testdata/if_expression/basic.carbon index 2efedfc864e5..4a704e8056b5 100644 --- a/toolchain/semantics/testdata/if_expression/basic.carbon +++ b/toolchain/semantics/testdata/if_expression/basic.carbon @@ -10,7 +10,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4, block5, block6, block7}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4, block5, block6, block7]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -29,21 +29,18 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type1}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+4, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type1}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: BranchIf, arg0: block5, arg1: node+0}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+2, arg1: node+4, type: type1}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+4, arg1: node+2, type: type1}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block7, arg1: node+9}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block7, arg1: node+10}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+1, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+2, arg1: node+1, type: type1}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block7, arg1: node+6}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block7, arg1: node+7}, // CHECK:STDOUT: {kind: BlockArg, arg0: block7, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+13}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+10}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -52,33 +49,30 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/if_expression/constant_condition.carbon b/toolchain/semantics/testdata/if_expression/constant_condition.carbon index 3d1cbaa975c2..cad918d6b555 100644 --- a/toolchain/semantics/testdata/if_expression/constant_condition.carbon +++ b/toolchain/semantics/testdata/if_expression/constant_condition.carbon @@ -17,10 +17,10 @@ fn G() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: {block4, block5, block6, block7}}}, -// CHECK:STDOUT: {name: str3, param_refs: block0, return_type: type0, body: {block8, block9, block10, block11}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: [block4, block5, block6, block7]}, +// CHECK:STDOUT: {name: str3, param_refs: block0, return_type: type0, body: [block8, block9, block10, block11]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, diff --git a/toolchain/semantics/testdata/if_expression/control_flow.carbon b/toolchain/semantics/testdata/if_expression/control_flow.carbon index 34715c757e61..aa4f67b15726 100644 --- a/toolchain/semantics/testdata/if_expression/control_flow.carbon +++ b/toolchain/semantics/testdata/if_expression/control_flow.carbon @@ -13,9 +13,9 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block5, return_type: type0, body: {block6, block7, block8, block9}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block5, return_type: type0, body: [block6, block7, block8, block9]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -42,17 +42,16 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+4}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+6, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type1}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function2}, // CHECK:STDOUT: {kind: BranchIf, arg0: block7, arg1: node+6}, // CHECK:STDOUT: {kind: Branch, arg0: block8}, // CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function0, type: type0}, // CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function1, type: type0}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+10}, // CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+11}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+12}, // CHECK:STDOUT: {kind: BlockArg, arg0: block9, type: type0}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+15}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+14}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -60,7 +59,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -72,26 +71,25 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+14, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+16, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/if_expression/nested.carbon b/toolchain/semantics/testdata/if_expression/nested.carbon index 6fd2f2d408bc..ded985573b48 100644 --- a/toolchain/semantics/testdata/if_expression/nested.carbon +++ b/toolchain/semantics/testdata/if_expression/nested.carbon @@ -10,7 +10,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4, block5, block7, block8, block9, block6, block10, block11, block12, block13}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4, block5, block7, block8, block9, block6, block10, block11, block12, block13]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -33,33 +33,30 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+2, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+4, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: BranchIf, arg0: block5, arg1: node+0}, // CHECK:STDOUT: {kind: Branch, arg0: block6}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block7, arg1: node+2}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block7, arg1: node+1}, // CHECK:STDOUT: {kind: Branch, arg0: block8}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+11}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+12}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+8}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block9, arg1: node+9}, // CHECK:STDOUT: {kind: BlockArg, arg0: block9, type: type1}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block10, arg1: node+4}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block10, arg1: node+2}, // CHECK:STDOUT: {kind: Branch, arg0: block11}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type1}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block12, arg1: node+18}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block12, arg1: node+19}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block12, arg1: node+15}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block12, arg1: node+16}, // CHECK:STDOUT: {kind: BlockArg, arg0: block12, type: type1}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+15}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+22}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+12}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+19}, // CHECK:STDOUT: {kind: BlockArg, arg0: block13, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+25}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+22}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -68,57 +65,54 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+11, // CHECK:STDOUT: node+13, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+23, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+18, +// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+11, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+20, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+15, +// CHECK:STDOUT: node+17, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+18, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+19, // CHECK:STDOUT: node+21, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+22, -// CHECK:STDOUT: node+24, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+25, -// CHECK:STDOUT: node+26, +// CHECK:STDOUT: node+23, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/index/array_element_access.carbon b/toolchain/semantics/testdata/index/array_element_access.carbon index 8f87c6c1d79f..71a78d140d75 100644 --- a/toolchain/semantics/testdata/index/array_element_access.carbon +++ b/toolchain/semantics/testdata/index/array_element_access.carbon @@ -30,7 +30,7 @@ var d: i32 = a[b]; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -41,29 +41,25 @@ var d: i32 = a[b]; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+9, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+10}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type0}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+8, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+9}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+14}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+16, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+12}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0}, -// CHECK:STDOUT: {kind: ArrayIndex, arg0: node+2, arg1: node+18, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+16, arg1: node+19}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+21, type: type0}, -// CHECK:STDOUT: {kind: ArrayIndex, arg0: node+2, arg1: node+12, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+21, arg1: node+23}, +// CHECK:STDOUT: {kind: ArrayIndex, arg0: node+2, arg1: node+15, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+14, arg1: node+16}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type0}, +// CHECK:STDOUT: {kind: ArrayIndex, arg0: node+2, arg1: node+11, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+19}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -90,21 +86,17 @@ var d: i32 = a[b]; // CHECK:STDOUT: node+18, // CHECK:STDOUT: node+19, // CHECK:STDOUT: node+20, -// CHECK:STDOUT: node+21, -// CHECK:STDOUT: node+22, -// CHECK:STDOUT: node+23, -// CHECK:STDOUT: node+24, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 2 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 -// CHECK:STDOUT: %a: [i32; 2] = var +// CHECK:STDOUT: %a: [i32; 2] = var "a" // CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1 // CHECK:STDOUT: %.loc7_24.1: i32 = int_literal 24 @@ -113,14 +105,14 @@ var d: i32 = a[b]; // CHECK:STDOUT: %.loc7_26.2: (i32, i32) = tuple_value (%.loc7_20.2, %.loc7_24.2) // CHECK:STDOUT: %.loc7_26.3: [i32; 2] = array_value %.loc7_26.2 // CHECK:STDOUT: assign %a, %.loc7_26.3 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc8: i32 = int_literal 1 // CHECK:STDOUT: assign %b, %.loc8 -// CHECK:STDOUT: %c: i32 = var +// CHECK:STDOUT: %c: i32 = var "c" // CHECK:STDOUT: %.loc9_16: i32 = int_literal 0 // CHECK:STDOUT: %.loc9_17: i32 = array_index %a, %.loc9_16 // CHECK:STDOUT: assign %c, %.loc9_17 -// CHECK:STDOUT: %d: i32 = var +// CHECK:STDOUT: %d: i32 = var "d" // CHECK:STDOUT: %.loc10: i32 = array_index %a, %b // CHECK:STDOUT: assign %d, %.loc10 // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_array_large_index.carbon b/toolchain/semantics/testdata/index/fail_array_large_index.carbon index 7ae6fc4a62ad..c8117dc089c9 100644 --- a/toolchain/semantics/testdata/index/fail_array_large_index.carbon +++ b/toolchain/semantics/testdata/index/fail_array_large_index.carbon @@ -27,7 +27,7 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -37,18 +37,16 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+7, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+10, type: type0}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -66,25 +64,23 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 -// CHECK:STDOUT: %a: [i32; 1] = var +// CHECK:STDOUT: %a: [i32; 1] = var "a" // CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1 // CHECK:STDOUT: %.loc7_23.1: type = tuple_type (i32) // CHECK:STDOUT: %.loc7_23.2: (i32,) = tuple_value (%.loc7_20.2) // CHECK:STDOUT: %.loc7_23.3: [i32; 1] = array_value %.loc7_23.2 // CHECK:STDOUT: assign %a, %.loc7_23.3 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: i32 = int_literal -1 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/semantics/testdata/index/fail_array_non_int_indexing.carbon index 634ac04a5783..9ac95f7df463 100644 --- a/toolchain/semantics/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/semantics/testdata/index/fail_array_non_int_indexing.carbon @@ -27,7 +27,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: nodeFloatingPointType, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ @@ -38,18 +38,16 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+7, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+10, type: type0}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -67,25 +65,23 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 -// CHECK:STDOUT: %a: [i32; 1] = var +// CHECK:STDOUT: %a: [i32; 1] = var "a" // CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1 // CHECK:STDOUT: %.loc7_23.1: type = tuple_type (i32) // CHECK:STDOUT: %.loc7_23.2: (i32,) = tuple_value (%.loc7_20.2) // CHECK:STDOUT: %.loc7_23.3: [i32; 1] = array_value %.loc7_23.2 // CHECK:STDOUT: assign %a, %.loc7_23.3 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: f64 = real_literal 26e-1 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/semantics/testdata/index/fail_array_out_of_bound_access.carbon index 6594e9db2e39..e76a03ac5933 100644 --- a/toolchain/semantics/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/semantics/testdata/index/fail_array_out_of_bound_access.carbon @@ -27,7 +27,7 @@ var b: i32 = a[2]; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -37,18 +37,16 @@ var b: i32 = a[2]; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2}, -// CHECK:STDOUT: {kind: ArrayValue, arg0: node+7, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+10, type: type0}, +// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -66,25 +64,23 @@ var b: i32 = a[2]; // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 -// CHECK:STDOUT: %a: [i32; 1] = var +// CHECK:STDOUT: %a: [i32; 1] = var "a" // CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1 // CHECK:STDOUT: %.loc7_23.1: type = tuple_type (i32) // CHECK:STDOUT: %.loc7_23.2: (i32,) = tuple_value (%.loc7_20.2) // CHECK:STDOUT: %.loc7_23.3: [i32; 1] = array_value %.loc7_23.2 // CHECK:STDOUT: assign %a, %.loc7_23.3 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: i32 = int_literal 2 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon b/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon index 3664b0e412c5..5a499233b2ee 100644 --- a/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/semantics/testdata/index/fail_empty_tuple_access.carbon @@ -15,8 +15,8 @@ fn Run() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/index/fail_name_not_found.carbon b/toolchain/semantics/testdata/index/fail_name_not_found.carbon index f212e9a41e13..45bf2339b0bd 100644 --- a/toolchain/semantics/testdata/index/fail_name_not_found.carbon +++ b/toolchain/semantics/testdata/index/fail_name_not_found.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -32,8 +32,7 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: nodeError}, // CHECK:STDOUT: {kind: Return}, @@ -49,7 +48,6 @@ fn Main() { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -59,7 +57,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: i32 = int_literal 0 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/index/fail_negative_indexing.carbon b/toolchain/semantics/testdata/index/fail_negative_indexing.carbon index 9de914e4612b..a217b0eed7a3 100644 --- a/toolchain/semantics/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/semantics/testdata/index/fail_negative_indexing.carbon @@ -45,16 +45,14 @@ var b: i32 = a[-10]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+11}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+13, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+10}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -75,16 +73,14 @@ var b: i32 = a[-10]; // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, -// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon b/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon index d5c13fc308c8..ee01c300c48c 100644 --- a/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/semantics/testdata/index/fail_non_deterministic_type.carbon @@ -47,21 +47,18 @@ var c: i32 = a[b]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+11}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+13, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+10}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: node+15}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+17, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+13}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -84,17 +81,14 @@ var c: i32 = a[b]; // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -104,16 +98,16 @@ var c: i32 = a[b]; // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14) // CHECK:STDOUT: %.loc7_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %a: (i32, i32) = var +// CHECK:STDOUT: %a: (i32, i32) = var "a" // CHECK:STDOUT: %.loc7_22.1: i32 = int_literal 2 // CHECK:STDOUT: %.loc7_22.2: i32 = stub_reference %.loc7_22.1 // CHECK:STDOUT: %.loc7_25.1: i32 = int_literal 3 // CHECK:STDOUT: %.loc7_25.2: i32 = stub_reference %.loc7_25.1 // CHECK:STDOUT: %.loc7_26: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_25.2) // CHECK:STDOUT: assign %a, %.loc7_26 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: assign %b, %.loc8 -// CHECK:STDOUT: %c: i32 = var +// CHECK:STDOUT: %c: i32 = var "c" // CHECK:STDOUT: assign %c, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon b/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon index c8fc3526ba2a..091fe535bbef 100644 --- a/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/semantics/testdata/index/fail_non_tuple_access.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/index/fail_tuple_large_index.carbon b/toolchain/semantics/testdata/index/fail_tuple_large_index.carbon index 0e22252892ae..737fa17e8dea 100644 --- a/toolchain/semantics/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/semantics/testdata/index/fail_tuple_large_index.carbon @@ -43,21 +43,18 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+8}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+7}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+4}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+15, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -79,18 +76,15 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -99,16 +93,16 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: (type,) = tuple_value (%.loc7_9) // CHECK:STDOUT: %.loc7_13.3: type = tuple_type (i32) -// CHECK:STDOUT: %a: (i32,) = var +// CHECK:STDOUT: %a: (i32,) = var "a" // CHECK:STDOUT: %.loc7_18.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_18.2: i32 = stub_reference %.loc7_18.1 // CHECK:STDOUT: %.loc7_21: (i32,) = tuple_value (%.loc7_18.2) // CHECK:STDOUT: assign %a, %.loc7_21 // CHECK:STDOUT: %.loc8_9: type = stub_reference i32 // CHECK:STDOUT: %.loc8_13: (type,) = tuple_value (%.loc8_9) -// CHECK:STDOUT: %b: (i32,) = var +// CHECK:STDOUT: %b: (i32,) = var "b" // CHECK:STDOUT: assign %b, %a -// CHECK:STDOUT: %c: i32 = var +// CHECK:STDOUT: %c: i32 = var "c" // CHECK:STDOUT: %.loc12: i32 = int_literal -1 // CHECK:STDOUT: assign %c, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_tuple_non_int_indexing.carbon b/toolchain/semantics/testdata/index/fail_tuple_non_int_indexing.carbon index f1b89b65d0df..a91073f52555 100644 --- a/toolchain/semantics/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/semantics/testdata/index/fail_tuple_non_int_indexing.carbon @@ -46,18 +46,16 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+11}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+13, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+10}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -78,16 +76,14 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, -// CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+16, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -97,14 +93,14 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14) // CHECK:STDOUT: %.loc7_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %a: (i32, i32) = var +// CHECK:STDOUT: %a: (i32, i32) = var "a" // CHECK:STDOUT: %.loc7_22.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_22.2: i32 = stub_reference %.loc7_22.1 // CHECK:STDOUT: %.loc7_26.1: i32 = int_literal 6 // CHECK:STDOUT: %.loc7_26.2: i32 = stub_reference %.loc7_26.1 // CHECK:STDOUT: %.loc7_27: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_26.2) // CHECK:STDOUT: assign %a, %.loc7_27 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: f64 = real_literal 26e-1 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/fail_tuple_out_of_bound_access.carbon b/toolchain/semantics/testdata/index/fail_tuple_out_of_bound_access.carbon index 2d7a0ebb4817..b49f9ed8b2b4 100644 --- a/toolchain/semantics/testdata/index/fail_tuple_out_of_bound_access.carbon +++ b/toolchain/semantics/testdata/index/fail_tuple_out_of_bound_access.carbon @@ -45,18 +45,16 @@ var b: i32 = a[2]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+11}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+13, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+10}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -77,16 +75,14 @@ var b: i32 = a[2]; // CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, -// CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+16, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -96,14 +92,14 @@ var b: i32 = a[2]; // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14) // CHECK:STDOUT: %.loc7_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %a: (i32, i32) = var +// CHECK:STDOUT: %a: (i32, i32) = var "a" // CHECK:STDOUT: %.loc7_22.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_22.2: i32 = stub_reference %.loc7_22.1 // CHECK:STDOUT: %.loc7_26.1: i32 = int_literal 6 // CHECK:STDOUT: %.loc7_26.2: i32 = stub_reference %.loc7_26.1 // CHECK:STDOUT: %.loc7_27: (i32, i32) = tuple_value (%.loc7_22.2, %.loc7_26.2) // CHECK:STDOUT: assign %a, %.loc7_27 -// CHECK:STDOUT: %b: i32 = var +// CHECK:STDOUT: %b: i32 = var "b" // CHECK:STDOUT: %.loc11: i32 = int_literal 2 // CHECK:STDOUT: assign %b, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/index/tuple_element_access.carbon b/toolchain/semantics/testdata/index/tuple_element_access.carbon index 8445c90b845d..4cba2ec1be7c 100644 --- a/toolchain/semantics/testdata/index/tuple_element_access.carbon +++ b/toolchain/semantics/testdata/index/tuple_element_access.carbon @@ -40,22 +40,19 @@ var c: i32 = b[0]; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+8}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+7}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+4}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+15, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: TupleIndex, arg0: node+12, arg1: node+17, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: node+18}, +// CHECK:STDOUT: {kind: TupleIndex, arg0: node+11, arg1: node+14, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: node+15}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -78,18 +75,15 @@ var c: i32 = b[0]; // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -98,16 +92,16 @@ var c: i32 = b[0]; // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: (type,) = tuple_value (%.loc7_9) // CHECK:STDOUT: %.loc7_13.3: type = tuple_type (i32) -// CHECK:STDOUT: %a: (i32,) = var +// CHECK:STDOUT: %a: (i32,) = var "a" // CHECK:STDOUT: %.loc7_18.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_18.2: i32 = stub_reference %.loc7_18.1 // CHECK:STDOUT: %.loc7_21: (i32,) = tuple_value (%.loc7_18.2) // CHECK:STDOUT: assign %a, %.loc7_21 // CHECK:STDOUT: %.loc8_9: type = stub_reference i32 // CHECK:STDOUT: %.loc8_13: (type,) = tuple_value (%.loc8_9) -// CHECK:STDOUT: %b: (i32,) = var +// CHECK:STDOUT: %b: (i32,) = var "b" // CHECK:STDOUT: assign %b, %a -// CHECK:STDOUT: %c: i32 = var +// CHECK:STDOUT: %c: i32 = var "c" // CHECK:STDOUT: %.loc9_16: i32 = int_literal 0 // CHECK:STDOUT: %.loc9_17: i32 = tuple_index %b, %.loc9_16 // CHECK:STDOUT: assign %c, %.loc9_17 diff --git a/toolchain/semantics/testdata/index/tuple_return_value_access.carbon b/toolchain/semantics/testdata/index/tuple_return_value_access.carbon index 3972bc0e00d4..158b7314bf90 100644 --- a/toolchain/semantics/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/semantics/testdata/index/tuple_return_value_access.carbon @@ -12,8 +12,8 @@ fn Run() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: {block3}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type1, body: {block5}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: [block3]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type1, body: [block5]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon b/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon index 9be8431ffe94..b3a851b06fd2 100644 --- a/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/semantics/testdata/ir/duplicate_name_same_line.carbon @@ -8,7 +8,7 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } } // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2, block3, block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2, block3, block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -28,17 +28,15 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } } // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type1}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block3, arg1: node+5}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block3, arg1: node+4}, // CHECK:STDOUT: {kind: Branch, arg0: block4}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+8, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+8, arg1: node+10}, +// CHECK:STDOUT: {kind: Assign, arg0: node+7, arg1: node+8}, // CHECK:STDOUT: {kind: Branch, arg0: block4}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -55,17 +53,15 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } } // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -75,14 +71,14 @@ fn A() { var n: i32 = 1; if (true) { var n: i32 = 2; } } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n.loc7_14: i32 = var +// CHECK:STDOUT: %n.loc7_14: i32 = var "n" // CHECK:STDOUT: %.loc7_23: i32 = int_literal 1 // CHECK:STDOUT: assign %n.loc7_14, %.loc7_23 // CHECK:STDOUT: %.loc7_30: bool = bool_literal true // CHECK:STDOUT: if %.loc7_30 br !if.then else br !if.else // CHECK:STDOUT: // CHECK:STDOUT: !if.then: -// CHECK:STDOUT: %n.loc7_42: i32 = var +// CHECK:STDOUT: %n.loc7_42: i32 = var "n" // CHECK:STDOUT: %.loc7_51: i32 = int_literal 2 // CHECK:STDOUT: assign %n.loc7_42, %.loc7_51 // CHECK:STDOUT: br !if.else diff --git a/toolchain/semantics/testdata/namespace/fail_duplicate.carbon b/toolchain/semantics/testdata/namespace/fail_duplicate.carbon index e1c864e7673b..7230280876e5 100644 --- a/toolchain/semantics/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/semantics/testdata/namespace/fail_duplicate.carbon @@ -20,8 +20,8 @@ fn Foo.Baz() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon index 2f499ff85456..27fc9db282a6 100644 --- a/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/semantics/testdata/namespace/fail_unresolved_scope.carbon @@ -12,7 +12,7 @@ fn Foo.Baz() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/namespace/function.carbon b/toolchain/semantics/testdata/namespace/function.carbon index a31971d86dd7..fab75ee6edf7 100644 --- a/toolchain/semantics/testdata/namespace/function.carbon +++ b/toolchain/semantics/testdata/namespace/function.carbon @@ -19,9 +19,9 @@ fn Bar() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block4}}}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/namespace/nested.carbon b/toolchain/semantics/testdata/namespace/nested.carbon index 8b6f9bb49f4e..53b8b1344856 100644 --- a/toolchain/semantics/testdata/namespace/nested.carbon +++ b/toolchain/semantics/testdata/namespace/nested.carbon @@ -16,8 +16,8 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str2, param_refs: block0, body: {block2}}}, -// CHECK:STDOUT: {name: str3, param_refs: block0, body: {block3}}}, +// CHECK:STDOUT: {name: str2, param_refs: block0, body: [block2]}, +// CHECK:STDOUT: {name: str3, param_refs: block0, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/operators/and.carbon b/toolchain/semantics/testdata/operators/and.carbon index fc9a4f9a9bd5..48ec3b207665 100644 --- a/toolchain/semantics/testdata/operators/and.carbon +++ b/toolchain/semantics/testdata/operators/and.carbon @@ -13,9 +13,9 @@ fn And() -> bool { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: {block4, block5, block6}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: [block4, block5, block6]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/operators/assignment.carbon b/toolchain/semantics/testdata/operators/assignment.carbon index 15772b63ee65..24da4f75b78b 100644 --- a/toolchain/semantics/testdata/operators/assignment.carbon +++ b/toolchain/semantics/testdata/operators/assignment.carbon @@ -24,7 +24,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2, block8, block9, block10}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2, block8, block9, block10]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, @@ -53,10 +53,10 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+30, -// CHECK:STDOUT: node+47, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+28, +// CHECK:STDOUT: node+44, // CHECK:STDOUT: nodeBoolType, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ @@ -71,70 +71,66 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+5}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+4}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+18}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+16}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0}, -// CHECK:STDOUT: {kind: TupleIndex, arg0: node+12, arg1: node+20, type: type0}, +// CHECK:STDOUT: {kind: TupleIndex, arg0: node+11, arg1: node+18, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+21, arg1: node+22}, +// CHECK:STDOUT: {kind: Assign, arg0: node+19, arg1: node+20}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int6, type: type0}, -// CHECK:STDOUT: {kind: TupleIndex, arg0: node+12, arg1: node+24, type: type0}, +// CHECK:STDOUT: {kind: TupleIndex, arg0: node+11, arg1: node+22, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int7, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+25, arg1: node+26}, +// CHECK:STDOUT: {kind: Assign, arg0: node+23, arg1: node+24}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+31, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int8, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+30, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int9, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+36, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block7, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+31, arg1: node+39}, -// CHECK:STDOUT: {kind: StructAccess, arg0: node+31, arg1: member0, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+29, arg1: node+36}, +// CHECK:STDOUT: {kind: StructAccess, arg0: node+29, arg1: member0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int10, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+42}, -// CHECK:STDOUT: {kind: StructAccess, arg0: node+31, arg1: member1, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+38, arg1: node+39}, +// CHECK:STDOUT: {kind: StructAccess, arg0: node+29, arg1: member1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int11, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+44, arg1: node+45}, +// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+42}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type4}, -// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+48, type: type4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: type4}, // CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type4}, -// CHECK:STDOUT: {kind: Assign, arg0: node+48, arg1: node+50}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+48, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+45, arg1: node+46}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+45, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int12, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+52, arg1: node+53}, +// CHECK:STDOUT: {kind: Assign, arg0: node+48, arg1: node+49}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type5}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block8, arg1: node+55}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block8, arg1: node+51}, // CHECK:STDOUT: {kind: Branch, arg0: block9}, // CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type4}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+48}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+58}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+45}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+54}, // CHECK:STDOUT: {kind: BlockArg, arg0: block10, type: type4}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+61, type: type0}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+57, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int13, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+62, arg1: node+63}, +// CHECK:STDOUT: {kind: Assign, arg0: node+58, arg1: node+59}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -174,11 +170,11 @@ fn Main() { // CHECK:STDOUT: node+28, // CHECK:STDOUT: node+29, // CHECK:STDOUT: node+30, -// CHECK:STDOUT: node+31, // CHECK:STDOUT: node+32, // CHECK:STDOUT: node+33, // CHECK:STDOUT: node+35, // CHECK:STDOUT: node+36, +// CHECK:STDOUT: node+37, // CHECK:STDOUT: node+38, // CHECK:STDOUT: node+39, // CHECK:STDOUT: node+40, @@ -195,44 +191,40 @@ fn Main() { // CHECK:STDOUT: node+51, // CHECK:STDOUT: node+52, // CHECK:STDOUT: node+53, -// CHECK:STDOUT: node+54, -// CHECK:STDOUT: node+55, -// CHECK:STDOUT: node+56, -// CHECK:STDOUT: node+57, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+13, // CHECK:STDOUT: node+15, -// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+28, -// CHECK:STDOUT: node+29, +// CHECK:STDOUT: node+26, +// CHECK:STDOUT: node+27, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+31, // CHECK:STDOUT: node+34, -// CHECK:STDOUT: node+37, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+32, // CHECK:STDOUT: node+35, -// CHECK:STDOUT: node+38, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+59, +// CHECK:STDOUT: node+55, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+54, +// CHECK:STDOUT: node+56, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+57, // CHECK:STDOUT: node+58, +// CHECK:STDOUT: node+59, // CHECK:STDOUT: node+60, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+61, -// CHECK:STDOUT: node+62, -// CHECK:STDOUT: node+63, -// CHECK:STDOUT: node+64, -// CHECK:STDOUT: node+65, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -242,7 +234,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a: i32 = var +// CHECK:STDOUT: %a: i32 = var "a" // CHECK:STDOUT: %.loc8: i32 = int_literal 12 // CHECK:STDOUT: assign %a, %.loc8 // CHECK:STDOUT: %.loc9: i32 = int_literal -7 @@ -252,7 +244,7 @@ fn Main() { // CHECK:STDOUT: %.loc11_19.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc11_19.2: (type, type) = tuple_value (%.loc11_11, %.loc11_16) // CHECK:STDOUT: %.loc11_19.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %b: (i32, i32) = var +// CHECK:STDOUT: %b: (i32, i32) = var "b" // CHECK:STDOUT: %.loc11_24.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc11_24.2: i32 = stub_reference %.loc11_24.1 // CHECK:STDOUT: %.loc11_27.1: i32 = int_literal 2 @@ -268,7 +260,7 @@ fn Main() { // CHECK:STDOUT: %.loc13_10: i32 = int_literal 4 // CHECK:STDOUT: assign %.loc13_6, %.loc13_10 // CHECK:STDOUT: %.loc15_27: type = struct_type {.a: i32, .b: i32} -// CHECK:STDOUT: %c: {.a: i32, .b: i32} = var +// CHECK:STDOUT: %c: {.a: i32, .b: i32} = var "c" // CHECK:STDOUT: %.loc15_37: i32 = int_literal 1 // CHECK:STDOUT: %.loc15_35: i32 = stub_reference %.loc15_37 // CHECK:STDOUT: %.loc15_45: i32 = int_literal 2 @@ -282,7 +274,7 @@ fn Main() { // CHECK:STDOUT: %.loc17_9: i32 = int_literal 4 // CHECK:STDOUT: assign %.loc17_4, %.loc17_9 // CHECK:STDOUT: %.loc19_13: type = ptr_type i32 -// CHECK:STDOUT: %p: i32* = var +// CHECK:STDOUT: %p: i32* = var "p" // CHECK:STDOUT: %.loc19_17: i32* = address_of %a // CHECK:STDOUT: assign %p, %.loc19_17 // CHECK:STDOUT: %.loc20_3: i32 = dereference %p diff --git a/toolchain/semantics/testdata/operators/binary_op.carbon b/toolchain/semantics/testdata/operators/binary_op.carbon index c668ee876684..3521c082a20b 100644 --- a/toolchain/semantics/testdata/operators/binary_op.carbon +++ b/toolchain/semantics/testdata/operators/binary_op.carbon @@ -10,7 +10,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, diff --git a/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon b/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon index 16eb95739a3a..6c0a6d55b68b 100644 --- a/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon +++ b/toolchain/semantics/testdata/operators/fail_assigment_to_non_assignable.carbon @@ -48,7 +48,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ // CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0}, -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2, block11, block12, block13, block14, block15, block16}}}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2, block11, block12, block13, block14, block15, block16]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -83,7 +83,7 @@ fn Main() { // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+41, +// CHECK:STDOUT: node+40, // CHECK:STDOUT: nodeBoolType, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ @@ -113,57 +113,55 @@ fn Main() { // CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type1}, // CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: node+18}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+20, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int7, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+20, arg1: node+22}, +// CHECK:STDOUT: {kind: Assign, arg0: node+20, arg1: node+21}, // CHECK:STDOUT: {kind: StubReference, arg0: node+20, type: type0}, // CHECK:STDOUT: {kind: StubReference, arg0: node+20, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block5, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int8, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+27, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+26, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int9, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+29, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+28, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block6, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+26, arg1: node+31}, +// CHECK:STDOUT: {kind: Assign, arg0: node+25, arg1: node+30}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: Assign, arg0: nodeIntegerType, arg1: node+33}, +// CHECK:STDOUT: {kind: Assign, arg0: nodeIntegerType, arg1: node+32}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int10, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+35, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+34, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int11, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+38, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+37, type: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block7, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block8, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int12, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+43, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+42, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int13, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+46, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+45, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block10, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+42, arg1: node+49}, +// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+48}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type3}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+51}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+50}, // CHECK:STDOUT: {kind: Branch, arg0: block12}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int14, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int15, type: type0}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+53}, // CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+54}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+55}, // CHECK:STDOUT: {kind: BlockArg, arg0: block13, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int16, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+58, arg1: node+59}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str5, arg1: node+61, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+57, arg1: node+58}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str5, type: type0}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type3}, -// CHECK:STDOUT: {kind: BranchIf, arg0: block14, arg1: node+63}, +// CHECK:STDOUT: {kind: BranchIf, arg0: block14, arg1: node+61}, // CHECK:STDOUT: {kind: Branch, arg0: block15}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+61}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+61}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+60}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+60}, // CHECK:STDOUT: {kind: BlockArg, arg0: block16, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int17, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+68, arg1: node+69}, +// CHECK:STDOUT: {kind: Assign, arg0: node+66, arg1: node+67}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -207,21 +205,20 @@ fn Main() { // CHECK:STDOUT: node+32, // CHECK:STDOUT: node+33, // CHECK:STDOUT: node+34, -// CHECK:STDOUT: node+35, +// CHECK:STDOUT: node+36, // CHECK:STDOUT: node+37, -// CHECK:STDOUT: node+38, +// CHECK:STDOUT: node+39, // CHECK:STDOUT: node+40, // CHECK:STDOUT: node+41, // CHECK:STDOUT: node+42, -// CHECK:STDOUT: node+43, +// CHECK:STDOUT: node+44, // CHECK:STDOUT: node+45, -// CHECK:STDOUT: node+46, +// CHECK:STDOUT: node+47, // CHECK:STDOUT: node+48, // CHECK:STDOUT: node+49, // CHECK:STDOUT: node+50, // CHECK:STDOUT: node+51, // CHECK:STDOUT: node+52, -// CHECK:STDOUT: node+53, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+9, @@ -232,58 +229,57 @@ fn Main() { // CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+23, // CHECK:STDOUT: node+24, -// CHECK:STDOUT: node+25, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+28, -// CHECK:STDOUT: node+30, +// CHECK:STDOUT: node+27, +// CHECK:STDOUT: node+29, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+35, +// CHECK:STDOUT: node+38, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+36, // CHECK:STDOUT: node+39, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+37, -// CHECK:STDOUT: node+40, +// CHECK:STDOUT: node+43, +// CHECK:STDOUT: node+46, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+44, // CHECK:STDOUT: node+47, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+45, -// CHECK:STDOUT: node+48, +// CHECK:STDOUT: node+53, +// CHECK:STDOUT: node+55, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+54, // CHECK:STDOUT: node+56, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+55, // CHECK:STDOUT: node+57, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+58, // CHECK:STDOUT: node+59, // CHECK:STDOUT: node+60, // CHECK:STDOUT: node+61, // CHECK:STDOUT: node+62, // CHECK:STDOUT: node+63, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+64, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+65, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+66, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+67, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+68, // CHECK:STDOUT: node+69, -// CHECK:STDOUT: node+70, -// CHECK:STDOUT: node+71, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -314,7 +310,7 @@ fn Main() { // CHECK:STDOUT: %.loc21_16.2: i32 = stub_reference %.loc21_16.1 // CHECK:STDOUT: %.loc21_17: (i32, i32) = tuple_value (%.loc21_13.2, %.loc21_16.2) // CHECK:STDOUT: assign %.loc21_8.2, %.loc21_17 -// CHECK:STDOUT: %n: i32 = var +// CHECK:STDOUT: %n: i32 = var "n" // CHECK:STDOUT: %.loc22: i32 = int_literal 0 // CHECK:STDOUT: assign %n, %.loc22 // CHECK:STDOUT: %.loc26_4: i32 = stub_reference %n @@ -355,7 +351,7 @@ fn Main() { // CHECK:STDOUT: %.loc38_4: i32 = block_arg !if.expr.result.loc38 // CHECK:STDOUT: %.loc38_29: i32 = int_literal 3 // CHECK:STDOUT: assign %.loc38_4, %.loc38_29 -// CHECK:STDOUT: %a: i32 = var +// CHECK:STDOUT: %a: i32 = var "a" // CHECK:STDOUT: %.loc45_7: bool = bool_literal true // CHECK:STDOUT: if %.loc45_7 br !if.expr.then.loc45 else br !if.expr.else.loc45 // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon index eb26acddc3f0..eeaeaacb08b2 100644 --- a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon @@ -13,7 +13,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon index 49099af61deb..d17df6a636da 100644 --- a/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/semantics/testdata/operators/fail_type_mismatch_assignment.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 3, @@ -34,12 +34,11 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+5}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+4}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -55,7 +54,6 @@ fn Main() { // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -65,7 +63,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %a: i32 = var +// CHECK:STDOUT: %a: i32 = var "a" // CHECK:STDOUT: %.loc8: i32 = int_literal 3 // CHECK:STDOUT: assign %a, %.loc8 // CHECK:STDOUT: %.loc12: f64 = real_literal 56e-1 diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon index ceebea3e32ad..08b62c947b83 100644 --- a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon +++ b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon @@ -15,7 +15,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, diff --git a/toolchain/semantics/testdata/operators/or.carbon b/toolchain/semantics/testdata/operators/or.carbon index 826f79a7be9b..6f18d26860fe 100644 --- a/toolchain/semantics/testdata/operators/or.carbon +++ b/toolchain/semantics/testdata/operators/or.carbon @@ -13,9 +13,9 @@ fn Or() -> bool { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, -// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}}, -// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: {block4, block5, block6}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, +// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]}, +// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: [block4, block5, block6]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/operators/unary_op.carbon b/toolchain/semantics/testdata/operators/unary_op.carbon index e5f8796cae8f..45231fbc5a1a 100644 --- a/toolchain/semantics/testdata/operators/unary_op.carbon +++ b/toolchain/semantics/testdata/operators/unary_op.carbon @@ -10,7 +10,7 @@ fn Not(b: bool) -> bool { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -26,28 +26,26 @@ fn Not(b: bool) -> bool { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: UnaryOperatorNot, arg0: node+0, type: type0}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/pointer/address_of_deref.carbon b/toolchain/semantics/testdata/pointer/address_of_deref.carbon index 84e6ab35adf2..3afa7d4d2c64 100644 --- a/toolchain/semantics/testdata/pointer/address_of_deref.carbon +++ b/toolchain/semantics/testdata/pointer/address_of_deref.carbon @@ -11,7 +11,7 @@ fn F() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -24,22 +24,21 @@ fn F() -> i32 { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type1}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+6, type: type0}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+7, type: type1}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+8, type: type0}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+9}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+7, type: type0}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+8}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -57,7 +56,6 @@ fn F() -> i32 { // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -67,7 +65,7 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n: i32 = var +// CHECK:STDOUT: %n: i32 = var "n" // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: assign %n, %.loc8 // CHECK:STDOUT: %.loc9_13.1: type = ptr_type i32 diff --git a/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon b/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon index 2b19bf04dfba..3b730bdcac10 100644 --- a/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/semantics/testdata/pointer/address_of_lvalue.carbon @@ -22,7 +22,7 @@ fn F(param: i32) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -50,11 +50,11 @@ fn F(param: i32) { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+19, -// CHECK:STDOUT: node+24, -// CHECK:STDOUT: node+38, -// CHECK:STDOUT: node+40, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+17, +// CHECK:STDOUT: node+21, +// CHECK:STDOUT: node+33, +// CHECK:STDOUT: node+35, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -67,74 +67,65 @@ fn F(param: i32) { // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+6, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block7, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+14}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+12}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block8, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str5, arg1: node+20, type: type2}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+6, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+20, arg1: node+22}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str5, type: type2}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+5, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+19}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str6, arg1: node+25, type: type3}, -// CHECK:STDOUT: {kind: StructAccess, arg0: node+6, arg1: member0, type: type0}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+27, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+25, arg1: node+28}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str6, type: type3}, +// CHECK:STDOUT: {kind: StructAccess, arg0: node+5, arg1: member0, type: type0}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+23, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+22, arg1: node+24}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str7, arg1: node+31, type: type3}, -// CHECK:STDOUT: {kind: StructAccess, arg0: node+6, arg1: member1, type: type0}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+33, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+31, arg1: node+34}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str7, type: type3}, +// CHECK:STDOUT: {kind: StructAccess, arg0: node+5, arg1: member1, type: type0}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+28, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+27, arg1: node+29}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block9, type: type4}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type5}, -// CHECK:STDOUT: {kind: BindName, arg0: str8, arg1: node+41, type: type5}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str8, type: type5}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+43, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+37, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+45, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+39, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block10, type: type5}, -// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+47}, +// CHECK:STDOUT: {kind: Assign, arg0: node+36, arg1: node+41}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str9, arg1: node+50, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str9, type: type3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0}, -// CHECK:STDOUT: {kind: TupleIndex, arg0: node+41, arg1: node+52, type: type0}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+53, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+50, arg1: node+54}, +// CHECK:STDOUT: {kind: TupleIndex, arg0: node+36, arg1: node+45, type: type0}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+46, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+44, arg1: node+47}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str10, arg1: node+57, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str10, type: type3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0}, -// CHECK:STDOUT: {kind: TupleIndex, arg0: node+41, arg1: node+59, type: type0}, -// CHECK:STDOUT: {kind: AddressOf, arg0: node+60, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+57, arg1: node+61}, +// CHECK:STDOUT: {kind: TupleIndex, arg0: node+36, arg1: node+51, type: type0}, +// CHECK:STDOUT: {kind: AddressOf, arg0: node+52, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+50, arg1: node+53}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str11, arg1: node+64, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str11, type: type3}, // CHECK:STDOUT: {kind: AddressOf, arg0: node+0, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+64, arg1: node+66}, +// CHECK:STDOUT: {kind: Assign, arg0: node+56, arg1: node+57}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -142,23 +133,23 @@ fn F(param: i32) { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, @@ -206,39 +197,30 @@ fn F(param: i32) { // CHECK:STDOUT: node+57, // CHECK:STDOUT: node+58, // CHECK:STDOUT: node+59, -// CHECK:STDOUT: node+60, -// CHECK:STDOUT: node+61, -// CHECK:STDOUT: node+62, -// CHECK:STDOUT: node+63, -// CHECK:STDOUT: node+64, -// CHECK:STDOUT: node+65, -// CHECK:STDOUT: node+66, -// CHECK:STDOUT: node+67, -// CHECK:STDOUT: node+68, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+36, -// CHECK:STDOUT: node+37, +// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+44, -// CHECK:STDOUT: node+46, +// CHECK:STDOUT: node+31, +// CHECK:STDOUT: node+32, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+38, +// CHECK:STDOUT: node+40, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -249,7 +231,7 @@ fn F(param: i32) { // CHECK:STDOUT: fn @F(%param: i32) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc8_27: type = struct_type {.a: i32, .b: i32} -// CHECK:STDOUT: %s: {.a: i32, .b: i32} = var +// CHECK:STDOUT: %s: {.a: i32, .b: i32} = var "s" // CHECK:STDOUT: %.loc8_37: i32 = int_literal 1 // CHECK:STDOUT: %.loc8_35: i32 = stub_reference %.loc8_37 // CHECK:STDOUT: %.loc8_45: i32 = int_literal 2 @@ -258,16 +240,16 @@ fn F(param: i32) { // CHECK:STDOUT: assign %s, %.loc8_46 // CHECK:STDOUT: %.loc10_27: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_28: type = ptr_type {.a: i32, .b: i32} -// CHECK:STDOUT: %p: {.a: i32, .b: i32}* = var +// CHECK:STDOUT: %p: {.a: i32, .b: i32}* = var "p" // CHECK:STDOUT: %.loc10_32: {.a: i32, .b: i32}* = address_of %s // CHECK:STDOUT: assign %p, %.loc10_32 // CHECK:STDOUT: %.loc11_13: type = ptr_type i32 -// CHECK:STDOUT: %q: i32* = var +// CHECK:STDOUT: %q: i32* = var "q" // CHECK:STDOUT: %.loc11_19: i32 = struct_access %s, member0 // CHECK:STDOUT: %.loc11_17: i32* = address_of %.loc11_19 // CHECK:STDOUT: assign %q, %.loc11_17 // CHECK:STDOUT: %.loc12_13: type = ptr_type i32 -// CHECK:STDOUT: %r: i32* = var +// CHECK:STDOUT: %r: i32* = var "r" // CHECK:STDOUT: %.loc12_19: i32 = struct_access %s, member1 // CHECK:STDOUT: %.loc12_17: i32* = address_of %.loc12_19 // CHECK:STDOUT: assign %r, %.loc12_17 @@ -276,7 +258,7 @@ fn F(param: i32) { // CHECK:STDOUT: %.loc14_19.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc14_19.2: (type, type) = tuple_value (%.loc14_11, %.loc14_16) // CHECK:STDOUT: %.loc14_19.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %t: (i32, i32) = var +// CHECK:STDOUT: %t: (i32, i32) = var "t" // CHECK:STDOUT: %.loc14_24.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc14_24.2: i32 = stub_reference %.loc14_24.1 // CHECK:STDOUT: %.loc14_27.1: i32 = int_literal 2 @@ -284,19 +266,19 @@ fn F(param: i32) { // CHECK:STDOUT: %.loc14_28: (i32, i32) = tuple_value (%.loc14_24.2, %.loc14_27.2) // CHECK:STDOUT: assign %t, %.loc14_28 // CHECK:STDOUT: %.loc15_14: type = ptr_type i32 -// CHECK:STDOUT: %t0: i32* = var +// CHECK:STDOUT: %t0: i32* = var "t0" // CHECK:STDOUT: %.loc15_21: i32 = int_literal 0 // CHECK:STDOUT: %.loc15_22: i32 = tuple_index %t, %.loc15_21 // CHECK:STDOUT: %.loc15_18: i32* = address_of %.loc15_22 // CHECK:STDOUT: assign %t0, %.loc15_18 // CHECK:STDOUT: %.loc16_14: type = ptr_type i32 -// CHECK:STDOUT: %t1: i32* = var +// CHECK:STDOUT: %t1: i32* = var "t1" // CHECK:STDOUT: %.loc16_21: i32 = int_literal 1 // CHECK:STDOUT: %.loc16_22: i32 = tuple_index %t, %.loc16_21 // CHECK:STDOUT: %.loc16_18: i32* = address_of %.loc16_22 // CHECK:STDOUT: assign %t1, %.loc16_18 // CHECK:STDOUT: %.loc20_22: type = ptr_type i32 -// CHECK:STDOUT: %param_addr: i32* = var +// CHECK:STDOUT: %param_addr: i32* = var "param_addr" // CHECK:STDOUT: %.loc20_26: i32* = address_of %param // CHECK:STDOUT: assign %param_addr, %.loc20_26 // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/pointer/basic.carbon b/toolchain/semantics/testdata/pointer/basic.carbon index b7d8c80413e8..ad640649470e 100644 --- a/toolchain/semantics/testdata/pointer/basic.carbon +++ b/toolchain/semantics/testdata/pointer/basic.carbon @@ -13,7 +13,7 @@ fn F() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -27,23 +27,21 @@ fn F() -> i32 { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+6, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+8}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+6, type: type0}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+10}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+6}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+8}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -61,8 +59,6 @@ fn F() -> i32 { // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -72,11 +68,11 @@ fn F() -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %n: i32 = var +// CHECK:STDOUT: %n: i32 = var "n" // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: assign %n, %.loc8 // CHECK:STDOUT: %.loc9_13: type = ptr_type i32 -// CHECK:STDOUT: %p: i32* = var +// CHECK:STDOUT: %p: i32* = var "p" // CHECK:STDOUT: %.loc9_17: i32* = address_of %n // CHECK:STDOUT: assign %p, %.loc9_17 // CHECK:STDOUT: %.loc11: i32 = dereference %p diff --git a/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon b/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon index 498ebfef1f2f..530772b09ef9 100644 --- a/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/semantics/testdata/pointer/fail_address_of_value.carbon @@ -79,11 +79,11 @@ fn AddressOfTupleElementValue() { // CHECK:STDOUT: functions: [ // CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0}, // CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type1}, -// CHECK:STDOUT: {name: str3, param_refs: block0, body: {block3}}}, -// CHECK:STDOUT: {name: str5, param_refs: block0, body: {block7}}}, -// CHECK:STDOUT: {name: str6, param_refs: block0, body: {block8}}}, -// CHECK:STDOUT: {name: str7, param_refs: block0, body: {block9}}}, -// CHECK:STDOUT: {name: str8, param_refs: block0, body: {block10}}}, +// CHECK:STDOUT: {name: str3, param_refs: block0, body: [block3]}, +// CHECK:STDOUT: {name: str5, param_refs: block0, body: [block7]}, +// CHECK:STDOUT: {name: str6, param_refs: block0, body: [block8]}, +// CHECK:STDOUT: {name: str7, param_refs: block0, body: [block9]}, +// CHECK:STDOUT: {name: str8, param_refs: block0, body: [block10]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/pointer/fail_dereference_not_pointer.carbon b/toolchain/semantics/testdata/pointer/fail_dereference_not_pointer.carbon index 0c5f7d5ac461..38c63ba558be 100644 --- a/toolchain/semantics/testdata/pointer/fail_dereference_not_pointer.carbon +++ b/toolchain/semantics/testdata/pointer/fail_dereference_not_pointer.carbon @@ -21,7 +21,7 @@ fn Deref(n: i32) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -33,24 +33,23 @@ fn Deref(n: i32) { // CHECK:STDOUT: ] // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Dereference, arg0: node+0, type: typeError}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type1}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+5, type: typeError}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+4, type: typeError}, // CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type2}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+8, type: typeError}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+7, type: typeError}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -58,15 +57,15 @@ fn Deref(n: i32) { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, @@ -74,7 +73,6 @@ fn Deref(n: i32) { // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/pointer/fail_dereference_type.carbon b/toolchain/semantics/testdata/pointer/fail_dereference_type.carbon index acde72db7d92..ad114c469993 100644 --- a/toolchain/semantics/testdata/pointer/fail_dereference_type.carbon +++ b/toolchain/semantics/testdata/pointer/fail_dereference_type.carbon @@ -28,8 +28,7 @@ var p: *i32; // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: Dereference, arg0: nodeIntegerType, type: typeError}, -// CHECK:STDOUT: {kind: VarStorage, type: typeError}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+1, type: typeError}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: typeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -37,11 +36,10 @@ var p: *i32; // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc13: = dereference i32 -// CHECK:STDOUT: %p: = var +// CHECK:STDOUT: %p: = var "p" // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/pointer/fail_type_mismatch.carbon b/toolchain/semantics/testdata/pointer/fail_type_mismatch.carbon index 0ac95bf2aacd..c33edf29183c 100644 --- a/toolchain/semantics/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/pointer/fail_type_mismatch.carbon @@ -13,7 +13,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type4, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type4, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -27,8 +27,8 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] @@ -37,8 +37,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type2}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: ConstType, arg0: type3, type: typeTypeType}, @@ -54,19 +53,18 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/pointer/nested_const.carbon b/toolchain/semantics/testdata/pointer/nested_const.carbon index ac7b941a79cb..38d2f82b26e0 100644 --- a/toolchain/semantics/testdata/pointer/nested_const.carbon +++ b/toolchain/semantics/testdata/pointer/nested_const.carbon @@ -11,7 +11,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -37,13 +37,12 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: {kind: ConstType, arg0: type2, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type3, type: typeTypeType}, // CHECK:STDOUT: {kind: ConstType, arg0: type4, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type5}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+5, type: type5}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type5}, // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Dereference, arg0: node+5, type: type3}, -// CHECK:STDOUT: {kind: Dereference, arg0: node+9, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+10}, +// CHECK:STDOUT: {kind: Dereference, arg0: node+8, type: type1}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+9}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -55,19 +54,18 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+6, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/pointer/types.carbon b/toolchain/semantics/testdata/pointer/types.carbon index 23d19e82b8ec..badae1405ade 100644 --- a/toolchain/semantics/testdata/pointer/types.carbon +++ b/toolchain/semantics/testdata/pointer/types.carbon @@ -14,8 +14,8 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4}}}, -// CHECK:STDOUT: {name: str2, param_refs: block6, return_type: type3, body: {block7}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4]}, +// CHECK:STDOUT: {name: str2, param_refs: block6, return_type: type3, body: [block7]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -29,26 +29,24 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type1}, // CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1}, // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+8, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type3}, // CHECK:STDOUT: {kind: ConstType, arg0: type0, type: typeTypeType}, // CHECK:STDOUT: {kind: PointerType, arg0: type2, type: typeTypeType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+8}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+7}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -56,32 +54,30 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+2, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/return/code_after_return.carbon b/toolchain/semantics/testdata/return/code_after_return.carbon index 8f4140673911..06045c6b0c38 100644 --- a/toolchain/semantics/testdata/return/code_after_return.carbon +++ b/toolchain/semantics/testdata/return/code_after_return.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -31,12 +31,11 @@ fn Main() { // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+4, arg1: node+5, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+3, arg1: node+4, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+5}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ diff --git a/toolchain/semantics/testdata/return/code_after_return_value.carbon b/toolchain/semantics/testdata/return/code_after_return_value.carbon index c09b25b14953..70e6c77319d9 100644 --- a/toolchain/semantics/testdata/return/code_after_return_value.carbon +++ b/toolchain/semantics/testdata/return/code_after_return_value.carbon @@ -18,7 +18,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: {block4}}}, +// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type1, body: [block4]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -39,23 +39,21 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type1}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1}, // CHECK:STDOUT: {kind: BlockArg, arg0: unreachable, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+9}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+7}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: false, type: type0}, // CHECK:STDOUT: {kind: UnaryOperatorNot, arg0: node+0, type: type0}, // CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type0}, // CHECK:STDOUT: {kind: BranchWithArg, arg0: unreachable, arg1: node+0}, // CHECK:STDOUT: {kind: BlockArg, arg0: unreachable, type: type0}, -// CHECK:STDOUT: {kind: BranchWithArg, arg0: unreachable, arg1: node+15}, +// CHECK:STDOUT: {kind: BranchWithArg, arg0: unreachable, arg1: node+13}, // CHECK:STDOUT: {kind: BlockArg, arg0: unreachable, type: type0}, // CHECK:STDOUT: {kind: Branch, arg0: unreachable}, // CHECK:STDOUT: ] @@ -64,17 +62,16 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: diff --git a/toolchain/semantics/testdata/return/fail_missing_return.carbon b/toolchain/semantics/testdata/return/fail_missing_return.carbon index 97a66bd536a4..82921fd481c8 100644 --- a/toolchain/semantics/testdata/return/fail_missing_return.carbon +++ b/toolchain/semantics/testdata/return/fail_missing_return.carbon @@ -12,7 +12,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/semantics/testdata/return/fail_missing_return_empty_tuple.carbon index 579e03d22dee..a8f73e128e0c 100644 --- a/toolchain/semantics/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/semantics/testdata/return/fail_missing_return_empty_tuple.carbon @@ -12,7 +12,7 @@ fn F() -> () { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon index 8824332ec253..2463cae4a7a8 100644 --- a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon @@ -13,7 +13,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon index e5a14ab40bb6..ebaeffa8ec2c 100644 --- a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon @@ -16,7 +16,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/return/fail_value_missing.carbon b/toolchain/semantics/testdata/return/fail_value_missing.carbon index bde7eaa7095b..8d54678cf171 100644 --- a/toolchain/semantics/testdata/return/fail_value_missing.carbon +++ b/toolchain/semantics/testdata/return/fail_value_missing.carbon @@ -13,7 +13,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/missing_return_no_return_type.carbon b/toolchain/semantics/testdata/return/missing_return_no_return_type.carbon index e7ffb47406a1..081fb7e8e76f 100644 --- a/toolchain/semantics/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/semantics/testdata/return/missing_return_no_return_type.carbon @@ -9,7 +9,7 @@ fn F() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/no_value.carbon b/toolchain/semantics/testdata/return/no_value.carbon index 0725b6f07f6a..a1cb1a172f9f 100644 --- a/toolchain/semantics/testdata/return/no_value.carbon +++ b/toolchain/semantics/testdata/return/no_value.carbon @@ -10,7 +10,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/struct.carbon b/toolchain/semantics/testdata/return/struct.carbon index 5477e6215872..2d575afe1d61 100644 --- a/toolchain/semantics/testdata/return/struct.carbon +++ b/toolchain/semantics/testdata/return/struct.carbon @@ -10,7 +10,7 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type1, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type1, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 3, diff --git a/toolchain/semantics/testdata/return/tuple.carbon b/toolchain/semantics/testdata/return/tuple.carbon index ef222790c459..507c43449be2 100644 --- a/toolchain/semantics/testdata/return/tuple.carbon +++ b/toolchain/semantics/testdata/return/tuple.carbon @@ -11,7 +11,7 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: {block3}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: [block3]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 15, diff --git a/toolchain/semantics/testdata/return/value.carbon b/toolchain/semantics/testdata/return/value.carbon index 45a55ff9b591..c2e24a33de04 100644 --- a/toolchain/semantics/testdata/return/value.carbon +++ b/toolchain/semantics/testdata/return/value.carbon @@ -10,7 +10,7 @@ fn Main() -> i32 { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, diff --git a/toolchain/semantics/testdata/struct/empty.carbon b/toolchain/semantics/testdata/struct/empty.carbon index 844de1868084..60098f2c5879 100644 --- a/toolchain/semantics/testdata/struct/empty.carbon +++ b/toolchain/semantics/testdata/struct/empty.carbon @@ -26,14 +26,12 @@ var y: {} = x; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+4}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+3}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+7, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+7, arg1: node+2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -47,18 +45,16 @@ var y: {} = x; // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_9.1: type = struct_type {} // CHECK:STDOUT: %.loc7_9.2: {} = struct_value () -// CHECK:STDOUT: %x: {} = var +// CHECK:STDOUT: %x: {} = var "x" // CHECK:STDOUT: %.loc7_14: {} = struct_value () // CHECK:STDOUT: assign %x, %.loc7_14 // CHECK:STDOUT: %.loc8: {} = struct_value () -// CHECK:STDOUT: %y: {} = var +// CHECK:STDOUT: %y: {} = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon index f07adf238ed6..59b1eb5e8238 100644 --- a/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/semantics/testdata/struct/fail_access_into_invalid.carbon @@ -12,7 +12,7 @@ fn F() { a.b; } // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/struct/fail_assign_empty.carbon b/toolchain/semantics/testdata/struct/fail_assign_empty.carbon index 281bfd86a5b4..61902af68e32 100644 --- a/toolchain/semantics/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/semantics/testdata/struct/fail_assign_empty.carbon @@ -23,15 +23,14 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -46,7 +45,6 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -55,7 +53,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc10_21.1: type = struct_type {} // CHECK:STDOUT: %.loc10_21.2: {} = struct_value () // CHECK:STDOUT: assign %x, diff --git a/toolchain/semantics/testdata/struct/fail_assign_nested.carbon b/toolchain/semantics/testdata/struct/fail_assign_nested.carbon index dc1d228861fc..f0fd77cbdb88 100644 --- a/toolchain/semantics/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/semantics/testdata/struct/fail_assign_nested.carbon @@ -24,7 +24,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: types: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] @@ -33,11 +33,10 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeError}, @@ -52,20 +51,19 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -73,7 +71,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: %.loc10_14.1: type = struct_type {} // CHECK:STDOUT: %.loc10_14.2: {} = struct_value () // CHECK:STDOUT: %.loc10_15: type = struct_type {.a: {}} -// CHECK:STDOUT: %x: {.a: {}} = var +// CHECK:STDOUT: %x: {.a: {}} = var "x" // CHECK:STDOUT: %.loc10_26: {} = struct_value () // CHECK:STDOUT: %.loc10_23: {} = stub_reference %.loc10_26 // CHECK:STDOUT: %.loc10_27.1: type = struct_type {.b: {}} diff --git a/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon b/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon index 8b2dee0b3499..a2e1e3bf4aff 100644 --- a/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon @@ -24,18 +24,17 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: types: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: nodeIntegerType, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type1}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block3, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -48,24 +47,23 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, -// CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_9.1: type = struct_type {} // CHECK:STDOUT: %.loc10_9.2: {} = struct_value () -// CHECK:STDOUT: %x: {} = var +// CHECK:STDOUT: %x: {} = var "x" // CHECK:STDOUT: %.loc10_19: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_17: i32 = stub_reference %.loc10_19 // CHECK:STDOUT: %.loc10_20.1: type = struct_type {.a: i32} diff --git a/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon index 4dda1d4ef089..4f88886d680e 100644 --- a/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon @@ -25,18 +25,17 @@ var x: {.a: i32} = {.b = 1}; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -49,26 +48,25 @@ var x: {.a: i32} = {.b = 1}; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc10_26: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_24: i32 = stub_reference %.loc10_26 // CHECK:STDOUT: %.loc10_27.1: type = struct_type {.b: i32} diff --git a/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon index 6fd1d840b016..8ca6be4236fe 100644 --- a/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon @@ -26,18 +26,17 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+1, // CHECK:STDOUT: nodeFloatingPointType, -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type2}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type2}, // CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type3}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -50,26 +49,25 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc10_26: f64 = real_literal 10e-1 // CHECK:STDOUT: %.loc10_24: f64 = stub_reference %.loc10_26 // CHECK:STDOUT: %.loc10_29.1: type = struct_type {.b: f64} diff --git a/toolchain/semantics/testdata/struct/fail_member_access_type.carbon b/toolchain/semantics/testdata/struct/fail_member_access_type.carbon index 1ab4b768d5c0..3ac10b2a1a2a 100644 --- a/toolchain/semantics/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/semantics/testdata/struct/fail_member_access_type.carbon @@ -34,16 +34,14 @@ var y: i32 = x.b; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+9, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+8, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -53,32 +51,30 @@ var y: i32 = x.b; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: f64} -// CHECK:STDOUT: %x: {.a: f64} = var +// CHECK:STDOUT: %x: {.a: f64} = var "x" // CHECK:STDOUT: %.loc7_26: f64 = real_literal 40e-1 // CHECK:STDOUT: %.loc7_24: f64 = stub_reference %.loc7_26 // CHECK:STDOUT: %.loc7_29: {.a: f64} = struct_value (%.loc7_24) // CHECK:STDOUT: assign %x, %.loc7_29 -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/fail_non_member_access.carbon b/toolchain/semantics/testdata/struct/fail_non_member_access.carbon index 2eb3db738db0..380d6075a1b6 100644 --- a/toolchain/semantics/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/semantics/testdata/struct/fail_non_member_access.carbon @@ -33,16 +33,14 @@ var y: i32 = x.b; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+9, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: nodeError}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+8, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -52,32 +50,30 @@ var y: i32 = x.b; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc7_26: i32 = int_literal 4 // CHECK:STDOUT: %.loc7_24: i32 = stub_reference %.loc7_26 // CHECK:STDOUT: %.loc7_27: {.a: i32} = struct_value (%.loc7_24) // CHECK:STDOUT: assign %x, %.loc7_27 -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/fail_too_few_values.carbon b/toolchain/semantics/testdata/struct/fail_too_few_values.carbon index 2df9cd76595d..74731b30d01c 100644 --- a/toolchain/semantics/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/semantics/testdata/struct/fail_too_few_values.carbon @@ -25,7 +25,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: types: [ // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] @@ -33,11 +33,10 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+3, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2}, // CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: nodeError}, @@ -51,27 +50,26 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, -// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_25: type = struct_type {.a: i32, .b: i32} -// CHECK:STDOUT: %x: {.a: i32, .b: i32} = var +// CHECK:STDOUT: %x: {.a: i32, .b: i32} = var "x" // CHECK:STDOUT: %.loc10_35: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_33: i32 = stub_reference %.loc10_35 // CHECK:STDOUT: %.loc10_36.1: type = struct_type {.a: i32} diff --git a/toolchain/semantics/testdata/struct/fail_type_assign.carbon b/toolchain/semantics/testdata/struct/fail_type_assign.carbon index 63d7e1f661af..1b5eed39af6b 100644 --- a/toolchain/semantics/testdata/struct/fail_type_assign.carbon +++ b/toolchain/semantics/testdata/struct/fail_type_assign.carbon @@ -29,8 +29,7 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, @@ -45,19 +44,18 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc10_28: type = struct_type {.a: i32} // CHECK:STDOUT: assign %x, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/fail_value_as_type.carbon b/toolchain/semantics/testdata/struct/fail_value_as_type.carbon index 0d546c8dc0d5..e7fcee16fca2 100644 --- a/toolchain/semantics/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/semantics/testdata/struct/fail_value_as_type.carbon @@ -33,8 +33,7 @@ var x: {.a = 1}; // CHECK:STDOUT: {kind: StubReference, arg0: node+0, type: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, // CHECK:STDOUT: {kind: StructValue, arg0: block3, type: type1}, -// CHECK:STDOUT: {kind: VarStorage, type: typeError}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: typeError}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: typeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -45,7 +44,6 @@ var x: {.a = 1}; // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -60,5 +58,5 @@ var x: {.a = 1}; // CHECK:STDOUT: %.loc10_12: i32 = stub_reference %.loc10_14 // CHECK:STDOUT: %.loc10_15.1: type = struct_type {.a: i32} // CHECK:STDOUT: %.loc10_15.2: {.a: i32} = struct_value (%.loc10_12) -// CHECK:STDOUT: %x: = var +// CHECK:STDOUT: %x: = var "x" // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/member_access.carbon b/toolchain/semantics/testdata/struct/member_access.carbon index 0a875ce395e0..f692738c8deb 100644 --- a/toolchain/semantics/testdata/struct/member_access.carbon +++ b/toolchain/semantics/testdata/struct/member_access.carbon @@ -35,23 +35,20 @@ var z: i32 = y; // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type1}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+3, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+11}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+13, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+10}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type1}, // CHECK:STDOUT: {kind: StructAccess, arg0: node+3, arg1: member1, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: node+15}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+17, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: node+13}, +// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+13}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: node+12}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -62,9 +59,9 @@ var z: i32 = y; // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, @@ -72,36 +69,33 @@ var z: i32 = y; // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: f64, .b: i32} -// CHECK:STDOUT: %x: {.a: f64, .b: i32} = var +// CHECK:STDOUT: %x: {.a: f64, .b: i32} = var "x" // CHECK:STDOUT: %.loc7_35: f64 = real_literal 0e-1 // CHECK:STDOUT: %.loc7_33: f64 = stub_reference %.loc7_35 // CHECK:STDOUT: %.loc7_45: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_43: i32 = stub_reference %.loc7_45 // CHECK:STDOUT: %.loc7_46: {.a: f64, .b: i32} = struct_value (%.loc7_33, %.loc7_43) // CHECK:STDOUT: assign %x, %.loc7_46 -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: %.loc8: i32 = struct_access %x, member1 // CHECK:STDOUT: assign %y, %.loc8 -// CHECK:STDOUT: %z: i32 = var +// CHECK:STDOUT: %z: i32 = var "z" // CHECK:STDOUT: assign %z, %y // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/one_entry.carbon b/toolchain/semantics/testdata/struct/one_entry.carbon index 0b9530f902de..1d9a231b66b4 100644 --- a/toolchain/semantics/testdata/struct/one_entry.carbon +++ b/toolchain/semantics/testdata/struct/one_entry.carbon @@ -29,18 +29,16 @@ var y: {.a: i32} = x; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+11, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: node+2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -50,38 +48,36 @@ var y: {.a: i32} = x; // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} -// CHECK:STDOUT: %x: {.a: i32} = var +// CHECK:STDOUT: %x: {.a: i32} = var "x" // CHECK:STDOUT: %.loc7_26: i32 = int_literal 4 // CHECK:STDOUT: %.loc7_24: i32 = stub_reference %.loc7_26 // CHECK:STDOUT: %.loc7_27: {.a: i32} = struct_value (%.loc7_24) // CHECK:STDOUT: assign %x, %.loc7_27 // CHECK:STDOUT: %.loc8: type = struct_type {.a: i32} -// CHECK:STDOUT: %y: {.a: i32} = var +// CHECK:STDOUT: %y: {.a: i32} = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/tuple_as_element.carbon b/toolchain/semantics/testdata/struct/tuple_as_element.carbon index 4795d3e77867..140591769c0c 100644 --- a/toolchain/semantics/testdata/struct/tuple_as_element.carbon +++ b/toolchain/semantics/testdata/struct/tuple_as_element.carbon @@ -44,26 +44,24 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type2}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+7, type: type3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block6, type: type2}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type2}, // CHECK:STDOUT: {kind: StructValue, arg0: block5, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+7, arg1: node+17}, +// CHECK:STDOUT: {kind: Assign, arg0: node+7, arg1: node+16}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block8, type: type1}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type2}, // CHECK:STDOUT: {kind: StructType, arg0: block7, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type3}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+24, type: type3}, -// CHECK:STDOUT: {kind: Assign, arg0: node+24, arg1: node+7}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+23, arg1: node+7}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -78,11 +76,11 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, // CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, // CHECK:STDOUT: node+17, // CHECK:STDOUT: node+18, @@ -92,8 +90,6 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: node+22, // CHECK:STDOUT: node+23, // CHECK:STDOUT: node+24, -// CHECK:STDOUT: node+25, -// CHECK:STDOUT: node+26, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -103,22 +99,22 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+14, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+11, -// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+18, +// CHECK:STDOUT: node+21, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+19, -// CHECK:STDOUT: node+22, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ -// CHECK:STDOUT: node+20, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -128,7 +124,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc7_27.2: (type,) = tuple_value (%.loc7_23) // CHECK:STDOUT: %.loc7_27.3: type = tuple_type (i32) // CHECK:STDOUT: %.loc7_28: type = struct_type {.a: i32, .b: (i32,)} -// CHECK:STDOUT: %x: {.a: i32, .b: (i32,)} = var +// CHECK:STDOUT: %x: {.a: i32, .b: (i32,)} = var "x" // CHECK:STDOUT: %.loc7_38: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_36: i32 = stub_reference %.loc7_38 // CHECK:STDOUT: %.loc7_47.1: i32 = int_literal 2 @@ -140,6 +136,6 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc8_23: type = stub_reference i32 // CHECK:STDOUT: %.loc8_27: (type,) = tuple_value (%.loc8_23) // CHECK:STDOUT: %.loc8_28: type = struct_type {.a: i32, .b: (i32,)} -// CHECK:STDOUT: %y: {.a: i32, .b: (i32,)} = var +// CHECK:STDOUT: %y: {.a: i32, .b: (i32,)} = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/struct/two_entries.carbon b/toolchain/semantics/testdata/struct/two_entries.carbon index 21e481d002a6..9db4bf7af52b 100644 --- a/toolchain/semantics/testdata/struct/two_entries.carbon +++ b/toolchain/semantics/testdata/struct/two_entries.carbon @@ -32,22 +32,20 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+3, type: type1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0}, // CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+11}, +// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+10}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0}, // CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0}, // CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type1}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+16, type: type1}, -// CHECK:STDOUT: {kind: Assign, arg0: node+16, arg1: node+3}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type1}, +// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: node+3}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -58,9 +56,9 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, @@ -68,30 +66,28 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: ], +// CHECK:STDOUT: [ // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+10, -// CHECK:STDOUT: ], -// CHECK:STDOUT: [ +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: i32, .b: i32} -// CHECK:STDOUT: %x: {.a: i32, .b: i32} = var +// CHECK:STDOUT: %x: {.a: i32, .b: i32} = var "x" // CHECK:STDOUT: %.loc7_35: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_33: i32 = stub_reference %.loc7_35 // CHECK:STDOUT: %.loc7_43: i32 = int_literal 2 @@ -99,6 +95,6 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %.loc7_44: {.a: i32, .b: i32} = struct_value (%.loc7_33, %.loc7_41) // CHECK:STDOUT: assign %x, %.loc7_44 // CHECK:STDOUT: %.loc8: type = struct_type {.a: i32, .b: i32} -// CHECK:STDOUT: %y: {.a: i32, .b: i32} = var +// CHECK:STDOUT: %y: {.a: i32, .b: i32} = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/tuples/empty.carbon b/toolchain/semantics/testdata/tuples/empty.carbon index 18ee2c5bf282..974dccf69227 100644 --- a/toolchain/semantics/testdata/tuples/empty.carbon +++ b/toolchain/semantics/testdata/tuples/empty.carbon @@ -28,14 +28,12 @@ var y: () = x; // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+4}, +// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+3}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+7, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+7, arg1: node+2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -49,18 +47,16 @@ var y: () = x; // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7_9.1: type = tuple_type () // CHECK:STDOUT: %.loc7_9.2: () = tuple_value () -// CHECK:STDOUT: %x: () = var +// CHECK:STDOUT: %x: () = var "x" // CHECK:STDOUT: %.loc7_14: () = tuple_value () // CHECK:STDOUT: assign %x, %.loc7_14 // CHECK:STDOUT: %.loc8: () = tuple_value () -// CHECK:STDOUT: %y: () = var +// CHECK:STDOUT: %y: () = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/tuples/fail_assign_empty.carbon b/toolchain/semantics/testdata/tuples/fail_assign_empty.carbon index 897bc026bb45..bf893e947ae2 100644 --- a/toolchain/semantics/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/semantics/testdata/tuples/fail_assign_empty.carbon @@ -23,7 +23,7 @@ var x: (i32,) = (); // CHECK:STDOUT: node+1, // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -40,8 +40,7 @@ var x: (i32,) = (); // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type3}, // CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeError}, @@ -58,7 +57,6 @@ var x: (i32,) = (); // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -70,7 +68,7 @@ var x: (i32,) = (); // CHECK:STDOUT: %.loc10_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc10_13.2: (type,) = tuple_value (%.loc10_9) // CHECK:STDOUT: %.loc10_13.3: type = tuple_type (i32) -// CHECK:STDOUT: %x: (i32,) = var +// CHECK:STDOUT: %x: (i32,) = var "x" // CHECK:STDOUT: %.loc10_18.1: type = tuple_type () // CHECK:STDOUT: %.loc10_18.2: () = tuple_value () // CHECK:STDOUT: assign %x, diff --git a/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon b/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon index 1ee8f776a4a9..e4acd45668a7 100644 --- a/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/semantics/testdata/tuples/fail_assign_nested.carbon @@ -31,8 +31,8 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+21, -// CHECK:STDOUT: node+32, +// CHECK:STDOUT: node+20, +// CHECK:STDOUT: node+31, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -75,25 +75,24 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock3, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type4}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+13, type: type4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type4}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+18, type: type2}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock4, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block5, type: type5}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+22, type: type5}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+21, type: type5}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+24, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+23, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+26, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+25, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+28, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+27, type: type2}, // CHECK:STDOUT: {kind: TupleValue, arg0: block7, type: type5}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+30, type: type5}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+29, type: type5}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock5, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block6, type: type6}, // CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: nodeError}, @@ -136,7 +135,6 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: node+31, // CHECK:STDOUT: node+32, // CHECK:STDOUT: node+33, -// CHECK:STDOUT: node+34, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -151,18 +149,18 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+18, -// CHECK:STDOUT: node+20, +// CHECK:STDOUT: node+15, +// CHECK:STDOUT: node+17, +// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+23, -// CHECK:STDOUT: node+31, +// CHECK:STDOUT: node+22, +// CHECK:STDOUT: node+30, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+25, -// CHECK:STDOUT: node+27, -// CHECK:STDOUT: node+29, +// CHECK:STDOUT: node+24, +// CHECK:STDOUT: node+26, +// CHECK:STDOUT: node+28, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -180,7 +178,7 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: %.loc10_31.2: ((type, type), (type, type)) = tuple_value (%.loc10_18.3, %.loc10_30.2) // CHECK:STDOUT: %.loc10_18.4: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc10_31.3: type = tuple_type ((i32, i32), (i32, i32)) -// CHECK:STDOUT: %x: ((i32, i32), (i32, i32)) = var +// CHECK:STDOUT: %x: ((i32, i32), (i32, i32)) = var "x" // CHECK:STDOUT: %.loc10_37.1: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_37.2: i32 = stub_reference %.loc10_37.1 // CHECK:STDOUT: %.loc10_40.1: i32 = int_literal 2 diff --git a/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon index 3fe51b0fbaae..85adcc7d62da 100644 --- a/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/semantics/testdata/tuples/fail_assign_to_empty.carbon @@ -31,8 +31,7 @@ var x: () = (66); // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, // CHECK:STDOUT: ] @@ -45,14 +44,13 @@ var x: () = (66); // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc10_9.1: type = tuple_type () // CHECK:STDOUT: %.loc10_9.2: () = tuple_value () -// CHECK:STDOUT: %x: () = var +// CHECK:STDOUT: %x: () = var "x" // CHECK:STDOUT: %.loc10_14: i32 = int_literal 66 // CHECK:STDOUT: assign %x, // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon index 327a3da6ab6b..dbcf1498e087 100644 --- a/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/semantics/testdata/tuples/fail_element_type_mismatch.carbon @@ -26,7 +26,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+4, // CHECK:STDOUT: nodeFloatingPointType, -// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+10, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -48,12 +48,11 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type3}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type3}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type3}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type4}, // CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: nodeError}, @@ -75,15 +74,14 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -93,7 +91,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: %.loc10_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_17.2: (type, type) = tuple_value (%.loc10_9, %.loc10_14) // CHECK:STDOUT: %.loc10_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %x: (i32, i32) = var +// CHECK:STDOUT: %x: (i32, i32) = var "x" // CHECK:STDOUT: %.loc10_22.1: i32 = int_literal 2 // CHECK:STDOUT: %.loc10_22.2: i32 = stub_reference %.loc10_22.1 // CHECK:STDOUT: %.loc10_25.1: f64 = real_literal 6589e-2 diff --git a/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon b/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon index cb776bcc66b4..5e09b4f9b6e0 100644 --- a/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/semantics/testdata/tuples/fail_too_few_element.carbon @@ -24,7 +24,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: node+2, // CHECK:STDOUT: nodeIntegerType, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ] // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: [ @@ -45,10 +45,9 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type3}, // CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: nodeError}, @@ -68,14 +67,13 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: node+8, // CHECK:STDOUT: node+9, // CHECK:STDOUT: node+10, -// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -85,7 +83,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: %.loc10_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_17.2: (type, type) = tuple_value (%.loc10_9, %.loc10_14) // CHECK:STDOUT: %.loc10_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %x: (i32, i32) = var +// CHECK:STDOUT: %x: (i32, i32) = var "x" // CHECK:STDOUT: %.loc10_22.1: i32 = int_literal 2 // CHECK:STDOUT: %.loc10_22.2: i32 = stub_reference %.loc10_22.1 // CHECK:STDOUT: %.loc10_25.1: type = tuple_type (i32) diff --git a/toolchain/semantics/testdata/tuples/fail_type_assign.carbon b/toolchain/semantics/testdata/tuples/fail_type_assign.carbon index 1ae3ac42ad37..45b73ba55763 100644 --- a/toolchain/semantics/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/semantics/testdata/tuples/fail_type_assign.carbon @@ -37,8 +37,7 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeError}, @@ -55,13 +54,12 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -70,7 +68,7 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: %.loc10_14.1: type = tuple_type (type) // CHECK:STDOUT: %.loc10_14.2: (type,) = tuple_value (%.loc10_9) // CHECK:STDOUT: %.loc10_14.3: type = tuple_type (i32) -// CHECK:STDOUT: %x: (i32,) = var +// CHECK:STDOUT: %x: (i32,) = var "x" // CHECK:STDOUT: %.loc10_19: type = stub_reference i32 // CHECK:STDOUT: %.loc10_24: (type,) = tuple_value (%.loc10_19) // CHECK:STDOUT: assign %x, diff --git a/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon b/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon index 38d8569afc19..3d68eb8c968c 100644 --- a/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/semantics/testdata/tuples/fail_value_as_type.carbon @@ -39,8 +39,7 @@ var x: (1, ); // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -52,7 +51,6 @@ var x: (1, ); // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, @@ -65,5 +63,5 @@ var x: (1, ); // CHECK:STDOUT: %.loc10_12.1: type = tuple_type (i32) // CHECK:STDOUT: %.loc10_12.2: (i32,) = tuple_value (%.loc10_9.2) // CHECK:STDOUT: %.loc10_12.3: type = tuple_type () -// CHECK:STDOUT: %x: (,) = var +// CHECK:STDOUT: %x: (,) = var "x" // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/tuples/nested_tuple.carbon b/toolchain/semantics/testdata/tuples/nested_tuple.carbon index d6d4f89ca1b1..7101cb5d6b80 100644 --- a/toolchain/semantics/testdata/tuples/nested_tuple.carbon +++ b/toolchain/semantics/testdata/tuples/nested_tuple.carbon @@ -55,18 +55,17 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type1}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock3, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type4}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+10, type: type4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type4}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type2}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type3}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type3}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: type3}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type2}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+18, type: type2}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type2}, // CHECK:STDOUT: {kind: TupleValue, arg0: block5, type: type4}, -// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: node+20}, +// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: node+19}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -93,7 +92,6 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: node+18, // CHECK:STDOUT: node+19, // CHECK:STDOUT: node+20, -// CHECK:STDOUT: node+21, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, @@ -104,12 +102,12 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+15, +// CHECK:STDOUT: node+12, +// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+19, +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -124,7 +122,7 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: %.loc7_24.2: ((type, type), type) = tuple_value (%.loc7_18.3, %.loc7_21) // CHECK:STDOUT: %.loc7_18.4: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_24.3: type = tuple_type ((i32, i32), i32) -// CHECK:STDOUT: %x: ((i32, i32), i32) = var +// CHECK:STDOUT: %x: ((i32, i32), i32) = var "x" // CHECK:STDOUT: %.loc7_30.1: i32 = int_literal 12 // CHECK:STDOUT: %.loc7_30.2: i32 = stub_reference %.loc7_30.1 // CHECK:STDOUT: %.loc7_34.1: i32 = int_literal 76 diff --git a/toolchain/semantics/testdata/tuples/one_element.carbon b/toolchain/semantics/testdata/tuples/one_element.carbon index 6f342af95ef5..03d7ab7e19c4 100644 --- a/toolchain/semantics/testdata/tuples/one_element.carbon +++ b/toolchain/semantics/testdata/tuples/one_element.carbon @@ -37,17 +37,15 @@ var y: (i32,) = x; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+8}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+7}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+4}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+4}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -66,17 +64,15 @@ var y: (i32,) = x; // CHECK:STDOUT: node+10, // CHECK:STDOUT: node+11, // CHECK:STDOUT: node+12, -// CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -85,13 +81,13 @@ var y: (i32,) = x; // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: (type,) = tuple_value (%.loc7_9) // CHECK:STDOUT: %.loc7_13.3: type = tuple_type (i32) -// CHECK:STDOUT: %x: (i32,) = var +// CHECK:STDOUT: %x: (i32,) = var "x" // CHECK:STDOUT: %.loc7_18.1: i32 = int_literal 4 // CHECK:STDOUT: %.loc7_18.2: i32 = stub_reference %.loc7_18.1 // CHECK:STDOUT: %.loc7_20: (i32,) = tuple_value (%.loc7_18.2) // CHECK:STDOUT: assign %x, %.loc7_20 // CHECK:STDOUT: %.loc8_9: type = stub_reference i32 // CHECK:STDOUT: %.loc8_13: (type,) = tuple_value (%.loc8_9) -// CHECK:STDOUT: %y: (i32,) = var +// CHECK:STDOUT: %y: (i32,) = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/tuples/two_elements.carbon b/toolchain/semantics/testdata/tuples/two_elements.carbon index c21376e0c79f..8ea69a1789fd 100644 --- a/toolchain/semantics/testdata/tuples/two_elements.carbon +++ b/toolchain/semantics/testdata/tuples/two_elements.carbon @@ -41,20 +41,18 @@ var y: (i32, i32) = x; // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0}, // CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+5, type: type2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type1}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1}, -// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1}, +// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1}, // CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+11}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+10}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType}, // CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: type2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+16, type: type2}, -// CHECK:STDOUT: {kind: Assign, arg0: node+16, arg1: node+5}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: node+5}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -77,20 +75,18 @@ var y: (i32, i32) = x; // CHECK:STDOUT: node+14, // CHECK:STDOUT: node+15, // CHECK:STDOUT: node+16, -// CHECK:STDOUT: node+17, -// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+12, // CHECK:STDOUT: node+13, -// CHECK:STDOUT: node+14, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -100,7 +96,7 @@ var y: (i32, i32) = x; // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: (type, type) = tuple_value (%.loc7_9, %.loc7_14) // CHECK:STDOUT: %.loc7_17.3: type = tuple_type (i32, i32) -// CHECK:STDOUT: %x: (i32, i32) = var +// CHECK:STDOUT: %x: (i32, i32) = var "x" // CHECK:STDOUT: %.loc7_22.1: i32 = int_literal 4 // CHECK:STDOUT: %.loc7_22.2: i32 = stub_reference %.loc7_22.1 // CHECK:STDOUT: %.loc7_25.1: i32 = int_literal 102 @@ -110,6 +106,6 @@ var y: (i32, i32) = x; // CHECK:STDOUT: %.loc8_9: type = stub_reference i32 // CHECK:STDOUT: %.loc8_14: type = stub_reference i32 // CHECK:STDOUT: %.loc8_17: (type, type) = tuple_value (%.loc8_9, %.loc8_14) -// CHECK:STDOUT: %y: (i32, i32) = var +// CHECK:STDOUT: %y: (i32, i32) = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/decl.carbon b/toolchain/semantics/testdata/var/decl.carbon index c5b213a4b85b..65431ed4ca09 100644 --- a/toolchain/semantics/testdata/var/decl.carbon +++ b/toolchain/semantics/testdata/var/decl.carbon @@ -10,7 +10,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -27,8 +27,7 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -40,7 +39,6 @@ fn Main() { // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -50,6 +48,6 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/decl_with_init.carbon b/toolchain/semantics/testdata/var/decl_with_init.carbon index f17fb393b3b2..342c5a355ac2 100644 --- a/toolchain/semantics/testdata/var/decl_with_init.carbon +++ b/toolchain/semantics/testdata/var/decl_with_init.carbon @@ -10,7 +10,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -28,10 +28,9 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -45,7 +44,6 @@ fn Main() { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -55,7 +53,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc8 // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon index 109cdfb680d5..bed0e5a97098 100644 --- a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -37,14 +37,12 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+5, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+7}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+5}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -61,8 +59,6 @@ fn Main() { // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, // CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, -// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -72,10 +68,10 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x.loc9: i32 = var +// CHECK:STDOUT: %x.loc9: i32 = var "x" // CHECK:STDOUT: %.loc9: i32 = int_literal 0 // CHECK:STDOUT: assign %x.loc9, %.loc9 -// CHECK:STDOUT: %x.loc16: i32 = var +// CHECK:STDOUT: %x.loc16: i32 = var "x" // CHECK:STDOUT: %.loc16: i32 = int_literal 0 // CHECK:STDOUT: assign %x.loc16, %.loc16 // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon index ad18a8d01ef3..3a00850d9bb9 100644 --- a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -32,8 +32,7 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1}, // CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: nodeError}, // CHECK:STDOUT: {kind: Return}, @@ -49,7 +48,6 @@ fn Main() { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -59,7 +57,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc11: f64 = real_literal 10e-1 // CHECK:STDOUT: assign %x, // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/var/fail_init_with_self.carbon b/toolchain/semantics/testdata/var/fail_init_with_self.carbon index 35521e4842ee..ee6e69bd0c07 100644 --- a/toolchain/semantics/testdata/var/fail_init_with_self.carbon +++ b/toolchain/semantics/testdata/var/fail_init_with_self.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -30,8 +30,7 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: nodeError}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] @@ -45,7 +44,6 @@ fn Main() { // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -55,7 +53,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: assign %x, // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon index 79e6380bea2a..df7ee9241a43 100644 --- a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon @@ -15,7 +15,7 @@ var y: i32 = x; // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -33,37 +33,33 @@ var y: i32 = x; // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeError}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: nodeError}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { // CHECK:STDOUT: %.loc7 = fn_decl @Main -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon b/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon index c39bd8140ca6..2ce6068bfa56 100644 --- a/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/semantics/testdata/var/fail_storage_is_literal.carbon @@ -13,7 +13,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 1, @@ -33,8 +33,7 @@ fn Main() { // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: VarStorage, type: typeError}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: typeError}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: typeError}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0}, // CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError}, // CHECK:STDOUT: {kind: Return}, @@ -51,7 +50,6 @@ fn Main() { // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -62,7 +60,7 @@ fn Main() { // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc11_10: i32 = int_literal 1 -// CHECK:STDOUT: %x: = var +// CHECK:STDOUT: %x: = var "x" // CHECK:STDOUT: %.loc11_14: i32 = int_literal 1 // CHECK:STDOUT: assign %x, // CHECK:STDOUT: return diff --git a/toolchain/semantics/testdata/var/global_decl.carbon b/toolchain/semantics/testdata/var/global_decl.carbon index f2d97a0c218c..2951cc465305 100644 --- a/toolchain/semantics/testdata/var/global_decl.carbon +++ b/toolchain/semantics/testdata/var/global_decl.carbon @@ -22,18 +22,16 @@ var x: i32; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ // CHECK:STDOUT: node+0, -// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/global_decl_with_init.carbon b/toolchain/semantics/testdata/var/global_decl_with_init.carbon index 99932570d46c..cca75c0df091 100644 --- a/toolchain/semantics/testdata/var/global_decl_with_init.carbon +++ b/toolchain/semantics/testdata/var/global_decl_with_init.carbon @@ -23,10 +23,9 @@ var x: i32 = 0; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+1}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -35,12 +34,11 @@ var x: i32 = 0; // CHECK:STDOUT: node+0, // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, -// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc7 // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/global_lookup.carbon b/toolchain/semantics/testdata/var/global_lookup.carbon index 786171ca5c8e..87196da70f28 100644 --- a/toolchain/semantics/testdata/var/global_lookup.carbon +++ b/toolchain/semantics/testdata/var/global_lookup.carbon @@ -25,13 +25,11 @@ var y: i32 = x; // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+1}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ @@ -42,15 +40,13 @@ var y: i32 = x; // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, -// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc7 -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, %x // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon b/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon index 038c287d678a..afb1eea5eeb8 100644 --- a/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon @@ -12,7 +12,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -30,14 +30,12 @@ fn Main() { // CHECK:STDOUT: type_blocks: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+1}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+0}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -48,18 +46,16 @@ fn Main() { // CHECK:STDOUT: node+1, // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, -// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ +// CHECK:STDOUT: node+4, // CHECK:STDOUT: node+5, // CHECK:STDOUT: node+6, -// CHECK:STDOUT: node+7, -// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: // CHECK:STDOUT: package { -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc7 // CHECK:STDOUT: %.loc9 = fn_decl @Main @@ -67,7 +63,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %y: i32 = var +// CHECK:STDOUT: %y: i32 = var "y" // CHECK:STDOUT: assign %y, package.%x // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/semantics/testdata/var/lookup.carbon b/toolchain/semantics/testdata/var/lookup.carbon index 986c27f12e05..5e8adeb78385 100644 --- a/toolchain/semantics/testdata/var/lookup.carbon +++ b/toolchain/semantics/testdata/var/lookup.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: cross_reference_irs_size: 1 // CHECK:STDOUT: functions: [ -// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}}, +// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -29,10 +29,9 @@ fn Main() { // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0}, -// CHECK:STDOUT: {kind: VarStorage, type: type0}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0}, +// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0}, // CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0}, -// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2}, // CHECK:STDOUT: {kind: Return}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ @@ -46,7 +45,6 @@ fn Main() { // CHECK:STDOUT: node+2, // CHECK:STDOUT: node+3, // CHECK:STDOUT: node+4, -// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] // CHECK:STDOUT: @@ -56,7 +54,7 @@ fn Main() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %x: i32 = var +// CHECK:STDOUT: %x: i32 = var "x" // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: assign %x, %.loc8 // CHECK:STDOUT: return