From 4ca2e81877b1e41aef590df3f6e747ec1a26d366 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Wed, 22 Mar 2023 10:24:03 -0700 Subject: [PATCH] Modify SemanticsIR printing to produce stable output on builtin changes. (#2702) These changes should make output more stable when builtins are added to semantics. By omitting them from nodes and printing nodes as "relative to the last builtin", I should be able to add and remove builtins without automatically affecting every test. Also by printing builtin nodes as `nodeNameOfBuiltin`, it's a little easier to understand what's going on (for me, at least). --- toolchain/driver/driver.cpp | 11 ++- .../testdata/basics/fail_in_semantics.carbon | 2 +- toolchain/semantics/semantics_ir.cpp | 13 ++- toolchain/semantics/semantics_ir.h | 11 ++- toolchain/semantics/semantics_ir_test.cpp | 34 ++++--- toolchain/semantics/semantics_node.h | 10 +- .../testdata/basics/builtin_nodes.carbon | 31 ++++++ .../testdata/basics/builtin_types.carbon | 55 +++++------ .../semantics/testdata/basics/empty.carbon | 7 -- .../testdata/basics/empty_decl.carbon | 7 -- .../testdata/basics/fail_name_lookup.carbon | 13 +-- .../function/call/fail_param_count.carbon | 97 +++++++++---------- .../function/call/fail_param_type.carbon | 37 +++---- .../function/call/more_param_ir.carbon | 95 +++++++++--------- .../testdata/function/call/params_one.carbon | 39 +++----- .../function/call/params_one_comma.carbon | 49 ++++------ .../testdata/function/call/params_two.carbon | 55 +++++------ .../function/call/params_two_comma.carbon | 71 ++++++-------- .../testdata/function/call/params_zero.carbon | 23 ++--- .../fail_param_name_conflict.carbon | 33 +++---- .../testdata/function/definition/order.carbon | 25 ++--- .../function/definition/params_one.carbon | 23 ++--- .../definition/params_one_comma.carbon | 23 ++--- .../function/definition/params_two.carbon | 33 +++---- .../definition/params_two_comma.carbon | 33 +++---- .../function/definition/params_zero.carbon | 13 +-- .../definition/same_param_name.carbon | 39 +++----- .../testdata/operators/binary_op.carbon | 31 +++--- .../operators/fail_type_mismatch.carbon | 33 +++---- .../operators/fail_type_mismatch_once.carbon | 41 ++++---- .../testdata/return/fail_type_mismatch.carbon | 25 ++--- .../return/fail_value_disallowed.carbon | 21 ++-- .../testdata/return/fail_value_missing.carbon | 19 ++-- .../semantics/testdata/return/no_value.carbon | 15 +-- .../semantics/testdata/return/value.carbon | 23 ++--- toolchain/semantics/testdata/var/decl.carbon | 21 ++-- .../testdata/var/decl_with_init.carbon | 29 +++--- .../testdata/var/fail_duplicate_decl.carbon | 45 ++++----- .../var/fail_init_type_mismatch.carbon | 31 +++--- .../testdata/var/fail_init_with_self.carbon | 25 ++--- .../var/fail_lookup_outside_scope.carbon | 33 +++---- .../semantics/testdata/var/global_decl.carbon | 15 +-- .../testdata/var/global_decl_with_init.carbon | 23 ++--- .../testdata/var/global_lookup.carbon | 35 +++---- .../var/global_lookup_in_scope.carbon | 41 ++++---- .../semantics/testdata/var/lookup.carbon | 29 +++--- 46 files changed, 604 insertions(+), 813 deletions(-) create mode 100644 toolchain/semantics/testdata/basics/builtin_nodes.carbon diff --git a/toolchain/driver/driver.cpp b/toolchain/driver/driver.cpp index 5e444491a3e7..3a6e59842973 100644 --- a/toolchain/driver/driver.cpp +++ b/toolchain/driver/driver.cpp @@ -139,13 +139,20 @@ auto Driver::RunDumpSubcommand(DiagnosticConsumer& consumer, } args = args.drop_front(); - auto parse_tree_preorder = false; + bool parse_tree_preorder = false; if (dump_mode == DumpMode::ParseTree && !args.empty() && args.front() == "--preorder") { args = args.drop_front(); parse_tree_preorder = true; } + bool semantics_ir_include_builtins = false; + if (dump_mode == DumpMode::SemanticsIR && !args.empty() && + args.front() == "--include_builtins") { + args = args.drop_front(); + semantics_ir_include_builtins = true; + } + if (args.empty()) { error_stream_ << "ERROR: No input file specified.\n"; return false; @@ -204,7 +211,7 @@ auto Driver::RunDumpSubcommand(DiagnosticConsumer& consumer, CARBON_VLOG() << "*** SemanticsIR::MakeFromParseTree done ***\n"; if (dump_mode == DumpMode::SemanticsIR) { consumer.Flush(); - output_stream_ << semantics_ir; + semantics_ir.Print(output_stream_, semantics_ir_include_builtins); return !has_errors; } CARBON_VLOG() << "semantics_ir: " << semantics_ir; diff --git a/toolchain/lowering/testdata/basics/fail_in_semantics.carbon b/toolchain/lowering/testdata/basics/fail_in_semantics.carbon index 09341a1deb86..7413efe4a1f1 100644 --- a/toolchain/lowering/testdata/basics/fail_in_semantics.carbon +++ b/toolchain/lowering/testdata/basics/fail_in_semantics.carbon @@ -6,5 +6,5 @@ // AUTOUPDATE // RUN: %{not} %{carbon-run-lowering} -// CHECK:STDERR: {{.*}}/toolchain/lowering/testdata/basics/fail_in_semantics.carbon:[[@LINE+1]]:17: Type mismatch: lhs is node2, rhs is node3 +// CHECK:STDERR: {{.*}}/toolchain/lowering/testdata/basics/fail_in_semantics.carbon:[[@LINE+1]]:17: Type mismatch: lhs is nodeIntegerType, rhs is nodeFloatingPointType var x: i32 = 1.0; diff --git a/toolchain/semantics/semantics_ir.cpp b/toolchain/semantics/semantics_ir.cpp index 55c83f3d8840..035542b92b36 100644 --- a/toolchain/semantics/semantics_ir.cpp +++ b/toolchain/semantics/semantics_ir.cpp @@ -71,7 +71,8 @@ static auto PrintList(llvm::raw_ostream& out, llvm::StringLiteral name, out << "]\n"; } -auto SemanticsIR::Print(llvm::raw_ostream& out) const -> void { +auto SemanticsIR::Print(llvm::raw_ostream& out, bool include_builtins) const + -> void { out << "cross_reference_irs_size: " << cross_reference_irs_.size() << "\n"; PrintList(out, "calls", calls_); @@ -79,7 +80,15 @@ auto SemanticsIR::Print(llvm::raw_ostream& out) const -> void { PrintList(out, "integer_literals", integer_literals_); PrintList(out, "real_literals", real_literals_); PrintList(out, "strings", strings_); - PrintList(out, "nodes", nodes_); + + out << "nodes: [\n"; + for (int i = include_builtins ? 0 : SemanticsBuiltinKind::ValidCount; + i < static_cast(nodes_.size()); ++i) { + const auto& element = nodes_[i]; + out.indent(Indent); + out << element << ",\n"; + } + out << "]\n"; out << "node_blocks: [\n"; for (const auto& node_block : node_blocks_) { diff --git a/toolchain/semantics/semantics_ir.h b/toolchain/semantics/semantics_ir.h index 764d97e098ff..3bf40dfd672d 100644 --- a/toolchain/semantics/semantics_ir.h +++ b/toolchain/semantics/semantics_ir.h @@ -74,8 +74,15 @@ class SemanticsIR { DiagnosticConsumer& consumer, llvm::raw_ostream* vlog_stream) -> SemanticsIR; - // Prints the full IR. - auto Print(llvm::raw_ostream& out) const -> void; + // Prints the full IR. Allow omitting builtins so that unrelated changes are + // less likely to alternate test golden files. + // TODO: In the future, the things to print may change, for example by adding + // preludes. We may then want the ability to omit other things similar to + // builtins. + auto Print(llvm::raw_ostream& out) const -> void { + Print(out, /*include_builtins=*/false); + } + auto Print(llvm::raw_ostream& out, bool include_builtins) const -> void; // Returns the requested callable. auto GetCallable(SemanticsCallableId callable_id) const -> SemanticsCallable { diff --git a/toolchain/semantics/semantics_ir_test.cpp b/toolchain/semantics/semantics_ir_test.cpp index 9fb8970a3dbf..ea9750527074 100644 --- a/toolchain/semantics/semantics_ir_test.cpp +++ b/toolchain/semantics/semantics_ir_test.cpp @@ -43,7 +43,8 @@ TEST(SemanticsIRTest, YAML) { // Matches the ID of a node. The numbers may change because of builtin // cross-references, so this code is only doing loose structural checks. - auto node_id = Yaml::Scalar(MatchesRegex("node\\d+")); + auto node_id = Yaml::Scalar(MatchesRegex(R"(node\+\d+)")); + auto node_builtin = Yaml::Scalar(MatchesRegex(R"(node\w+)")); EXPECT_THAT( Yaml::Value::FromText(print_output), @@ -54,21 +55,22 @@ TEST(SemanticsIRTest, YAML) { Pair("integer_literals", Yaml::Sequence(ElementsAre("0"))), Pair("real_literals", Yaml::Sequence(IsEmpty())), Pair("strings", Yaml::Sequence(ElementsAre("x"))), - Pair("nodes", - Yaml::Sequence(AllOf( - // 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", node_id)))), - // A 1-arg node. - Contains(Yaml::Mapping(ElementsAre( - Pair("kind", "IntegerLiteral"), Pair("arg0", "int0"), - Pair("type", node_id)))), - // A 2-arg node. - Contains(Yaml::Mapping(ElementsAre( - Pair("kind", "BindName"), Pair("arg0", "str0"), - Pair("arg1", node_id), Pair("type", node_id))))))), + Pair( + "nodes", + Yaml::Sequence(AllOf( + // 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", node_builtin)))), + // A 1-arg node. + Contains(Yaml::Mapping(ElementsAre( + Pair("kind", "IntegerLiteral"), Pair("arg0", "int0"), + Pair("type", node_builtin)))), + // A 2-arg node. + Contains(Yaml::Mapping(ElementsAre( + Pair("kind", "BindName"), Pair("arg0", "str0"), + Pair("arg1", node_id), Pair("type", node_builtin))))))), // This production has only one node block. Pair("node_blocks", Yaml::Sequence(ElementsAre(Yaml::Sequence(IsEmpty()), diff --git a/toolchain/semantics/semantics_node.h b/toolchain/semantics/semantics_node.h index 78bfc6ece5ef..0047c4cc8d28 100644 --- a/toolchain/semantics/semantics_node.h +++ b/toolchain/semantics/semantics_node.h @@ -28,7 +28,15 @@ struct SemanticsNodeId : public IndexBase { using IndexBase::IndexBase; auto Print(llvm::raw_ostream& out) const -> void { out << "node"; - IndexBase::Print(out); + if (!is_valid()) { + IndexBase::Print(out); + } else if (index < SemanticsBuiltinKind::ValidCount) { + out << SemanticsBuiltinKind::FromInt(index); + } else { + // Use the `+` as a small reminder that this is a delta, rather than an + // absolute index. + out << "+" << index - SemanticsBuiltinKind::ValidCount; + } } }; diff --git a/toolchain/semantics/testdata/basics/builtin_nodes.carbon b/toolchain/semantics/testdata/basics/builtin_nodes.carbon new file mode 100644 index 000000000000..2ba79471f120 --- /dev/null +++ b/toolchain/semantics/testdata/basics/builtin_nodes.carbon @@ -0,0 +1,31 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// NOAUTOUPDATE +// RUN: %{carbon} dump semantics-ir --include_builtins %s | \ +// RUN: %{FileCheck-strict} +// CHECK:STDOUT: cross_reference_irs_size: 1 +// CHECK:STDOUT: calls: [ +// CHECK:STDOUT: ] +// CHECK:STDOUT: callables: [ +// CHECK:STDOUT: ] +// CHECK:STDOUT: integer_literals: [ +// CHECK:STDOUT: ] +// CHECK:STDOUT: real_literals: [ +// CHECK:STDOUT: ] +// CHECK:STDOUT: strings: [ +// CHECK:STDOUT: ] +// CHECK:STDOUT: nodes: [ +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeTypeType, type: nodeTypeType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeInvalidType, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeIntegerType, type: nodeTypeType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeFloatingPointType, type: nodeTypeType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeStringType, type: nodeTypeType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeEmptyTupleType, type: nodeTypeType}, +// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: nodeEmptyTuple, type: nodeEmptyTupleType}, +// CHECK:STDOUT: ] +// CHECK:STDOUT: node_blocks: [ +// CHECK:STDOUT: [ +// CHECK:STDOUT: ], +// CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/basics/builtin_types.carbon b/toolchain/semantics/testdata/basics/builtin_types.carbon index 042c9d863565..c776fe797dc5 100644 --- a/toolchain/semantics/testdata/basics/builtin_types.carbon +++ b/toolchain/semantics/testdata/basics/builtin_types.carbon @@ -22,42 +22,35 @@ // CHECK:STDOUT: Test, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node7, arg1: node9, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node3}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node11, type: node3}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: Assign, arg0: node11, arg1: node13, type: node3}, -// CHECK:STDOUT: {kind: VarStorage, type: node4}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node15, type: node4}, -// CHECK:STDOUT: {kind: StringLiteral, arg0: str3, type: node4}, -// CHECK:STDOUT: {kind: Assign, arg0: node15, arg1: node17, type: node4}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+6, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeStringType}, +// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+8, type: nodeStringType}, +// CHECK:STDOUT: {kind: StringLiteral, arg0: str3, type: nodeStringType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+8, arg1: node+10, type: nodeStringType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, -// CHECK:STDOUT: node16, -// CHECK:STDOUT: node17, -// CHECK:STDOUT: node18, +// CHECK:STDOUT: node+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: node+10, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/basics/empty.carbon b/toolchain/semantics/testdata/basics/empty.carbon index 2e733e6a8d79..f4f3d951dbdf 100644 --- a/toolchain/semantics/testdata/basics/empty.carbon +++ b/toolchain/semantics/testdata/basics/empty.carbon @@ -16,13 +16,6 @@ // CHECK:STDOUT: strings: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ diff --git a/toolchain/semantics/testdata/basics/empty_decl.carbon b/toolchain/semantics/testdata/basics/empty_decl.carbon index aa7226d175bc..6083b169b8d2 100644 --- a/toolchain/semantics/testdata/basics/empty_decl.carbon +++ b/toolchain/semantics/testdata/basics/empty_decl.carbon @@ -16,13 +16,6 @@ // CHECK:STDOUT: strings: [ // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ diff --git a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon index 2bd74150409f..eb274e706fa0 100644 --- a/toolchain/semantics/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/semantics/testdata/basics/fail_name_lookup.carbon @@ -18,22 +18,15 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // 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 bc571f33a600..8e9ad2a55d0d 100644 --- a/toolchain/semantics/testdata/function/call/fail_param_count.carbon +++ b/toolchain/semantics/testdata/function/call/fail_param_count.carbon @@ -32,91 +32,84 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node13, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node15, type: node2}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+6, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+8, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str4, arg1: callable2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node17, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+10, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str5, arg1: callable3}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node19, arg1: block0}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+12, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node17, -// CHECK:STDOUT: node18, -// CHECK:STDOUT: node19, -// CHECK:STDOUT: node26, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+11, +// CHECK:STDOUT: node+12, +// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, -// CHECK:STDOUT: node16, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node16, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node20, +// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node20, +// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node21, -// CHECK:STDOUT: node22, +// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node21, -// CHECK:STDOUT: node22, +// CHECK:STDOUT: node+14, +// CHECK:STDOUT: node+15, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node23, -// CHECK:STDOUT: node24, +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node23, -// CHECK:STDOUT: node24, +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node25, +// CHECK:STDOUT: node+18, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node25, +// CHECK:STDOUT: node+18, // 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 62d51b88e6fc..24584b3d7de9 100644 --- a/toolchain/semantics/testdata/function/call/fail_param_type.carbon +++ b/toolchain/semantics/testdata/function/call/fail_param_type.carbon @@ -22,42 +22,35 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node13, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+6, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] @@ -65,6 +58,6 @@ fn Run(a: i32) {} fn Main() { // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/function/call/fail_param_type.carbon:[[@LINE+2]]:6: No matching callable was found. - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/function/call/fail_param_type.carbon:[[@LINE-4]]:1: Type mismatch: cannot convert argument 0 from node3 to node2. + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/function/call/fail_param_type.carbon:[[@LINE-4]]:1: Type mismatch: cannot convert argument 0 from nodeFloatingPointType to nodeIntegerType. Run(1.0); } diff --git a/toolchain/semantics/testdata/function/call/more_param_ir.carbon b/toolchain/semantics/testdata/function/call/more_param_ir.carbon index 1fb3da24f1f0..08cb2b1209b8 100644 --- a/toolchain/semantics/testdata/function/call/more_param_ir.carbon +++ b/toolchain/semantics/testdata/function/call/more_param_ir.carbon @@ -30,74 +30,67 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node11, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node13, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str4, arg1: callable1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node16, arg1: node17, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: node2}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node18, arg1: node19, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: node2}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node21, arg1: node22, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node15, arg1: block6}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+9, arg1: node+10, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+11, arg1: node+12, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+14, arg1: node+15, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+8, arg1: block6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, -// CHECK:STDOUT: node26, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, +// CHECK:STDOUT: node+19, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node16, -// CHECK:STDOUT: node17, -// CHECK:STDOUT: node18, -// CHECK:STDOUT: node19, -// CHECK:STDOUT: node20, -// CHECK:STDOUT: node21, -// CHECK:STDOUT: node22, -// CHECK:STDOUT: node23, -// CHECK:STDOUT: node24, +// 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: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node20, -// CHECK:STDOUT: node23, -// CHECK:STDOUT: node24, +// CHECK:STDOUT: node+13, +// CHECK:STDOUT: node+16, +// CHECK:STDOUT: node+17, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node25, +// CHECK:STDOUT: node+18, // 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 0eac29c1ad83..eebc96cfe3d9 100644 --- a/toolchain/semantics/testdata/function/call/params_one.carbon +++ b/toolchain/semantics/testdata/function/call/params_one.carbon @@ -23,46 +23,39 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block6}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node13, +// CHECK:STDOUT: node+6, // 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 9bd27db8ed10..89a0c3aaa07c 100644 --- a/toolchain/semantics/testdata/function/call/params_one_comma.carbon +++ b/toolchain/semantics/testdata/function/call/params_one_comma.carbon @@ -25,55 +25,48 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call1, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block6}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call1, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node16, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+7, // 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 e0f0e33b6beb..f9f004dd56a8 100644 --- a/toolchain/semantics/testdata/function/call/params_two.carbon +++ b/toolchain/semantics/testdata/function/call/params_two.carbon @@ -25,54 +25,47 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node13, arg1: block6}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node17, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+10, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node16, +// CHECK:STDOUT: node+9, // 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 c8459cbfdbd0..85ef89fb6df8 100644 --- a/toolchain/semantics/testdata/function/call/params_two_comma.carbon +++ b/toolchain/semantics/testdata/function/call/params_two_comma.carbon @@ -28,66 +28,59 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: node2}, -// CHECK:STDOUT: {kind: Call, arg0: call1, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node13, arg1: block6}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Call, arg0: call1, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block6}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node20, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+13, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+7, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node16, -// CHECK:STDOUT: node19, +// CHECK:STDOUT: node+9, +// CHECK:STDOUT: node+12, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node17, -// CHECK:STDOUT: node18, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+11, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node17, -// CHECK:STDOUT: node18, +// CHECK:STDOUT: node+10, +// CHECK:STDOUT: node+11, // 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 3d7fc10ad97d..b03af4333ada 100644 --- a/toolchain/semantics/testdata/function/call/params_zero.carbon +++ b/toolchain/semantics/testdata/function/call/params_zero.carbon @@ -21,30 +21,23 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable1}, -// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: node6}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block2}, +// CHECK:STDOUT: {kind: Call, arg0: call0, arg1: callable0, type: nodeEmptyTuple}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // 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 ce084b913299..0d2c4572e50b 100644 --- a/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon @@ -19,36 +19,29 @@ // CHECK:STDOUT: Bar, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/order.carbon b/toolchain/semantics/testdata/function/definition/order.carbon index 15a25cddb9f3..40e84ef35b6b 100644 --- a/toolchain/semantics/testdata/function/definition/order.carbon +++ b/toolchain/semantics/testdata/function/definition/order.carbon @@ -22,30 +22,23 @@ // CHECK:STDOUT: Baz, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_one.carbon b/toolchain/semantics/testdata/function/definition/params_one.carbon index ba16a42056cc..85fa950d6dd4 100644 --- a/toolchain/semantics/testdata/function/definition/params_one.carbon +++ b/toolchain/semantics/testdata/function/definition/params_one.carbon @@ -19,31 +19,24 @@ // CHECK:STDOUT: Foo, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_one_comma.carbon b/toolchain/semantics/testdata/function/definition/params_one_comma.carbon index c24653ca5f40..69cb8d98c819 100644 --- a/toolchain/semantics/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/semantics/testdata/function/definition/params_one_comma.carbon @@ -19,31 +19,24 @@ // CHECK:STDOUT: Foo, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_two.carbon b/toolchain/semantics/testdata/function/definition/params_two.carbon index bec066959655..3ba5754c7803 100644 --- a/toolchain/semantics/testdata/function/definition/params_two.carbon +++ b/toolchain/semantics/testdata/function/definition/params_two.carbon @@ -20,36 +20,29 @@ // CHECK:STDOUT: Foo, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_two_comma.carbon b/toolchain/semantics/testdata/function/definition/params_two_comma.carbon index f3bd53c4ea95..3d955513f377 100644 --- a/toolchain/semantics/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/semantics/testdata/function/definition/params_two_comma.carbon @@ -20,36 +20,29 @@ // CHECK:STDOUT: Foo, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/function/definition/params_zero.carbon b/toolchain/semantics/testdata/function/definition/params_zero.carbon index 5f9dd9c0c18b..5e410d7ec49b 100644 --- a/toolchain/semantics/testdata/function/definition/params_zero.carbon +++ b/toolchain/semantics/testdata/function/definition/params_zero.carbon @@ -18,22 +18,15 @@ // CHECK:STDOUT: Foo, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // 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 b4d1f54209ca..5fa87ce323a0 100644 --- a/toolchain/semantics/testdata/function/definition/same_param_name.carbon +++ b/toolchain/semantics/testdata/function/definition/same_param_name.carbon @@ -21,44 +21,37 @@ // CHECK:STDOUT: Bar, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node9, arg1: block0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node11, type: node2}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node13, arg1: block0}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block0}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/operators/binary_op.carbon b/toolchain/semantics/testdata/operators/binary_op.carbon index 14a8f7c6c07a..47d33e6c229a 100644 --- a/toolchain/semantics/testdata/operators/binary_op.carbon +++ b/toolchain/semantics/testdata/operators/binary_op.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, @@ -20,32 +20,25 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node8, arg1: node9, type: node2}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node10, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+1, arg1: node+2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon index 846c5ba82ba5..68fc5940e27c 100644 --- a/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, @@ -20,36 +20,29 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node8, arg1: node9, type: node1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node10, type: node1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+1, arg1: node+2, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] fn Main() -> i32 { - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon:[[@LINE+1]]:13: Type mismatch: lhs is node2, rhs is node3 + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/operators/fail_type_mismatch.carbon:[[@LINE+1]]:13: Type mismatch: lhs is nodeIntegerType, rhs is nodeFloatingPointType return 12 + 3.4; } diff --git a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon index 1501fd73cda9..8e991d309acc 100644 --- a/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon +++ b/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 12, @@ -21,42 +21,35 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node8, arg1: node9, type: node1}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node10, arg1: node11, type: node1}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node12, type: node1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+1, arg1: node+2, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+3, arg1: node+4, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+5, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, +// 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: ], // CHECK:STDOUT: ] fn Main() -> i32 { // The following line has two mismatches, but after the first, it shouldn't // keep erroring. - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon:[[@LINE+1]]:13: Type mismatch: lhs is node2, rhs is node3 + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/operators/fail_type_mismatch_once.carbon:[[@LINE+1]]:13: Type mismatch: lhs is nodeIntegerType, rhs is nodeFloatingPointType return 12 + 3.4 + 12; } diff --git a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon index 2a6ad8900e19..6d8b81a9606c 100644 --- a/toolchain/semantics/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/semantics/testdata/return/fail_type_mismatch.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -19,32 +19,25 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node8}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] fn Main() -> i32 { - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/return/fail_type_mismatch.carbon:[[@LINE+1]]:13: Cannot convert node3 to node2. + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/return/fail_type_mismatch.carbon:[[@LINE+1]]:13: Cannot convert nodeFloatingPointType to nodeIntegerType. return 1.0; } diff --git a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon index 4a47f4845ffd..0d2730826545 100644 --- a/toolchain/semantics/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/semantics/testdata/return/fail_value_disallowed.carbon @@ -19,28 +19,21 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node8, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/fail_value_missing.carbon b/toolchain/semantics/testdata/return/fail_value_missing.carbon index d63d0d108fc1..5456a7400450 100644 --- a/toolchain/semantics/testdata/return/fail_value_missing.carbon +++ b/toolchain/semantics/testdata/return/fail_value_missing.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: ] @@ -18,30 +18,23 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: ] fn Main() -> i32 { - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/return/fail_value_missing.carbon:[[@LINE+1]]:9: Must return a node2. + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/return/fail_value_missing.carbon:[[@LINE+1]]:9: Must return a nodeIntegerType. return; } diff --git a/toolchain/semantics/testdata/return/no_value.carbon b/toolchain/semantics/testdata/return/no_value.carbon index ebf6d2823d68..e3ec3b16f8e8 100644 --- a/toolchain/semantics/testdata/return/no_value.carbon +++ b/toolchain/semantics/testdata/return/no_value.carbon @@ -18,26 +18,19 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, // CHECK:STDOUT: {kind: Return}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/return/value.carbon b/toolchain/semantics/testdata/return/value.carbon index 9eb046fcb81e..848e6534c9be 100644 --- a/toolchain/semantics/testdata/return/value.carbon +++ b/toolchain/semantics/testdata/return/value.carbon @@ -8,7 +8,7 @@ // CHECK:STDOUT: calls: [ // CHECK:STDOUT: ] // CHECK:STDOUT: callables: [ -// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: node2}, +// CHECK:STDOUT: {param_ir: block0, param_refs: block0, return_type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: integer_literals: [ // CHECK:STDOUT: 0, @@ -19,28 +19,21 @@ // CHECK:STDOUT: Main, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: ReturnExpression, arg0: node8, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/decl.carbon b/toolchain/semantics/testdata/var/decl.carbon index 9a9ee691aef7..feecfabc78aa 100644 --- a/toolchain/semantics/testdata/var/decl.carbon +++ b/toolchain/semantics/testdata/var/decl.carbon @@ -19,28 +19,21 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/decl_with_init.carbon b/toolchain/semantics/testdata/var/decl_with_init.carbon index 17b0a4708fec..b76d7ca5c24a 100644 --- a/toolchain/semantics/testdata/var/decl_with_init.carbon +++ b/toolchain/semantics/testdata/var/decl_with_init.carbon @@ -20,32 +20,25 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node10, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon index 10e68ce0ca4d..3fb5bad9d75e 100644 --- a/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/semantics/testdata/var/fail_duplicate_decl.carbon @@ -21,40 +21,33 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node10, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node12, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node14, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+5, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+7, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node16, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+9, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, -// CHECK:STDOUT: node15, +// 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: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon index cb8cdbab9674..c4d1dbab5a55 100644 --- a/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon @@ -20,36 +20,29 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: node3}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node10, type: node1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ] fn Main() { - // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon:[[@LINE+1]]:19: Type mismatch: lhs is node2, rhs is node3 + // CHECK:STDERR: {{.*}}/toolchain/semantics/testdata/var/fail_init_type_mismatch.carbon:[[@LINE+1]]:19: Type mismatch: lhs is nodeIntegerType, rhs is nodeFloatingPointType var x: i32 = 1.0; } diff --git a/toolchain/semantics/testdata/var/fail_init_with_self.carbon b/toolchain/semantics/testdata/var/fail_init_with_self.carbon index e4a8994b89b7..0961dce53618 100644 --- a/toolchain/semantics/testdata/var/fail_init_with_self.carbon +++ b/toolchain/semantics/testdata/var/fail_init_with_self.carbon @@ -19,30 +19,23 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: nodeInvalidType, type: nodeInvalidType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // 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 102c184b8b3d..842728ff7000 100644 --- a/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/semantics/testdata/var/fail_lookup_outside_scope.carbon @@ -20,34 +20,27 @@ // CHECK:STDOUT: y, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node11, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node11, arg1: node1, type: node1}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: nodeInvalidType, type: nodeInvalidType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, +// 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: node8, -// CHECK:STDOUT: node9, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/global_decl.carbon b/toolchain/semantics/testdata/var/global_decl.carbon index 3bb3d0feb97e..a1fe3ea46a48 100644 --- a/toolchain/semantics/testdata/var/global_decl.carbon +++ b/toolchain/semantics/testdata/var/global_decl.carbon @@ -17,22 +17,15 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, // CHECK:STDOUT: ], // 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 83795d415c31..9c701da38275 100644 --- a/toolchain/semantics/testdata/var/global_decl_with_init.carbon +++ b/toolchain/semantics/testdata/var/global_decl_with_init.carbon @@ -18,26 +18,19 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node7, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/global_lookup.carbon b/toolchain/semantics/testdata/var/global_lookup.carbon index 92eb1917bba4..b1ba45fe5e9f 100644 --- a/toolchain/semantics/testdata/var/global_lookup.carbon +++ b/toolchain/semantics/testdata/var/global_lookup.carbon @@ -19,32 +19,25 @@ // CHECK:STDOUT: y, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node7, arg1: node9, type: node2}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node11, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node11, arg1: node7, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+4, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+4, arg1: node+0, type: nodeIntegerType}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, +// CHECK:STDOUT: node+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: ], // 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 7a0025f3bd6d..22074aa6f05a 100644 --- a/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/semantics/testdata/var/global_lookup_in_scope.carbon @@ -21,38 +21,31 @@ // CHECK:STDOUT: y, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node7, arg1: node9, type: node2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: node+2, type: nodeIntegerType}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node12, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node12, arg1: node7, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node11, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, -// CHECK:STDOUT: node15, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, +// CHECK:STDOUT: node+8, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node12, -// CHECK:STDOUT: node13, -// CHECK:STDOUT: node14, +// CHECK:STDOUT: node+5, +// CHECK:STDOUT: node+6, +// CHECK:STDOUT: node+7, // CHECK:STDOUT: ], // CHECK:STDOUT: ] diff --git a/toolchain/semantics/testdata/var/lookup.carbon b/toolchain/semantics/testdata/var/lookup.carbon index ad23a6145514..a5fa9e2ea1f7 100644 --- a/toolchain/semantics/testdata/var/lookup.carbon +++ b/toolchain/semantics/testdata/var/lookup.carbon @@ -20,32 +20,25 @@ // CHECK:STDOUT: x, // CHECK:STDOUT: ] // CHECK:STDOUT: nodes: [ -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node0, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node1, type: node1}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node2, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node3, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node4, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node5, type: node0}, -// CHECK:STDOUT: {kind: CrossReference, arg0: ir0, arg1: node6, type: node5}, // CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0}, -// CHECK:STDOUT: {kind: VarStorage, type: node2}, -// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node8, type: node2}, -// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: node2}, -// CHECK:STDOUT: {kind: Assign, arg0: node8, arg1: node10, type: node2}, -// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node7, arg1: block2}, +// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3, type: nodeIntegerType}, +// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2}, // CHECK:STDOUT: ] // CHECK:STDOUT: node_blocks: [ // CHECK:STDOUT: [ // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node7, -// CHECK:STDOUT: node12, +// CHECK:STDOUT: node+0, +// CHECK:STDOUT: node+5, // CHECK:STDOUT: ], // CHECK:STDOUT: [ -// CHECK:STDOUT: node8, -// CHECK:STDOUT: node9, -// CHECK:STDOUT: node10, -// CHECK:STDOUT: node11, +// CHECK:STDOUT: node+1, +// CHECK:STDOUT: node+2, +// CHECK:STDOUT: node+3, +// CHECK:STDOUT: node+4, // CHECK:STDOUT: ], // CHECK:STDOUT: ]