From aa5bfa564f2a46d5ec2f26d2c7b3b350d7c341c4 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Thu, 30 Nov 2023 16:53:45 -0800 Subject: [PATCH] Add a distinct semir file separator. (#3438) This removes the filename from the file-scoped block, and places it above to make it clear where the full SemIR begins (with multifile, providing a barrier between). --- .../testdata/array/array_in_place.carbon | 5 +- .../testdata/array/assign_return_value.carbon | 5 +- .../check/testdata/array/assign_var.carbon | 5 +- toolchain/check/testdata/array/base.carbon | 5 +- .../testdata/array/fail_bound_overflow.carbon | 5 +- .../array/fail_incomplete_element.carbon | 5 +- .../testdata/array/fail_invalid_type.carbon | 5 +- .../testdata/array/fail_out_of_bound.carbon | 5 +- .../testdata/array/fail_type_mismatch.carbon | 5 +- .../array/fail_undefined_bound.carbon | 5 +- .../testdata/array/function_param.carbon | 5 +- .../check/testdata/array/nine_elements.carbon | 5 +- toolchain/check/testdata/as/as_type.carbon | 5 +- toolchain/check/testdata/as/basic.carbon | 5 +- .../testdata/as/fail_no_conversion.carbon | 5 +- .../check/testdata/as/fail_not_type.carbon | 5 +- toolchain/check/testdata/as/identity.carbon | 5 +- toolchain/check/testdata/as/tuple.carbon | 5 +- .../testdata/basics/builtin_types.carbon | 5 +- toolchain/check/testdata/basics/empty.carbon | 5 +- .../check/testdata/basics/empty_decl.carbon | 5 +- .../check/testdata/basics/fail_bad_run.carbon | 5 +- .../testdata/basics/fail_bad_run_2.carbon | 5 +- .../testdata/basics/fail_name_lookup.carbon | 5 +- .../basics/fail_non_type_as_type.carbon | 5 +- .../basics/fail_qualifier_unsupported.carbon | 5 +- .../check/testdata/basics/multifile.carbon | 10 +++- .../multifile_raw_and_textual_ir.carbon | 10 +++- .../testdata/basics/numeric_literals.carbon | 5 +- toolchain/check/testdata/basics/parens.carbon | 5 +- .../testdata/basics/raw_and_textual_ir.carbon | 5 +- .../testdata/basics/raw_identifier.carbon | 5 +- toolchain/check/testdata/basics/run.carbon | 5 +- .../check/testdata/basics/run_i32.carbon | 5 +- .../check/testdata/basics/textual_ir.carbon | 5 +- toolchain/check/testdata/class/basic.carbon | 5 +- .../check/testdata/class/fail_abstract.carbon | 5 +- .../testdata/class/fail_addr_not_self.carbon | 5 +- .../testdata/class/fail_addr_self.carbon | 5 +- .../testdata/class/fail_incomplete.carbon | 5 +- .../check/testdata/class/fail_init.carbon | 5 +- .../class/fail_init_as_inplace.carbon | 5 +- .../class/fail_memaccess_category.carbon | 5 +- .../testdata/class/fail_member_of_let.carbon | 5 +- .../check/testdata/class/fail_method.carbon | 5 +- .../fail_redeclaration_introducer.carbon | 5 +- .../class/fail_redeclaration_scope.carbon | 5 +- .../testdata/class/fail_redefinition.carbon | 5 +- .../check/testdata/class/fail_reorder.carbon | 5 +- .../check/testdata/class/fail_scope.carbon | 5 +- .../check/testdata/class/fail_self.carbon | 5 +- .../testdata/class/fail_unbound_field.carbon | 5 +- .../testdata/class/fail_unknown_member.carbon | 5 +- .../check/testdata/class/field_access.carbon | 5 +- .../class/field_access_in_value.carbon | 5 +- .../testdata/class/forward_declared.carbon | 5 +- toolchain/check/testdata/class/init.carbon | 5 +- toolchain/check/testdata/class/init_as.carbon | 5 +- .../check/testdata/class/init_nested.carbon | 5 +- toolchain/check/testdata/class/method.carbon | 5 +- toolchain/check/testdata/class/nested.carbon | 5 +- .../check/testdata/class/nested_name.carbon | 5 +- .../check/testdata/class/raw_self.carbon | 5 +- .../check/testdata/class/raw_self_type.carbon | 5 +- .../check/testdata/class/redeclaration.carbon | 5 +- .../class/redeclaration_introducer.carbon | 5 +- .../check/testdata/class/reenter_scope.carbon | 5 +- toolchain/check/testdata/class/scope.carbon | 5 +- toolchain/check/testdata/class/self.carbon | 5 +- .../check/testdata/class/self_type.carbon | 5 +- .../check/testdata/class/static_method.carbon | 5 +- .../check/testdata/const/collapse.carbon | 5 +- .../check/testdata/const/fail_collapse.carbon | 5 +- .../expr_category/in_place_tuple_init.carbon | 5 +- .../function/call/empty_struct.carbon | 5 +- .../testdata/function/call/empty_tuple.carbon | 5 +- .../function/call/fail_not_callable.carbon | 5 +- .../function/call/fail_param_count.carbon | 5 +- .../function/call/fail_param_type.carbon | 5 +- .../call/fail_return_type_mismatch.carbon | 5 +- .../check/testdata/function/call/i32.carbon | 5 +- .../function/call/more_param_ir.carbon | 5 +- .../testdata/function/call/params_one.carbon | 5 +- .../function/call/params_one_comma.carbon | 5 +- .../testdata/function/call/params_two.carbon | 5 +- .../function/call/params_two_comma.carbon | 5 +- .../testdata/function/call/params_zero.carbon | 5 +- .../function/call/return_implicit.carbon | 5 +- .../function/declaration/simple.carbon | 5 +- .../fail_param_name_conflict.carbon | 5 +- .../testdata/function/definition/order.carbon | 5 +- .../function/definition/params_one.carbon | 5 +- .../definition/params_one_comma.carbon | 5 +- .../function/definition/params_two.carbon | 5 +- .../definition/params_two_comma.carbon | 5 +- .../function/definition/params_zero.carbon | 5 +- .../definition/same_param_name.carbon | 5 +- toolchain/check/testdata/if/else.carbon | 5 +- .../if/fail_reachable_fallthrough.carbon | 5 +- toolchain/check/testdata/if/fail_scope.carbon | 5 +- toolchain/check/testdata/if/no_else.carbon | 5 +- .../if/unreachable_fallthrough.carbon | 5 +- toolchain/check/testdata/if_expr/basic.carbon | 5 +- .../if_expr/constant_condition.carbon | 5 +- .../testdata/if_expr/control_flow.carbon | 5 +- .../if_expr/fail_not_in_function.carbon | 5 +- .../check/testdata/if_expr/nested.carbon | 5 +- .../check/testdata/if_expr/struct.carbon | 5 +- .../index/array_element_access.carbon | 5 +- .../check/testdata/index/expr_category.carbon | 5 +- .../index/fail_array_large_index.carbon | 5 +- .../index/fail_array_non_int_indexing.carbon | 5 +- .../fail_array_out_of_bound_access.carbon | 5 +- .../index/fail_empty_tuple_access.carbon | 5 +- .../testdata/index/fail_expr_category.carbon | 5 +- .../testdata/index/fail_invalid_base.carbon | 5 +- .../testdata/index/fail_name_not_found.carbon | 5 +- .../index/fail_negative_indexing.carbon | 5 +- .../index/fail_non_deterministic_type.carbon | 5 +- .../index/fail_non_tuple_access.carbon | 5 +- .../index/fail_tuple_index_error.carbon | 5 +- .../index/fail_tuple_large_index.carbon | 5 +- .../index/fail_tuple_non_int_indexing.carbon | 5 +- .../fail_tuple_out_of_bound_access.carbon | 5 +- .../index/tuple_element_access.carbon | 5 +- .../index/tuple_return_value_access.carbon | 5 +- .../ir/duplicate_name_same_line.carbon | 5 +- toolchain/check/testdata/let/convert.carbon | 5 +- .../testdata/let/fail_duplicate_decl.carbon | 5 +- .../testdata/let/fail_use_in_init.carbon | 5 +- toolchain/check/testdata/let/global.carbon | 5 +- toolchain/check/testdata/let/local.carbon | 5 +- .../testdata/namespace/fail_duplicate.carbon | 5 +- .../namespace/fail_unresolved_scope.carbon | 5 +- .../check/testdata/namespace/function.carbon | 5 +- .../check/testdata/namespace/nested.carbon | 5 +- .../check/testdata/namespace/shadow.carbon | 5 +- .../namespace/unqualified_lookup.carbon | 5 +- toolchain/check/testdata/operators/and.carbon | 5 +- .../testdata/operators/assignment.carbon | 5 +- .../check/testdata/operators/binary_op.carbon | 5 +- .../operators/fail_assignment_to_error.carbon | 5 +- .../fail_assignment_to_non_assignable.carbon | 5 +- .../operators/fail_type_mismatch.carbon | 5 +- .../fail_type_mismatch_assignment.carbon | 5 +- .../operators/fail_type_mismatch_once.carbon | 5 +- toolchain/check/testdata/operators/or.carbon | 5 +- .../check/testdata/operators/unary_op.carbon | 5 +- .../testdata/packages/explicit_imports.carbon | 30 ++++++++--- .../packages/fail_api_not_found.carbon | 15 ++++-- .../check/testdata/packages/fail_cycle.carbon | 25 ++++++++-- .../packages/fail_duplicate_api.carbon | 40 ++++++++++++--- .../testdata/packages/fail_extension.carbon | 50 +++++++++++++++---- .../packages/fail_import_default.carbon | 20 ++++++-- .../packages/fail_import_invalid.carbon | 45 +++++++++++++---- .../packages/fail_import_repeat.carbon | 25 ++++++++-- .../packages/fail_package_main.carbon | 20 ++++++-- .../testdata/packages/implicit_imports.carbon | 50 +++++++++++++++---- .../testdata/pointer/address_of_deref.carbon | 5 +- .../testdata/pointer/address_of_lvalue.carbon | 5 +- toolchain/check/testdata/pointer/basic.carbon | 5 +- .../pointer/fail_address_of_error.carbon | 5 +- .../pointer/fail_address_of_value.carbon | 5 +- .../testdata/pointer/fail_deref_error.carbon | 5 +- .../pointer/fail_deref_function.carbon | 5 +- .../pointer/fail_deref_namespace.carbon | 5 +- .../pointer/fail_deref_not_pointer.carbon | 5 +- .../testdata/pointer/fail_deref_type.carbon | 5 +- .../pointer/fail_type_mismatch.carbon | 5 +- .../testdata/pointer/nested_const.carbon | 5 +- toolchain/check/testdata/pointer/types.carbon | 5 +- .../testdata/return/code_after_return.carbon | 5 +- .../return/code_after_return_value.carbon | 5 +- .../testdata/return/fail_call_in_type.carbon | 5 +- .../testdata/return/fail_error_in_type.carbon | 5 +- .../testdata/return/fail_let_in_type.carbon | 5 +- .../return/fail_missing_return.carbon | 5 +- .../fail_missing_return_empty_tuple.carbon | 5 +- .../fail_return_var_no_returned_var.carbon | 5 +- .../fail_return_with_returned_var.carbon | 5 +- .../fail_returned_var_no_return_type.carbon | 5 +- .../return/fail_returned_var_shadow.carbon | 5 +- .../return/fail_returned_var_type.carbon | 5 +- .../testdata/return/fail_type_mismatch.carbon | 5 +- .../return/fail_value_disallowed.carbon | 5 +- .../testdata/return/fail_value_missing.carbon | 5 +- .../testdata/return/fail_var_in_type.carbon | 5 +- .../missing_return_no_return_type.carbon | 5 +- .../check/testdata/return/no_value.carbon | 5 +- .../check/testdata/return/returned_var.carbon | 5 +- .../testdata/return/returned_var_scope.carbon | 5 +- toolchain/check/testdata/return/struct.carbon | 5 +- toolchain/check/testdata/return/tuple.carbon | 5 +- toolchain/check/testdata/return/value.carbon | 5 +- toolchain/check/testdata/struct/empty.carbon | 5 +- .../struct/fail_access_into_invalid.carbon | 5 +- .../testdata/struct/fail_assign_empty.carbon | 5 +- .../testdata/struct/fail_assign_nested.carbon | 5 +- .../struct/fail_assign_to_empty.carbon | 5 +- .../struct/fail_duplicate_name.carbon | 5 +- .../struct/fail_field_name_mismatch.carbon | 5 +- .../struct/fail_field_type_mismatch.carbon | 5 +- .../struct/fail_member_access_type.carbon | 5 +- .../struct/fail_member_of_function.carbon | 5 +- .../struct/fail_nested_incomplete.carbon | 5 +- .../struct/fail_non_member_access.carbon | 5 +- .../struct/fail_too_few_values.carbon | 5 +- .../testdata/struct/fail_type_assign.carbon | 5 +- .../testdata/struct/fail_value_as_type.carbon | 5 +- .../struct/literal_member_access.carbon | 5 +- .../testdata/struct/member_access.carbon | 5 +- .../struct/nested_struct_in_place.carbon | 5 +- .../check/testdata/struct/one_entry.carbon | 5 +- .../testdata/struct/reorder_fields.carbon | 5 +- .../testdata/struct/tuple_as_element.carbon | 5 +- .../check/testdata/struct/two_entries.carbon | 5 +- toolchain/check/testdata/tuples/empty.carbon | 5 +- .../testdata/tuples/fail_assign_empty.carbon | 5 +- .../testdata/tuples/fail_assign_nested.carbon | 5 +- .../tuples/fail_assign_to_empty.carbon | 5 +- .../tuples/fail_element_type_mismatch.carbon | 5 +- .../tuples/fail_nested_incomplete.carbon | 5 +- .../tuples/fail_too_few_element.carbon | 5 +- .../testdata/tuples/fail_type_assign.carbon | 5 +- .../testdata/tuples/fail_value_as_type.carbon | 5 +- .../check/testdata/tuples/nested_tuple.carbon | 5 +- .../tuples/nested_tuple_in_place.carbon | 5 +- .../check/testdata/tuples/one_element.carbon | 5 +- .../check/testdata/tuples/two_elements.carbon | 5 +- toolchain/check/testdata/var/decl.carbon | 5 +- .../check/testdata/var/decl_with_init.carbon | 5 +- .../testdata/var/fail_duplicate_decl.carbon | 5 +- .../var/fail_init_type_mismatch.carbon | 5 +- .../testdata/var/fail_init_with_self.carbon | 5 +- .../var/fail_lookup_outside_scope.carbon | 5 +- .../testdata/var/fail_not_copyable.carbon | 5 +- .../var/fail_storage_is_literal.carbon | 5 +- .../check/testdata/var/global_decl.carbon | 5 +- .../testdata/var/global_decl_with_init.carbon | 5 +- .../check/testdata/var/global_lookup.carbon | 5 +- .../var/global_lookup_in_scope.carbon | 5 +- toolchain/check/testdata/var/lookup.carbon | 5 +- toolchain/check/testdata/var/shadowing.carbon | 5 +- .../testdata/while/break_continue.carbon | 5 +- .../testdata/while/fail_bad_condition.carbon | 5 +- .../testdata/while/fail_break_continue.carbon | 5 +- .../testdata/while/unreachable_end.carbon | 5 +- toolchain/check/testdata/while/while.carbon | 5 +- toolchain/driver/testdata/stdin.carbon | 5 +- toolchain/sem_ir/formatter.cpp | 12 ++++- 250 files changed, 1231 insertions(+), 306 deletions(-) diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index 8b3c6a92b046..3e9d0c18bc21 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -10,6 +10,8 @@ fn G() { var v: [(i32, i32, i32); 2] = (F(), F()); } +// CHECK:STDOUT: --- array_in_place.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_25.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc7_25.2: type = tuple_type (i32, i32, i32) @@ -18,7 +20,7 @@ fn G() { // CHECK:STDOUT: %.loc10_42: type = tuple_type ((i32, i32, i32), (i32, i32, i32)) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "array_in_place.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } @@ -51,3 +53,4 @@ fn G() { // CHECK:STDOUT: assign %v.var, %.loc10_42.9 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index 9910839c48a9..c5d3a931e45e 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -10,13 +10,15 @@ fn Run() { var t: [i32; 1] = F(); } +// CHECK:STDOUT: --- assign_return_value.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_16.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_16.2: type = tuple_type (i32) // CHECK:STDOUT: %.loc10: type = ptr_type [i32; 1] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "assign_return_value.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } @@ -50,3 +52,4 @@ fn Run() { // CHECK:STDOUT: assign %t.var, %.loc10_22.10 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index 5c3f1a74cebb..dce0ba0056e7 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -7,6 +7,8 @@ var a: (i32, i32, i32) = (1, 2, 3); var b: [i32; 3] = a; +// CHECK:STDOUT: --- assign_var.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_22.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc7_22.2: type = tuple_type (i32, i32, i32) @@ -14,7 +16,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: %.loc8: type = ptr_type [i32; 3] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "assign_var.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.loc7_22.2 // CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a @@ -56,3 +58,4 @@ var b: [i32; 3] = a; // CHECK:STDOUT: %.loc8_19.17: init [i32; 3] = converted %a.ref, %.loc8_19.16 // CHECK:STDOUT: assign %b.var, %.loc8_19.17 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/base.carbon b/toolchain/check/testdata/array/base.carbon index 9a3e8a628df5..f924641addc4 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -8,6 +8,8 @@ var a: [i32; 1] = (1,); var b: [f64; 2] = (11.1, 2.2,); var c: [(); 5] = ((), (), (), (), (),); +// CHECK:STDOUT: --- base.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 1] // CHECK:STDOUT: %.loc7_22: type = tuple_type (i32) @@ -18,7 +20,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: %.loc9_38: type = tuple_type ((), (), (), (), ()) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "base.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a @@ -83,3 +85,4 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: %.loc9_38.13: init [(); 5] = converted %.loc9_38.1, %.loc9_38.12 // CHECK:STDOUT: assign %c.var, %.loc9_38.13 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_bound_overflow.carbon b/toolchain/check/testdata/array/fail_bound_overflow.carbon index 3c5c28f80a53..b3f42e6d5cf8 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -9,9 +9,12 @@ // CHECK:STDERR: ^ var a: [1; 39999999999999999993]; -// CHECK:STDOUT: file "fail_bound_overflow.carbon" { +// CHECK:STDOUT: --- fail_bound_overflow.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12: i32 = int_literal 39999999999999999993 // CHECK:STDOUT: %a.var: ref = var a // CHECK:STDOUT: %a: ref = bind_name a, %a.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_incomplete_element.carbon b/toolchain/check/testdata/array/fail_incomplete_element.carbon index cc3bfc7b20bf..9bb41f23147d 100644 --- a/toolchain/check/testdata/array/fail_incomplete_element.carbon +++ b/toolchain/check/testdata/array/fail_incomplete_element.carbon @@ -19,11 +19,13 @@ var a: [Incomplete; 1]; // CHECK:STDERR: ^ var p: Incomplete* = &a[0]; +// CHECK:STDOUT: --- fail_incomplete_element.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc20: type = ptr_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_incomplete_element.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete @@ -42,3 +44,4 @@ var p: Incomplete* = &a[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Incomplete; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index 902683c6a986..68c6e86b804a 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -9,14 +9,17 @@ // CHECK:STDERR: ^ var a: [1; 1]; +// CHECK:STDOUT: --- fail_invalid_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = ptr_type [; 1] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_invalid_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, // CHECK:STDOUT: %a.var: ref [; 1] = var a // CHECK:STDOUT: %a: ref [; 1] = bind_name a, %a.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_out_of_bound.carbon b/toolchain/check/testdata/array/fail_out_of_bound.carbon index bf8a370a4197..e15ba364e228 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -9,12 +9,14 @@ // CHECK:STDERR: ^ var a: [i32; 1] = (1, 2, 3); +// CHECK:STDOUT: --- fail_out_of_bound.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_15: type = ptr_type [i32; 1] // CHECK:STDOUT: %.loc10_27: type = tuple_type (i32, i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_out_of_bound.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a @@ -25,3 +27,4 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: %.loc10_27: (i32, i32, i32) = tuple_literal (%.loc10_20, %.loc10_23, %.loc10_26) // CHECK:STDOUT: assign %a.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_type_mismatch.carbon b/toolchain/check/testdata/array/fail_type_mismatch.carbon index f6576ae50e91..5e9004d509e0 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -26,6 +26,8 @@ var t2: (i32, i32); // CHECK:STDERR: ^~ var d: [i32; 3] = t2; +// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_15: type = ptr_type [i32; 3] // CHECK:STDOUT: %.1: type = ptr_type String @@ -38,7 +40,7 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: %.loc21_24.2: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_type_mismatch.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 3 // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 3] = var a @@ -86,3 +88,4 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: %t2.ref: ref (i32, i32) = name_ref t2, %t2 // CHECK:STDOUT: assign %d.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/fail_undefined_bound.carbon b/toolchain/check/testdata/array/fail_undefined_bound.carbon index 9d0a011e66c6..92d118b1d627 100644 --- a/toolchain/check/testdata/array/fail_undefined_bound.carbon +++ b/toolchain/check/testdata/array/fail_undefined_bound.carbon @@ -9,5 +9,8 @@ // CHECK:STDERR: ^ var a: [i32; ]; -// CHECK:STDOUT: file "fail_undefined_bound.carbon" { +// CHECK:STDOUT: --- fail_undefined_bound.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index 60c03c324275..9afa2a37394e 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -12,12 +12,14 @@ fn G() -> i32 { return F((1, 2, 3), 1); } +// CHECK:STDOUT: --- function_param.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type [i32; 3] // CHECK:STDOUT: %.loc12: type = tuple_type (i32, i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "function_param.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } @@ -59,3 +61,4 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc12_25.2: i32 = converted %.loc12_11, %.loc12_25.1 // CHECK:STDOUT: return %.loc12_25.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/nine_elements.carbon b/toolchain/check/testdata/array/nine_elements.carbon index 1160e7bc8ef7..8d3ae174f1fe 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -6,12 +6,14 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); +// CHECK:STDOUT: --- nine_elements.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 9] // CHECK:STDOUT: %.loc7_45: type = tuple_type (i32, i32, i32, i32, i32, i32, i32, i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nine_elements.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 9 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 9] = var a @@ -57,3 +59,4 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: %.loc7_45.30: init [i32; 9] = converted %.loc7_45.1, %.loc7_45.29 // CHECK:STDOUT: assign %a.var, %.loc7_45.30 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/as_type.carbon b/toolchain/check/testdata/as/as_type.carbon index a1548a2d4a2a..d1cb7b26e979 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -6,13 +6,16 @@ let t: type = (i32, i32) as type; +// CHECK:STDOUT: --- as_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_24: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_26: type = tuple_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "as_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_24: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_26: type = converted %.loc7_24, constants.%.loc7_26 // CHECK:STDOUT: %t: type = bind_name t, %.loc7_26 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index 68f059416457..c87d1143a13c 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -8,7 +8,9 @@ fn Main() -> i32 { return 1 as i32; } -// CHECK:STDOUT: file "basic.carbon" { +// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -17,3 +19,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc8: i32 = int_literal 1 // CHECK:STDOUT: return %.loc8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index 60398d1c20a7..963affaada80 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -9,13 +9,15 @@ // CHECK:STDERR: ^~ let n: (i32, i32) = 1 as (i32, i32); +// CHECK:STDOUT: --- fail_no_conversion.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc10_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_no_conversion.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %.loc10_21: i32 = int_literal 1 @@ -23,3 +25,4 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: %.loc10_17.3: type = converted %.loc10_35, constants.%.loc10_17.2 // CHECK:STDOUT: %n: (i32, i32) = bind_name n, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/fail_not_type.carbon b/toolchain/check/testdata/as/fail_not_type.carbon index 151c7cf32649..06120069251e 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -9,8 +9,11 @@ // CHECK:STDERR: ^ let n: i32 = 1 as 2; -// CHECK:STDOUT: file "fail_not_type.carbon" { +// CHECK:STDOUT: --- fail_not_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_19: i32 = int_literal 2 // CHECK:STDOUT: %n: i32 = bind_name n, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/identity.carbon b/toolchain/check/testdata/as/identity.carbon index 772b633d02b8..a47a70da3523 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -24,13 +24,15 @@ fn Initializing() { var x: X = (Make() as X); } +// CHECK:STDOUT: --- identity.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11_1.1: type = struct_type {} // CHECK:STDOUT: %.loc11_1.2: type = tuple_type () // CHECK:STDOUT: %.loc9: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "identity.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %Value: = fn_decl @Value @@ -79,3 +81,4 @@ fn Initializing() { // CHECK:STDOUT: assign %x.var, %.loc24_19 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/tuple.carbon b/toolchain/check/testdata/as/tuple.carbon index 6f7f2749710d..f5edbe8da8ed 100644 --- a/toolchain/check/testdata/as/tuple.carbon +++ b/toolchain/check/testdata/as/tuple.carbon @@ -20,6 +20,8 @@ fn Var() { var b: (X, X) = (Make(), Make()) as (X, X); } +// CHECK:STDOUT: --- tuple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9_1.1: type = struct_type {} // CHECK:STDOUT: %.loc9_1.2: type = tuple_type () @@ -30,7 +32,7 @@ fn Var() { // CHECK:STDOUT: %.loc15_15.4: type = ptr_type ({}*, {}*) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "tuple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %Make: = fn_decl @Make @@ -96,3 +98,4 @@ fn Var() { // CHECK:STDOUT: assign %b.var, %.loc20_34.5 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index 325f489fad13..fd8d6ffe4874 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -9,11 +9,13 @@ var test_f64: f64 = 0.1; let test_str: String = "Test"; var test_type: type = i32; +// CHECK:STDOUT: --- builtin_types.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.1: type = ptr_type String // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "builtin_types.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %test_i32.var: ref i32 = var test_i32 // CHECK:STDOUT: %test_i32: ref i32 = bind_name test_i32, %test_i32.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 @@ -28,3 +30,4 @@ var test_type: type = i32; // CHECK:STDOUT: %test_type: ref type = bind_name test_type, %test_type.var // CHECK:STDOUT: assign %test_type.var, i32 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/empty.carbon b/toolchain/check/testdata/basics/empty.carbon index e4a5d8398fb9..a8b7c65a1129 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -4,5 +4,8 @@ // // AUTOUPDATE -// CHECK:STDOUT: file "empty.carbon" { +// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/empty_decl.carbon b/toolchain/check/testdata/basics/empty_decl.carbon index 5066f94ffe56..830ffc1a7cfe 100644 --- a/toolchain/check/testdata/basics/empty_decl.carbon +++ b/toolchain/check/testdata/basics/empty_decl.carbon @@ -6,5 +6,8 @@ ; -// CHECK:STDOUT: file "empty_decl.carbon" { +// CHECK:STDOUT: --- empty_decl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run.carbon b/toolchain/check/testdata/basics/fail_bad_run.carbon index 69df107357ec..9180b2dff32d 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -12,15 +12,18 @@ // CHECK:STDERR: ^ fn Run() -> String {} +// CHECK:STDOUT: --- fail_bad_run.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.1: type = ptr_type String // CHECK:STDOUT: %.loc13: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_bad_run.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() -> %return: String { // CHECK:STDOUT: !entry: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index d8f6bbbd4032..15b938822b0e 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -9,7 +9,9 @@ // CHECK:STDERR: ^~ fn Run(n: i32) {} -// CHECK:STDOUT: file "fail_bad_run_2.carbon" { +// CHECK:STDOUT: --- fail_bad_run_2.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: @@ -17,3 +19,4 @@ fn Run(n: i32) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index 727fdd5833ef..8ac252e1df85 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -11,7 +11,9 @@ fn Main() { x; } -// CHECK:STDOUT: file "fail_name_lookup.carbon" { +// CHECK:STDOUT: --- fail_name_lookup.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn Main() { // CHECK:STDOUT: %x.ref: = name_ref x, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon index ff054e96a5df..d86a429b9fc9 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -9,9 +9,12 @@ // CHECK:STDERR: ^ var x: type = 42; -// CHECK:STDOUT: file "fail_non_type_as_type.carbon" { +// CHECK:STDOUT: --- fail_non_type_as_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: %.loc10: i32 = int_literal 42 // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon index 2fd57dc59250..7dba40112c17 100644 --- a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon @@ -10,7 +10,9 @@ var x: i32; // CHECK:STDERR: ^ var y: i32 = x.b; -// CHECK:STDOUT: file "fail_qualifier_unsupported.carbon" { +// CHECK:STDOUT: --- fail_qualifier_unsupported.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %y.var: ref i32 = var y @@ -18,3 +20,4 @@ var y: i32 = x.b; // CHECK:STDOUT: %x.ref: ref i32 = name_ref x, %x // CHECK:STDOUT: assign %y.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile.carbon b/toolchain/check/testdata/basics/multifile.carbon index aa07d1cdad5d..ff04b549c430 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -14,7 +14,9 @@ package B api; fn B() {} -// CHECK:STDOUT: file "a.carbon" { +// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -22,7 +24,10 @@ fn B() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } -// CHECK:STDOUT: file "b.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: @@ -30,3 +35,4 @@ fn B() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon index b008a3f4e331..dd0be22c80bd 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -39,7 +39,9 @@ fn B() {} // CHECK:STDOUT: 0: inst+0 // CHECK:STDOUT: ... // CHECK:STDOUT: -// CHECK:STDOUT: file "a.carbon" { +// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -47,6 +49,7 @@ fn B() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: // CHECK:STDOUT: --- // CHECK:STDOUT: filename: b.carbon // CHECK:STDOUT: sem_ir: @@ -68,7 +71,9 @@ fn B() {} // CHECK:STDOUT: 0: inst+0 // CHECK:STDOUT: ... // CHECK:STDOUT: -// CHECK:STDOUT: file "b.carbon" { +// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: } // CHECK:STDOUT: @@ -76,3 +81,4 @@ fn B() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 7d52b12a38cc..aff307963dae 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -25,6 +25,8 @@ fn F() { ); } +// CHECK:STDOUT: --- numeric_literals.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = ptr_type [i32; 5] // CHECK:STDOUT: %.loc16: type = tuple_type (i32, i32, i32, i32, i32) @@ -32,7 +34,7 @@ fn F() { // CHECK:STDOUT: %.loc25: type = tuple_type (f64, f64, f64, f64, f64, f64, f64) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "numeric_literals.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -104,3 +106,4 @@ fn F() { // CHECK:STDOUT: assign %floats.var, %.loc25_3.24 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index edd4e822c8a0..f3c1ebd5e3dd 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -6,7 +6,9 @@ var test_i32: i32 = ((1) + (2)); -// CHECK:STDOUT: file "parens.carbon" { +// CHECK:STDOUT: --- parens.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %test_i32.var: ref i32 = var test_i32 // CHECK:STDOUT: %test_i32: ref i32 = bind_name test_i32, %test_i32.var // CHECK:STDOUT: %.loc7_23: i32 = int_literal 1 @@ -14,3 +16,4 @@ var test_i32: i32 = ((1) + (2)); // CHECK:STDOUT: %.loc7_26: i32 = add %.loc7_23, %.loc7_29 // CHECK:STDOUT: assign %test_i32.var, %.loc7_26 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index 671571faf78c..c5eb7d0fce09 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -89,13 +89,15 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: 0: inst+7 // CHECK:STDOUT: ... // CHECK:STDOUT: +// CHECK:STDOUT: --- raw_and_textual_ir.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11_28.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc11_28.2: type = tuple_type (i32, f64) // CHECK:STDOUT: %.loc11_28.3: type = ptr_type (i32, f64) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "raw_and_textual_ir.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -114,3 +116,4 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: %.loc12_21.7: init (i32, f64) = converted %.loc12_21.1, %.loc12_21.6 // CHECK:STDOUT: return %.loc12_21.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index af5e0a33180a..70d544714d42 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -20,7 +20,9 @@ fn C(r#if: i32) -> i32 { return r#if; } -// CHECK:STDOUT: file "raw_identifier.carbon" { +// CHECK:STDOUT: --- raw_identifier.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %C: = fn_decl @C @@ -43,3 +45,4 @@ fn C(r#if: i32) -> i32 { // CHECK:STDOUT: %if.ref: i32 = name_ref r#if, %if // CHECK:STDOUT: return %if.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run.carbon b/toolchain/check/testdata/basics/run.carbon index 8734fb157203..7b43a77554fe 100644 --- a/toolchain/check/testdata/basics/run.carbon +++ b/toolchain/check/testdata/basics/run.carbon @@ -6,7 +6,9 @@ fn Run() {} -// CHECK:STDOUT: file "run.carbon" { +// CHECK:STDOUT: --- run.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Run() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index 1a0a85ab012f..381333ac0ae0 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -6,7 +6,9 @@ fn Run() -> i32 { return 0; } -// CHECK:STDOUT: file "run_i32.carbon" { +// CHECK:STDOUT: --- run_i32.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: @@ -15,3 +17,4 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: return %.loc7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index b7a9d38a3be7..c8a5158e9bde 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -12,13 +12,15 @@ fn Foo(n: i32) -> (i32, f64) { return (n + 2, 3.4); } +// CHECK:STDOUT: --- textual_ir.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11_28.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc11_28.2: type = tuple_type (i32, f64) // CHECK:STDOUT: %.loc11_28.3: type = ptr_type (i32, f64) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "textual_ir.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -37,3 +39,4 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: %.loc12_21.7: init (i32, f64) = converted %.loc12_21.1, %.loc12_21.6 // CHECK:STDOUT: return %.loc12_21.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index c1cf10f04a28..cd657048e633 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -22,11 +22,13 @@ fn Run() -> i32 { return Class.F(4); } +// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = struct_type {.k: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "basic.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G @@ -68,3 +70,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc22_20.2: i32 = converted %.loc22_17, %.loc22_20.1 // CHECK:STDOUT: return %.loc22_20.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index b706ca54adc6..be436573a1bd 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -15,12 +15,14 @@ fn Make() -> Class { return {.k = 1}; } +// CHECK:STDOUT: --- fail_abstract.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9: type = struct_type {.k: i32} // CHECK:STDOUT: %.loc7: type = ptr_type {.k: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_abstract.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Make: = fn_decl @Make @@ -41,3 +43,4 @@ fn Make() -> Class { // CHECK:STDOUT: %.loc15_17: {.k: i32} = struct_literal (%.loc15_16) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index bd03f5ef2832..27d357078eca 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -16,11 +16,13 @@ class Class { fn G(addr b: Class*); } +// CHECK:STDOUT: --- fail_addr_not_self.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc17: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_addr_not_self.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } @@ -37,3 +39,4 @@ class Class { // CHECK:STDOUT: fn @F[%a: Class*](); // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%b: Class*); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index 2664c76b9c67..7396eb9f67c2 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -38,13 +38,15 @@ fn F(c: Class, p: Class*) { (*p).G(); } +// CHECK:STDOUT: --- fail_addr_self.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {} // CHECK:STDOUT: %.loc10_1.2: type = tuple_type () // CHECK:STDOUT: %.loc7: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_addr_self.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.2 @@ -83,3 +85,4 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: %.loc38_9: init () = call %.loc38_7() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index 5f25609fe838..ca0d465ea3a8 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -115,12 +115,14 @@ fn CallReturnIncomplete() { ReturnIncomplete(); } +// CHECK:STDOUT: --- fail_incomplete.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc41: type = struct_type {} // CHECK:STDOUT: %.loc100: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_incomplete.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %.loc15: = fn_decl @.1 @@ -203,3 +205,4 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: %.loc115: init = call %ReturnIncomplete.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index acacd9caaabf..5d7b654d80a2 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -24,6 +24,8 @@ fn F() { {.a = 1, .b = 2, .c = 3} as Class; } +// CHECK:STDOUT: --- fail_init.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc16: type = struct_type {.a: i32} @@ -32,7 +34,7 @@ fn F() { // CHECK:STDOUT: %.loc24: type = struct_type {.a: i32, .b: i32, .c: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_init.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -78,3 +80,4 @@ fn F() { // CHECK:STDOUT: %.loc24_26.4: ref Class = converted %.loc24_26.1, %.loc24_26.3 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 76f127067669..a2580c967e63 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -22,13 +22,15 @@ fn F() { G(&c); } +// CHECK:STDOUT: --- fail_init_as_inplace.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc22: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_init_as_inplace.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G @@ -75,3 +77,4 @@ fn F() { // CHECK:STDOUT: %.loc22_4: init () = call %G.ref(%.loc22_5) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index 2ce61f8f4c7b..b23c8ec1d832 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -33,6 +33,8 @@ fn F(s: {.a: A}, b: B) { b.a.F(); } +// CHECK:STDOUT: --- fail_memaccess_category.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9_1.1: type = struct_type {} // CHECK:STDOUT: %.loc9_1.2: type = tuple_type () @@ -42,7 +44,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: %.loc11: type = ptr_type {.a: A} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_memaccess_category.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: class_decl @B, () @@ -82,3 +84,4 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: %.loc33_8: init () = call %.loc33_6() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index 45b4f5aa2743..e468ead20dcb 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -21,11 +21,13 @@ let T: type = Class; // CHECK:STDERR: ^ fn T.F() {} +// CHECK:STDOUT: --- fail_member_of_let.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_member_of_let.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class @@ -46,3 +48,4 @@ fn T.F() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index b7e5e0ea7214..587f05d4c954 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -30,13 +30,15 @@ fn F(c: Class) { Class.WithSelf(c); } +// CHECK:STDOUT: --- fail_method.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {} // CHECK:STDOUT: %.loc10_1.2: type = tuple_type () // CHECK:STDOUT: %.loc7: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_method.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -75,3 +77,4 @@ fn F(c: Class) { // CHECK:STDOUT: %.loc30: init () = call %WithSelf.ref.loc30() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon index 1bc58930f3fe..b5dfbe662ee0 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon @@ -74,11 +74,13 @@ abstract class G; // CHECK:STDERR: ^~~~~ base class G; +// CHECK:STDOUT: --- fail_redeclaration_introducer.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc14: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_redeclaration_introducer.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: class_decl @A, () @@ -137,3 +139,4 @@ base class G; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon index 7797c6b3ce4d..b810195afa00 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon @@ -21,11 +21,13 @@ class Y { class A.B {} } +// CHECK:STDOUT: --- fail_redeclaration_scope.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_redeclaration_scope.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @A.1, () // CHECK:STDOUT: %A: type = class_type @A.1 // CHECK:STDOUT: class_decl @X, () @@ -78,3 +80,4 @@ class Y { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_redefinition.carbon b/toolchain/check/testdata/class/fail_redefinition.carbon index 77193e460008..a3ed259792dd 100644 --- a/toolchain/check/testdata/class/fail_redefinition.carbon +++ b/toolchain/check/testdata/class/fail_redefinition.carbon @@ -24,11 +24,13 @@ fn Class.F() {} fn Class.G() {} fn Class.H() {} +// CHECK:STDOUT: --- fail_redefinition.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_redefinition.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: class_decl @Class, () @@ -61,3 +63,4 @@ fn Class.H() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_reorder.carbon b/toolchain/check/testdata/class/fail_reorder.carbon index aec72bbaa1d9..20705e7bcab4 100644 --- a/toolchain/check/testdata/class/fail_reorder.carbon +++ b/toolchain/check/testdata/class/fail_reorder.carbon @@ -25,11 +25,13 @@ class Class { } } +// CHECK:STDOUT: --- fail_reorder.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc26: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_reorder.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } @@ -55,3 +57,4 @@ class Class { // CHECK:STDOUT: %.loc24: i32 = int_literal 1 // CHECK:STDOUT: return %.loc24 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index d25a97855f7d..fcb3c118e8f5 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -17,11 +17,13 @@ fn G() -> i32 { return F(); } +// CHECK:STDOUT: --- fail_scope.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_scope.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G @@ -45,3 +47,4 @@ fn G() -> i32 { // CHECK:STDOUT: %F.ref: = name_ref F, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index 6ab921562935..74ab187e02c3 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -50,13 +50,15 @@ fn CallWrongSelf(ws: WrongSelf) { ws.F(); } +// CHECK:STDOUT: --- fail_self.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc20_1.1: type = struct_type {} // CHECK:STDOUT: %.loc20_1.2: type = tuple_type () // CHECK:STDOUT: %.loc7: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_self.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.1 @@ -104,3 +106,4 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: %.loc50_7: init () = call %.loc50_5() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index e494ef233319..27dbbb8f5d14 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -21,11 +21,13 @@ fn G() -> i32 { return Class.field; } +// CHECK:STDOUT: --- fail_unbound_field.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = struct_type {.field: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_unbound_field.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G @@ -54,3 +56,4 @@ fn G() -> i32 { // CHECK:STDOUT: %field.ref: = name_ref field, @Class.%field // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 172beaf1f3b0..466e8b34d3d5 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -16,12 +16,14 @@ fn G(c: Class) -> i32 { return c.something; } +// CHECK:STDOUT: --- fail_unknown_member.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9: type = struct_type {.n: i32} // CHECK:STDOUT: %.loc7: type = ptr_type {.n: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_unknown_member.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %G: = fn_decl @G @@ -42,3 +44,4 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: %something.ref: = name_ref something, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index fa387ab8642d..174096b9aeed 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -16,12 +16,14 @@ fn Run() -> i32 { return c.j + c.k; } +// CHECK:STDOUT: --- field_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.j: i32, .k: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.j: i32, .k: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "field_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Run: = fn_decl @Run @@ -62,3 +64,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc16_14: i32 = add %.loc16_11.2, %.loc16_17.2 // CHECK:STDOUT: return %.loc16_14 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index d78e2f7ab743..6d039a0b30b9 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -17,12 +17,14 @@ fn Run() -> i32 { return c.j + c.k; } +// CHECK:STDOUT: --- field_access_in_value.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.j: i32, .k: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.j: i32, .k: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "field_access_in_value.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Run: = fn_decl @Run @@ -67,3 +69,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc17_14: i32 = add %.loc17_11.2, %.loc17_17.2 // CHECK:STDOUT: return %.loc17_14 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 236452233e58..21f0559cfd7a 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -8,7 +8,9 @@ class Class; fn F(p: Class*) -> Class* { return p; } -// CHECK:STDOUT: file "forward_declared.carbon" { +// CHECK:STDOUT: --- forward_declared.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -21,3 +23,4 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: %p.ref: Class* = name_ref p, %p // CHECK:STDOUT: return %p.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 19bb62e46f09..94ccbdfb1a92 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -17,13 +17,15 @@ fn MakeReorder(n: i32, next: Class*) -> Class { return {.next = next, .n = n}; } +// CHECK:STDOUT: --- init.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.n: i32, .next: Class*} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.n: i32, .next: Class*} // CHECK:STDOUT: %.loc17: type = struct_type {.next: Class*, .n: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "init.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Make: = fn_decl @Make @@ -72,3 +74,4 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: %.loc17_31.7: init Class = converted %.loc17_31.1, %.loc17_31.6 // CHECK:STDOUT: return %.loc17_31.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index f73a793d374c..94282aac6bf7 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -13,12 +13,14 @@ fn F() -> i32 { return ({.a = 1, .b = 2} as Class).a; } +// CHECK:STDOUT: --- init_as.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "init_as.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -55,3 +57,4 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc13_37.2: i32 = bind_value %.loc13_37.1 // CHECK:STDOUT: return %.loc13_37.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 112e62e9fed8..c883a741df68 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -20,6 +20,8 @@ fn MakeOuter() -> Outer { return {.c = MakeInner(), .d = MakeInner()}; } +// CHECK:STDOUT: --- init_nested.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.a: i32, .b: i32} @@ -29,7 +31,7 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: %.loc14: type = ptr_type {.c: Inner, .d: Inner} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "init_nested.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Inner, () // CHECK:STDOUT: %Inner: type = class_type @Inner // CHECK:STDOUT: %MakeInner: = fn_decl @MakeInner @@ -81,3 +83,4 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: %.loc20_45.5: init Outer = converted %.loc20_45.3, %.loc20_45.4 // CHECK:STDOUT: return %.loc20_45.5 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index 2e4db1f0ea73..a10c26b0cf57 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -44,12 +44,14 @@ fn CallGOnInitializingExpr() -> i32 { return Make().G(); } +// CHECK:STDOUT: --- method.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc12: type = struct_type {.k: i32} // CHECK:STDOUT: %.loc7: type = ptr_type {.k: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "method.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -162,3 +164,4 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: %.loc44_20.2: i32 = converted %.loc44_18, %.loc44_20.1 // CHECK:STDOUT: return %.loc44_20.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index c86004d85a13..785e910a0933 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -28,6 +28,8 @@ fn F(a: Outer*) { (*(*a).pi).qi = (*a).pi; } +// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc12_3.1: type = struct_type {.pi: Inner*, .po: Outer*, .qi: Inner*} // CHECK:STDOUT: %.loc17_1.1: type = struct_type {.po: Outer*, .qo: Outer*, .pi: Inner*} @@ -35,7 +37,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: %.loc12_3.2: type = ptr_type {.pi: Inner*, .po: Outer*, .qi: Inner*} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Outer, () // CHECK:STDOUT: %Outer: type = class_type @Outer // CHECK:STDOUT: %F: = fn_decl @F @@ -142,3 +144,4 @@ fn F(a: Outer*) { // CHECK:STDOUT: assign %.loc28_13, %.loc28_23.2 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 2b33a48e0dd6..529bff46fc9d 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -18,6 +18,8 @@ fn G(o: Outer) { var i: o.Inner; } +// CHECK:STDOUT: --- nested_name.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {.n: i32} // CHECK:STDOUT: %.loc11_1.1: type = struct_type {} @@ -26,7 +28,7 @@ fn G(o: Outer) { // CHECK:STDOUT: %.loc7: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested_name.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Outer, () // CHECK:STDOUT: %Outer: type = class_type @Outer // CHECK:STDOUT: %F: = fn_decl @F @@ -66,3 +68,4 @@ fn G(o: Outer) { // CHECK:STDOUT: %i: ref Inner = bind_name i, %i.var // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index 297d03d1e839..65dfb6685f52 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -18,6 +18,8 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { return (self.n, r#self); } +// CHECK:STDOUT: --- raw_self.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9_46.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc9_46.2: type = tuple_type (i32, i32) @@ -26,7 +28,7 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc7: type = ptr_type {.n: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "raw_self.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -71,3 +73,4 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc18_25.7: init (i32, i32) = converted %.loc18_25.1, %.loc18_25.6 // CHECK:STDOUT: return %.loc18_25.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index 53640feb735d..dd407d6896b4 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -11,11 +11,13 @@ class Class { } } +// CHECK:STDOUT: --- raw_self_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc12: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "raw_self_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: } @@ -42,3 +44,4 @@ class Class { // CHECK:STDOUT: assign %p.var, %.loc10_20 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index 09f9189b23b0..8eb71e33eb2e 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -12,11 +12,13 @@ class Class { fn Class.F() {} +// CHECK:STDOUT: --- redeclaration.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "redeclaration.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: class_decl @Class, () @@ -34,3 +36,4 @@ fn Class.F() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index 2328c74edd9c..ef58cfbf0c1a 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -12,11 +12,13 @@ class A {} base class B {} abstract class C {} +// CHECK:STDOUT: --- redeclaration_introducer.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "redeclaration_introducer.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @A, () // CHECK:STDOUT: %A: type = class_type @A // CHECK:STDOUT: class_decl @B, () @@ -42,3 +44,4 @@ abstract class C {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index c7d1dc9fbd96..6fab97837044 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -13,11 +13,13 @@ fn Class.F() -> i32 { return G(); } +// CHECK:STDOUT: --- reenter_scope.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "reenter_scope.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -42,3 +44,4 @@ fn Class.F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 557e4163606d..a78d67e42f03 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -22,11 +22,13 @@ fn Run() -> i32 { return F() + Class.F(); } +// CHECK:STDOUT: --- scope.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "scope.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F.2 @@ -77,3 +79,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc22_14.3: i32 = add %.loc22_14.2, %.loc22_23.3 // CHECK:STDOUT: return %.loc22_14.3 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index 294d2d758e82..9c706ee99318 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -19,12 +19,14 @@ fn Class.G[addr self: Class*]() -> i32 { return (*self).n; } +// CHECK:STDOUT: --- self.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc12: type = struct_type {.n: i32} // CHECK:STDOUT: %.loc7: type = ptr_type {.n: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "self.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -60,3 +62,4 @@ fn Class.G[addr self: Class*]() -> i32 { // CHECK:STDOUT: %.loc19_17.2: i32 = bind_value %.loc19_17.1 // CHECK:STDOUT: return %.loc19_17.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index d3172763cdc0..afafd26dcc15 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -16,12 +16,14 @@ fn Class.F[self: Class]() -> i32 { return (*self.p).F(); } +// CHECK:STDOUT: --- self_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {.p: Class*} // CHECK:STDOUT: %.loc7: type = ptr_type {.p: Class*} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "self_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %F: = fn_decl @F @@ -53,3 +55,4 @@ fn Class.F[self: Class]() -> i32 { // CHECK:STDOUT: %.loc16_23.2: i32 = converted %.loc16_21, %.loc16_23.1 // CHECK:STDOUT: return %.loc16_23.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 62fdf92767b1..3510992d0fff 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -13,13 +13,15 @@ fn Run() -> i32 { return c.F(); } +// CHECK:STDOUT: --- static_method.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9_1.1: type = struct_type {} // CHECK:STDOUT: %.loc9_1.2: type = tuple_type () // CHECK:STDOUT: %.loc7: type = ptr_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "static_method.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Class, () // CHECK:STDOUT: %Class: type = class_type @Class // CHECK:STDOUT: %Run: = fn_decl @Run @@ -46,3 +48,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc13_15.2: i32 = converted %.loc13_13, %.loc13_15.1 // CHECK:STDOUT: return %.loc13_15.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 86c61df16b86..6cf90700d945 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -12,7 +12,9 @@ fn F(p: const i32**) -> const (const i32)** { return p; } -// CHECK:STDOUT: file "collapse.carbon" { +// CHECK:STDOUT: --- collapse.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -21,3 +23,4 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: %p.ref: const i32** = name_ref p, %p // CHECK:STDOUT: return %p.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index d0046ee091f4..49b3e44853b9 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -14,7 +14,9 @@ fn G(p: const (const i32)**) -> i32** { return p; } -// CHECK:STDOUT: file "fail_collapse.carbon" { +// CHECK:STDOUT: --- fail_collapse.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } // CHECK:STDOUT: @@ -23,3 +25,4 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: %p.ref: const i32** = name_ref p, %p // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon index bb3b909edfd4..2ea35936ede4 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -16,13 +16,15 @@ fn H() -> i32 { return G()[0]; } +// CHECK:STDOUT: --- in_place_tuple_init.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_20.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_20.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_20.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "in_place_tuple_init.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H @@ -62,3 +64,4 @@ fn H() -> i32 { // CHECK:STDOUT: %.loc16_15.2: i32 = bind_value %.loc16_15.1 // CHECK:STDOUT: return %.loc16_15.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index c3a4f594603e..9e2d6bcfcf2c 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -12,12 +12,14 @@ fn Main() { Echo({}); } +// CHECK:STDOUT: --- empty_struct.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_13.1: type = struct_type {} // CHECK:STDOUT: %.loc7_13.2: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "empty_struct.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -37,3 +39,4 @@ fn Main() { // CHECK:STDOUT: %.loc12_7: init {} = call %Echo.ref(%.loc12_9.3) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index 6a50374f8a4d..68c6d46639fe 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -12,11 +12,13 @@ fn Main() { Echo(()); } +// CHECK:STDOUT: --- empty_tuple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "empty_tuple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -36,3 +38,4 @@ fn Main() { // CHECK:STDOUT: %.loc12_7: init () = call %Echo.ref(%.loc12_9.3) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index adb444fb68b1..70824e00e040 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -11,11 +11,13 @@ fn Run() { var x: i32 = "hello"(); } +// CHECK:STDOUT: --- fail_not_callable.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.1: type = ptr_type String // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_not_callable.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } // CHECK:STDOUT: @@ -27,3 +29,4 @@ fn Run() { // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index fc4ad522aa3e..90b681d0c76e 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -55,11 +55,13 @@ fn Main() { Run2(0); } +// CHECK:STDOUT: --- fail_param_count.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc18: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_param_count.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Run0: = fn_decl @Run0 // CHECK:STDOUT: %Run1: = fn_decl @Run1 // CHECK:STDOUT: %Run2: = fn_decl @Run2 @@ -103,3 +105,4 @@ fn Main() { // CHECK:STDOUT: %.loc55_7: init () = call %Run2.ref.loc55() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index f5853db8a651..22144dc90c9d 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -16,11 +16,13 @@ fn F() { G(1.0); } +// CHECK:STDOUT: --- fail_param_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc16: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_param_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } @@ -37,3 +39,4 @@ fn F() { // CHECK:STDOUT: %.loc16_4: init () = call %G.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index e7efcd3d292c..90e8e24930d2 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -13,7 +13,9 @@ fn Run() { var x: i32 = Foo(); } -// CHECK:STDOUT: file "fail_return_type_mismatch.carbon" { +// CHECK:STDOUT: --- fail_return_type_mismatch.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } @@ -33,3 +35,4 @@ fn Run() { // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index f2ac2d958b12..553690f226a6 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -12,7 +12,9 @@ fn Main() { var b: i32 = Echo(1); } -// CHECK:STDOUT: file "i32.carbon" { +// CHECK:STDOUT: --- i32.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Echo: = fn_decl @Echo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -33,3 +35,4 @@ fn Main() { // CHECK:STDOUT: assign %b.var, %.loc12_20 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index 9d6e823794c9..a789cb34f709 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -11,11 +11,13 @@ fn Main() { Foo(1 + 2 + 3, 4 + 5, 6); } +// CHECK:STDOUT: --- more_param_ir.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "more_param_ir.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -40,3 +42,4 @@ fn Main() { // CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref(%.loc11_13, %.loc11_20, %.loc11_25) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index cd97e8727e0b..c9c602c49fa8 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -10,11 +10,13 @@ fn Main() { Foo(1); } +// CHECK:STDOUT: --- params_one.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "params_one.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -31,3 +33,4 @@ fn Main() { // CHECK:STDOUT: %.loc10_6: init () = call %Foo.ref(%.loc10_7) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index cbd6289d1278..47b26e8722b1 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -11,11 +11,13 @@ fn Main() { Foo(1,); } +// CHECK:STDOUT: --- params_one_comma.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "params_one_comma.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -35,3 +37,4 @@ fn Main() { // CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index 8947198efa7a..26331082f8a5 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -10,11 +10,13 @@ fn Main() { Foo(1, 2); } +// CHECK:STDOUT: --- params_two.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "params_two.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -32,3 +34,4 @@ fn Main() { // CHECK:STDOUT: %.loc10_6: init () = call %Foo.ref(%.loc10_7, %.loc10_10) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index 4089dca3c14f..a0e866312e5f 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -11,11 +11,13 @@ fn Main() { Foo(1, 2,); } +// CHECK:STDOUT: --- params_two_comma.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "params_two_comma.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -37,3 +39,4 @@ fn Main() { // CHECK:STDOUT: %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7, %.loc11_10) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 415912714ff7..16ffe2ae0e01 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -10,11 +10,13 @@ fn Main() { Foo(); } +// CHECK:STDOUT: --- params_zero.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "params_zero.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -30,3 +32,4 @@ fn Main() { // CHECK:STDOUT: %.loc10: init () = call %Foo.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index d56915fd3047..869123ff5c07 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -11,11 +11,13 @@ fn Main() { var b: () = MakeImplicitEmptyTuple(); } +// CHECK:STDOUT: --- return_implicit.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "return_implicit.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %MakeImplicitEmptyTuple: = fn_decl @MakeImplicitEmptyTuple // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -36,3 +38,4 @@ fn Main() { // CHECK:STDOUT: assign %b.var, %.loc11_37 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index 1b8baaef4b6a..a434b6ca42ac 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -8,11 +8,13 @@ fn F(); fn G() { F(); } +// CHECK:STDOUT: --- simple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "simple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } @@ -25,3 +27,4 @@ fn G() { F(); } // CHECK:STDOUT: %.loc9: init () = call %F.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon index d39c4c6e41fc..b6b3922c27b0 100644 --- a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon @@ -12,7 +12,9 @@ // CHECK:STDERR: ^ fn Bar(a: i32, a: i32) {} -// CHECK:STDOUT: file "fail_param_name_conflict.carbon" { +// CHECK:STDOUT: --- fail_param_name_conflict.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index cfc8733f1092..73132648b5fc 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -8,7 +8,9 @@ fn Foo() {} fn Bar() {} fn Baz() {} -// CHECK:STDOUT: file "order.carbon" { +// CHECK:STDOUT: --- order.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: %Baz: = fn_decl @Baz @@ -28,3 +30,4 @@ fn Baz() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index a7634abe4688..5a855a7fcd8f 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -6,7 +6,9 @@ fn Foo(a: i32) {} -// CHECK:STDOUT: file "params_one.carbon" { +// CHECK:STDOUT: --- params_one.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Foo(a: i32) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index 0ba2dbd8204b..e03a9676941c 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -6,7 +6,9 @@ fn Foo(a: i32,) {} -// CHECK:STDOUT: file "params_one_comma.carbon" { +// CHECK:STDOUT: --- params_one_comma.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index e17e58691cc3..e8adbd13ece2 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -6,7 +6,9 @@ fn Foo(a: i32, b: i32) {} -// CHECK:STDOUT: file "params_two.carbon" { +// CHECK:STDOUT: --- params_two.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 77038e302fde..ece45bb88522 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -6,7 +6,9 @@ fn Foo(a: i32, b: i32,) {} -// CHECK:STDOUT: file "params_two_comma.carbon" { +// CHECK:STDOUT: --- params_two_comma.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index d9e1898128b9..b9ba1706c181 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -6,7 +6,9 @@ fn Foo() {} -// CHECK:STDOUT: file "params_zero.carbon" { +// CHECK:STDOUT: --- params_zero.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: } // CHECK:STDOUT: @@ -14,3 +16,4 @@ fn Foo() {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/same_param_name.carbon b/toolchain/check/testdata/function/definition/same_param_name.carbon index e2b1223d2264..e4b20140ced5 100644 --- a/toolchain/check/testdata/function/definition/same_param_name.carbon +++ b/toolchain/check/testdata/function/definition/same_param_name.carbon @@ -7,7 +7,9 @@ fn Foo(a: i32) {} fn Bar(a: i32) {} -// CHECK:STDOUT: file "same_param_name.carbon" { +// CHECK:STDOUT: --- same_param_name.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Foo: = fn_decl @Foo // CHECK:STDOUT: %Bar: = fn_decl @Bar // CHECK:STDOUT: } @@ -21,3 +23,4 @@ fn Bar(a: i32) {} // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 36c9bbd47426..cb1debde5fd2 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -17,11 +17,13 @@ fn If(b: bool) { H(); } +// CHECK:STDOUT: --- else.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc13: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "else.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H @@ -63,3 +65,4 @@ fn If(b: bool) { // CHECK:STDOUT: %.loc17: init () = call %H.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index 5a416da92613..0c14174570bf 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -33,7 +33,9 @@ fn If3(b: bool) -> i32 { // CHECK:STDERR: ^ } -// CHECK:STDOUT: file "fail_reachable_fallthrough.carbon" { +// CHECK:STDOUT: --- fail_reachable_fallthrough.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %If1: = fn_decl @If1 // CHECK:STDOUT: %If2: = fn_decl @If2 // CHECK:STDOUT: %If3: = fn_decl @If3 @@ -80,3 +82,4 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: // CHECK:STDOUT: !if.else: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 7cab2b2aad36..fbb9993cd801 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -15,7 +15,9 @@ fn VarScope(b: bool) -> i32 { return n; } -// CHECK:STDOUT: file "fail_scope.carbon" { +// CHECK:STDOUT: --- fail_scope.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %VarScope: = fn_decl @VarScope // CHECK:STDOUT: } // CHECK:STDOUT: @@ -37,3 +39,4 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: %n.ref.loc15: = name_ref n, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 0da85549d427..eb012b067a3f 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -14,11 +14,13 @@ fn If(b: bool) { G(); } +// CHECK:STDOUT: --- no_else.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc12: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "no_else.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %If: = fn_decl @If @@ -49,3 +51,4 @@ fn If(b: bool) { // CHECK:STDOUT: %.loc14: init () = call %G.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index a6bad9ce9159..9e33c8e11442 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -13,7 +13,9 @@ fn If(b: bool) -> i32 { // Missing return here is OK. } -// CHECK:STDOUT: file "unreachable_fallthrough.carbon" { +// CHECK:STDOUT: --- unreachable_fallthrough.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %If: = fn_decl @If // CHECK:STDOUT: } // CHECK:STDOUT: @@ -30,3 +32,4 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: %.loc11: i32 = int_literal 2 // CHECK:STDOUT: return %.loc11 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 226bb6244f3c..8e0a3837f958 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -8,7 +8,9 @@ fn F(b: bool, n: i32, m: i32) -> i32 { return if b then n + m else m + n; } -// CHECK:STDOUT: file "basic.carbon" { +// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -33,3 +35,4 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %.loc8_10: i32 = block_arg !if.expr.result // CHECK:STDOUT: return %.loc8_10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index befe6d3c05eb..4e45c1300fb8 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -15,7 +15,9 @@ fn G() -> i32 { return if false then A() else B(); } -// CHECK:STDOUT: file "constant_condition.carbon" { +// CHECK:STDOUT: --- constant_condition.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %F: = fn_decl @F @@ -81,3 +83,4 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc15_10: i32 = block_arg !if.expr.result // CHECK:STDOUT: return %.loc15_10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index e92fa9f7aecc..36458f1b6de3 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -11,7 +11,9 @@ fn F(b: bool) -> i32 { return if b then A() else B(); } -// CHECK:STDOUT: file "control_flow.carbon" { +// CHECK:STDOUT: --- control_flow.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %F: = fn_decl @F @@ -52,3 +54,4 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %.loc11_10: i32 = block_arg !if.expr.result // CHECK:STDOUT: return %.loc11_10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon index 8980fee5bf05..10583cc9bb69 100644 --- a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon +++ b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon @@ -33,11 +33,13 @@ class C { var n: if true then i32 else f64; } +// CHECK:STDOUT: --- fail_not_in_function.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc34: type = struct_type {.n: } // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_not_in_function.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc17: i32 = block_arg // CHECK:STDOUT: %x: i32 = bind_name x, %.loc17 // CHECK:STDOUT: class_decl @C, () @@ -51,3 +53,4 @@ class C { // CHECK:STDOUT: !members: // CHECK:STDOUT: .n = // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 5a1a07738b47..131dc27022ac 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -8,7 +8,9 @@ fn F(a: bool, b: bool, c: bool) -> i32 { return if a then if b then 1 else 2 else if c then 3 else 4; } -// CHECK:STDOUT: file "nested.carbon" { +// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -53,3 +55,4 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: %.loc8_10: i32 = block_arg !if.expr.result.loc8_10 // CHECK:STDOUT: return %.loc8_10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index a4e2b4b4e5b8..56229cc6bdfa 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -11,12 +11,14 @@ fn F(cond: bool) { G(if cond then a else a); } +// CHECK:STDOUT: --- struct.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc11: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "struct.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } @@ -67,3 +69,4 @@ fn F(cond: bool) { // CHECK:STDOUT: %.loc11_4: init () = call %G.ref(%.loc11_5) // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index aff0fbfcd02e..307226246c2e 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -9,12 +9,14 @@ var b: i32 = 1; var c: i32 = a[0]; var d: i32 = a[b]; +// CHECK:STDOUT: --- array_element_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 2] // CHECK:STDOUT: %.loc7_26: type = tuple_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "array_element_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 2 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 2] = var a @@ -51,3 +53,4 @@ var d: i32 = a[b]; // CHECK:STDOUT: %.loc10_17.2: i32 = bind_value %.loc10_17.1 // CHECK:STDOUT: assign %d.var, %.loc10_17.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 4af9a4cff645..c98653cf4eb9 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -24,12 +24,14 @@ fn ValueBinding(b: [i32; 3]) { F()[0]; } +// CHECK:STDOUT: --- expr_category.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type [i32; 3] // CHECK:STDOUT: %.loc10: type = tuple_type (i32, i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "expr_category.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %ValueBinding: = fn_decl @ValueBinding @@ -114,3 +116,4 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: %.loc24_8.2: i32 = bind_value %.loc24_8.1 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index 68850d61c6b6..d2e54b3e9db2 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -10,12 +10,14 @@ var a: [i32; 1] = (12,); // CHECK:STDERR: ^ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; +// CHECK:STDOUT: --- fail_array_large_index.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 1] // CHECK:STDOUT: %.loc7_23: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_array_large_index.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a @@ -36,3 +38,4 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: %.loc11_35.2: i32 = bind_value %.loc11_35.1 // CHECK:STDOUT: assign %b.var, %.loc11_35.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index 4575ca40a4dd..1cba0a013e45 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -10,12 +10,14 @@ var a: [i32; 1] = (12,); // CHECK:STDERR: ^~~ var b: i32 = a[2.6]; +// CHECK:STDOUT: --- fail_array_non_int_indexing.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 1] // CHECK:STDOUT: %.loc7_23: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_array_non_int_indexing.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a @@ -36,3 +38,4 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %.loc11_19.2: i32 = bind_value %.loc11_19.1 // CHECK:STDOUT: assign %b.var, %.loc11_19.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index 656e6a6b48e7..a78a9049309f 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -10,12 +10,14 @@ var a: [i32; 1] = (12,); // CHECK:STDERR: ^ var b: i32 = a[2]; +// CHECK:STDOUT: --- fail_array_out_of_bound_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_15: type = ptr_type [i32; 1] // CHECK:STDOUT: %.loc7_23: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_array_out_of_bound_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 // CHECK:STDOUT: %a.var: ref [i32; 1] = var a @@ -36,3 +38,4 @@ var b: i32 = a[2]; // CHECK:STDOUT: %.loc11_17.2: i32 = bind_value %.loc11_17.1 // CHECK:STDOUT: assign %b.var, %.loc11_17.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon index 110d410f4371..1b58abb96ab6 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -13,11 +13,13 @@ fn Run() { F()[0]; } +// CHECK:STDOUT: --- fail_empty_tuple_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc13: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_empty_tuple_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } @@ -37,3 +39,4 @@ fn Run() { // CHECK:STDOUT: %.loc13_8: ref = tuple_index %.loc13_4.3, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index b3bc34bcd803..7129c8758f72 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -29,11 +29,13 @@ fn G(b: [i32; 3]) { F()[0] = 4; } +// CHECK:STDOUT: --- fail_expr_category.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type [i32; 3] // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_expr_category.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } @@ -82,3 +84,4 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: assign %.loc29_8.2, %.loc29_12 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index a5e1b9d251f4..4727148a5ded 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -30,12 +30,14 @@ var c: i32 = {.a = 1, .b = 2}[0]; // CHECK:STDERR: ^ var d: i32 = {.a: i32, .b: i32}[0]; +// CHECK:STDOUT: --- fail_invalid_base.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc26_29.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc26_29.2: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_invalid_base.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc11: = namespace {} // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var @@ -65,3 +67,4 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index 971bf71bd8f3..5f8fd2432c92 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -11,7 +11,9 @@ fn Main() { var b: i32 = a[0]; } -// CHECK:STDOUT: file "fail_name_not_found.carbon" { +// CHECK:STDOUT: --- fail_name_not_found.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -24,3 +26,4 @@ fn Main() { // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_negative_indexing.carbon b/toolchain/check/testdata/index/fail_negative_indexing.carbon index 9153035da245..63519911141e 100644 --- a/toolchain/check/testdata/index/fail_negative_indexing.carbon +++ b/toolchain/check/testdata/index/fail_negative_indexing.carbon @@ -10,11 +10,14 @@ var a: (i32, i32) = (12, 6); // CHECK:STDERR: ^ var b: i32 = a[-10]; +// CHECK:STDOUT: --- fail_negative_indexing.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_negative_indexing.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon index 1760b5a417e0..06e7de1c7a52 100644 --- a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon @@ -11,13 +11,15 @@ var b: i32 = 0; // CHECK:STDERR: ^ var c: i32 = a[b]; +// CHECK:STDOUT: --- fail_non_deterministic_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_non_deterministic_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a @@ -43,3 +45,4 @@ var c: i32 = a[b]; // CHECK:STDOUT: %.loc12: ref = tuple_index %a.ref, // CHECK:STDOUT: assign %c.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index 48cd783f6aeb..3bb3a9aef780 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -11,7 +11,9 @@ fn Main() { 0[1]; } -// CHECK:STDOUT: file "fail_non_tuple_access.carbon" { +// CHECK:STDOUT: --- fail_non_tuple_access.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -21,3 +23,4 @@ fn Main() { // CHECK:STDOUT: %.loc11_5: i32 = int_literal 1 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_tuple_index_error.carbon b/toolchain/check/testdata/index/fail_tuple_index_error.carbon index 7fdaa1c8534a..e2cd5a855ba5 100644 --- a/toolchain/check/testdata/index/fail_tuple_index_error.carbon +++ b/toolchain/check/testdata/index/fail_tuple_index_error.carbon @@ -10,13 +10,15 @@ var a: (i32, i32) = (12, 6); // CHECK:STDERR: ^~~~ var b: i32 = a[oops]; +// CHECK:STDOUT: --- fail_tuple_index_error.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_tuple_index_error.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a @@ -38,3 +40,4 @@ var b: i32 = a[oops]; // CHECK:STDOUT: %.loc11: ref = tuple_index %a.ref, %oops.ref // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_tuple_large_index.carbon b/toolchain/check/testdata/index/fail_tuple_large_index.carbon index ce59f4c85980..bca0a6cfbc0e 100644 --- a/toolchain/check/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/check/testdata/index/fail_tuple_large_index.carbon @@ -11,12 +11,14 @@ var b: (i32,) = a; // CHECK:STDERR: ^ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; +// CHECK:STDOUT: --- fail_tuple_large_index.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_tuple_large_index.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %a.var: ref (i32,) = var a @@ -43,3 +45,4 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: %.loc12_35: ref = tuple_index %b.ref, // CHECK:STDOUT: assign %c.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon index e771035d9cb6..2e3de4397274 100644 --- a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon @@ -10,13 +10,15 @@ var a: (i32, i32) = (12, 6); // CHECK:STDERR: ^ var b: i32 = a[2.6]; +// CHECK:STDOUT: --- fail_tuple_non_int_indexing.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_tuple_non_int_indexing.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a @@ -38,3 +40,4 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: %.loc11_19: ref = tuple_index %a.ref, // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon index 1f410021c274..087b7e4ae2ca 100644 --- a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon @@ -10,13 +10,15 @@ var a: (i32, i32) = (12, 6); // CHECK:STDERR: ^ var b: i32 = a[2]; +// CHECK:STDOUT: --- fail_tuple_out_of_bound_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_tuple_out_of_bound_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %a.var: ref (i32, i32) = var a @@ -38,3 +40,4 @@ var b: i32 = a[2]; // CHECK:STDOUT: %.loc11_17: ref = tuple_index %a.ref, // CHECK:STDOUT: assign %b.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/tuple_element_access.carbon b/toolchain/check/testdata/index/tuple_element_access.carbon index e198377c93d5..a350093a5d46 100644 --- a/toolchain/check/testdata/index/tuple_element_access.carbon +++ b/toolchain/check/testdata/index/tuple_element_access.carbon @@ -8,12 +8,14 @@ var a: (i32,) = (12,); var b: (i32,) = a; var c: i32 = b[0]; +// CHECK:STDOUT: --- tuple_element_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "tuple_element_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %a.var: ref (i32,) = var a @@ -41,3 +43,4 @@ var c: i32 = b[0]; // CHECK:STDOUT: %.loc9_17.2: i32 = bind_value %.loc9_17.1 // CHECK:STDOUT: assign %c.var, %.loc9_17.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/tuple_return_value_access.carbon b/toolchain/check/testdata/index/tuple_return_value_access.carbon index 166c498e6142..c452daac5110 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -10,12 +10,14 @@ fn Run() -> i32 { return F()[0]; } +// CHECK:STDOUT: --- tuple_return_value_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_16.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_16.2: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "tuple_return_value_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Run: = fn_decl @Run // CHECK:STDOUT: } @@ -40,3 +42,4 @@ fn Run() -> i32 { // CHECK:STDOUT: %.loc10_15.2: i32 = bind_value %.loc10_15.1 // CHECK:STDOUT: return %.loc10_15.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index 71a37a844655..d774691fb7fe 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -6,7 +6,9 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } -// CHECK:STDOUT: file "duplicate_name_same_line.carbon" { +// CHECK:STDOUT: --- duplicate_name_same_line.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -36,3 +38,4 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: !if.else.loc7_48: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 0e0c732ac8da..68ae71a68769 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -11,13 +11,15 @@ fn F() -> i32 { return w[1]; } +// CHECK:STDOUT: --- convert.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc8_24.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc8_24.2: type = tuple_type (i32, i32, i32) // CHECK:STDOUT: %.loc8_24.3: type = ptr_type (i32, i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "convert.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -57,3 +59,4 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc11_13: i32 = tuple_index %w.ref, %.loc11_12 // CHECK:STDOUT: return %.loc11_13 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index 9c9fecfe7571..bd86fefa2d32 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -14,7 +14,9 @@ fn F(a: i32) { let a: i32 = 1; } -// CHECK:STDOUT: file "fail_duplicate_decl.carbon" { +// CHECK:STDOUT: --- fail_duplicate_decl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -24,3 +26,4 @@ fn F(a: i32) { // CHECK:STDOUT: %a.loc14: i32 = bind_name a, %.loc14 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index ef6476faa8f1..ea37aa883ee1 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -11,7 +11,9 @@ fn F() { let a: i32 = a; } -// CHECK:STDOUT: file "fail_use_in_init.carbon" { +// CHECK:STDOUT: --- fail_use_in_init.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -21,3 +23,4 @@ fn F() { // CHECK:STDOUT: %a: i32 = bind_name a, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 3d65580619d5..2bbaf765c181 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -8,7 +8,9 @@ let n: i32 = 1; fn F() -> i32 { return n; } -// CHECK:STDOUT: file "global.carbon" { +// CHECK:STDOUT: --- global.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: i32 = int_literal 1 // CHECK:STDOUT: %n: i32 = bind_name n, %.loc7 // CHECK:STDOUT: %F: = fn_decl @F @@ -19,3 +21,4 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: %n.ref: i32 = name_ref n, file.%n // CHECK:STDOUT: return %n.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index a0652a424bb1..c802bda31c31 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -9,7 +9,9 @@ fn F(a: i32) -> i32 { return b; } -// CHECK:STDOUT: file "local.carbon" { +// CHECK:STDOUT: --- local.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: %b.ref: i32 = name_ref b, %b // CHECK:STDOUT: return %b.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index 9db2d341831b..8e965e80ffd6 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -18,7 +18,9 @@ fn Foo.Baz() { fn Foo.Baz() { } -// CHECK:STDOUT: file "fail_duplicate.carbon" { +// CHECK:STDOUT: --- fail_duplicate.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc9} // CHECK:STDOUT: %Baz.loc9: = fn_decl @Baz // CHECK:STDOUT: %Baz.loc18: = fn_decl @Baz @@ -31,3 +33,4 @@ fn Foo.Baz() { // CHECK:STDOUT: !.loc19: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon index 280f9ab0e7fc..110347b030ef 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -10,7 +10,9 @@ fn Foo.Baz() { } -// CHECK:STDOUT: file "fail_unresolved_scope.carbon" { +// CHECK:STDOUT: --- fail_unresolved_scope.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10: = fn_decl @.1 // CHECK:STDOUT: } // CHECK:STDOUT: @@ -18,3 +20,4 @@ fn Foo.Baz() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 89029e621a93..f0cbea0da8a8 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -17,11 +17,13 @@ fn Bar() { Foo.Baz(); } +// CHECK:STDOUT: --- function.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc17: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "function.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc13} // CHECK:STDOUT: %Baz.loc10: = fn_decl @Baz.1 // CHECK:STDOUT: %Baz.loc13: = fn_decl @Baz.2 @@ -45,3 +47,4 @@ fn Bar() { // CHECK:STDOUT: %.loc17: init () = call %Baz.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index e3d820f4b3af..425fdfcbc3f2 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -14,11 +14,13 @@ fn Foo.Bar.Baz() { Foo.Bar.Wiz(); } +// CHECK:STDOUT: --- nested.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc14: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: = namespace {.Bar = %.loc8} // CHECK:STDOUT: %.loc8: = namespace {.Wiz = %Wiz, .Baz = %Baz} // CHECK:STDOUT: %Wiz: = fn_decl @Wiz @@ -38,3 +40,4 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: %.loc14: init () = call %Wiz.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 9051e403786a..049791eea1b6 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -23,11 +23,13 @@ fn N.M.B() -> i32 { return 0; } +// CHECK:STDOUT: --- shadow.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc16: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "shadow.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %A.loc7: = fn_decl @A.1 // CHECK:STDOUT: %.loc9: = namespace {.A = %A.loc10, .M = %.loc12} // CHECK:STDOUT: %A.loc10: = fn_decl @A.2 @@ -59,3 +61,4 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: %.loc23: i32 = int_literal 0 // CHECK:STDOUT: return %.loc23 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index a02c2961d5f5..15a3d23f6ddb 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -26,11 +26,13 @@ fn OuterN.InnerN.CallABC() { C(); } +// CHECK:STDOUT: --- unqualified_lookup.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "unqualified_lookup.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: = namespace {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} // CHECK:STDOUT: %.loc8: = namespace {.C = %C, .CallABC = %CallABC} // CHECK:STDOUT: %A: = fn_decl @A @@ -73,3 +75,4 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: %.loc26: init () = call %C.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index 097f449d0d2a..cc6bf2f993c7 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -11,7 +11,9 @@ fn And() -> bool { return F() and G(); } -// CHECK:STDOUT: file "and.carbon" { +// CHECK:STDOUT: --- and.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %And: = fn_decl @And @@ -49,3 +51,4 @@ fn And() -> bool { // CHECK:STDOUT: %.loc11_14.6: bool = block_arg !and.result // CHECK:STDOUT: return %.loc11_14.6 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index c17a7359e0ac..8e3978298ded 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -22,6 +22,8 @@ fn Main() { *(if true then p else &a) = 10; } +// CHECK:STDOUT: --- assignment.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11_19.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc11_19.2: type = tuple_type (i32, i32) @@ -29,7 +31,7 @@ fn Main() { // CHECK:STDOUT: %.loc15: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "assignment.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -118,3 +120,4 @@ fn Main() { // CHECK:STDOUT: assign %.loc22_3, %.loc22_31 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/binary_op.carbon b/toolchain/check/testdata/operators/binary_op.carbon index 4f159489b444..325dafeabb46 100644 --- a/toolchain/check/testdata/operators/binary_op.carbon +++ b/toolchain/check/testdata/operators/binary_op.carbon @@ -8,7 +8,9 @@ fn Main() -> i32 { return 12 + 34; } -// CHECK:STDOUT: file "binary_op.carbon" { +// CHECK:STDOUT: --- binary_op.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -19,3 +21,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc8_13: i32 = add %.loc8_10, %.loc8_15 // CHECK:STDOUT: return %.loc8_13 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon index 25f7b20895b4..05813407837e 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon @@ -15,7 +15,9 @@ fn Main() { *also_undeclared = 42; } -// CHECK:STDOUT: file "fail_assignment_to_error.carbon" { +// CHECK:STDOUT: --- fail_assignment_to_error.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -30,3 +32,4 @@ fn Main() { // CHECK:STDOUT: assign %.loc15_3, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon index db77605b3729..7dc1cf0e6110 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon @@ -45,6 +45,8 @@ fn Main() { (if true then a else a) = 10; } +// CHECK:STDOUT: --- fail_assignment_to_non_assignable.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc21_8.1: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc21_8.2: type = ptr_type (i32, i32) @@ -52,7 +54,7 @@ fn Main() { // CHECK:STDOUT: %.loc34_18.2: type = ptr_type {.x: i32, .y: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assignment_to_non_assignable.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } @@ -157,3 +159,4 @@ fn Main() { // CHECK:STDOUT: assign %.loc45_4, %.loc45_29 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index 18c5f67271f6..2241f395ec8a 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -11,7 +11,9 @@ fn Main() -> i32 { return 12 + 3.4; } -// CHECK:STDOUT: file "fail_type_mismatch.carbon" { +// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -22,3 +24,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc11_13: = add , %.loc11_15 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index 6229cad03be0..056c449cf51a 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -12,7 +12,9 @@ fn Main() { a = 5.6; } -// CHECK:STDOUT: file "fail_type_mismatch_assignment.carbon" { +// CHECK:STDOUT: --- fail_type_mismatch_assignment.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -27,3 +29,4 @@ fn Main() { // CHECK:STDOUT: assign %a.ref, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon index 6d0aeb82d411..816a9d4d0367 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_once.carbon @@ -13,7 +13,9 @@ fn Main() -> i32 { return 12 + 3.4 + 12; } -// CHECK:STDOUT: file "fail_type_mismatch_once.carbon" { +// CHECK:STDOUT: --- fail_type_mismatch_once.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -26,3 +28,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc13_19: = add , %.loc13_21 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index 765f537465e0..de4e76074e48 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -11,7 +11,9 @@ fn Or() -> bool { return F() or G(); } -// CHECK:STDOUT: file "or.carbon" { +// CHECK:STDOUT: --- or.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %Or: = fn_decl @Or @@ -50,3 +52,4 @@ fn Or() -> bool { // CHECK:STDOUT: %.loc11_14.7: bool = block_arg !or.result // CHECK:STDOUT: return %.loc11_14.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index 093b6fa3d00d..964bd6825c6d 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -8,7 +8,9 @@ fn Not(b: bool) -> bool { return not b; } -// CHECK:STDOUT: file "unary_op.carbon" { +// CHECK:STDOUT: --- unary_op.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Not: = fn_decl @Not // CHECK:STDOUT: } // CHECK:STDOUT: @@ -18,3 +20,4 @@ fn Not(b: bool) -> bool { // CHECK:STDOUT: %.loc8: bool = not %b.ref // CHECK:STDOUT: return %.loc8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 2da039b4979e..1cfe379490d0 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -34,19 +34,37 @@ library "lib" api; import library "lib"; -// CHECK:STDOUT: file "api.carbon" { +// CHECK:STDOUT: --- api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "api_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- api_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "same_package.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- same_package.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: } -// CHECK:STDOUT: file "different_package.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- different_package.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib_api.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib_api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_import.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_import.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_api_not_found.carbon b/toolchain/check/testdata/packages/fail_api_not_found.carbon index 0992756ac9a2..df4bd066464b 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -25,14 +25,23 @@ package Foo library "Bar" impl; // CHECK:STDERR: ^~~~~~~ library "Bar" impl; -// CHECK:STDOUT: file "no_api.impl.carbon" { +// CHECK:STDOUT: --- no_api.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Foo: = bind_name Foo, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "no_api_lib.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- no_api_lib.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Foo: = bind_name Foo, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "no_api_main_lib.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- no_api_main_lib.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_cycle.carbon b/toolchain/check/testdata/packages/fail_cycle.carbon index 4fb97d86b4bd..bdd9e3f3726c 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -47,23 +47,38 @@ package CycleChild api; // CHECK:STDERR: ^~~~~~ import B; -// CHECK:STDOUT: file "a.carbon" { +// CHECK:STDOUT: --- a.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "b.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- b.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "c.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- c.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "c.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- c.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "cycle_child.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- cycle_child.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_duplicate_api.carbon b/toolchain/check/testdata/packages/fail_duplicate_api.carbon index 133f48c3a438..b571718bf52e 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -42,19 +42,43 @@ package Package library "lib" api; // CHECK:STDERR: ^~~~~~~ package Package library "lib" api; -// CHECK:STDOUT: file "main1.carbon" { +// CHECK:STDOUT: --- main1.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main2.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main2.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib1.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib1.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib2.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib2.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package1.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package1.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package2.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package2.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package_lib1.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package_lib1.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package_lib2.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package_lib2.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_extension.carbon b/toolchain/check/testdata/packages/fail_extension.carbon index eb4df2fbbbe9..07036d89f4e7 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -70,30 +70,60 @@ package SwappedExt api; package SwappedExt impl; -// CHECK:STDOUT: file "main.incorrect" { +// CHECK:STDOUT: --- main.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_redundant_with_swapped_ext.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_redundant_with_swapped_ext.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib_impl.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib_impl.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: } -// CHECK:STDOUT: file "package.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package_impl.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package_impl.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Package: = bind_name Package, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "package_lib.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package_lib.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "package_lib_impl.incorrect" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- package_lib_impl.incorrect +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Package: = bind_name Package, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "swapped_ext.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- swapped_ext.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "swapped_ext.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- swapped_ext.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %SwappedExt: = bind_name SwappedExt, %import // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_default.carbon b/toolchain/check/testdata/packages/fail_import_default.carbon index 47d3eecc776a..d2e6d34386a1 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -38,13 +38,25 @@ library "lib" api; // CHECK:STDERR: ^~~~~~ import library default; -// CHECK:STDOUT: file "default_api.carbon" { +// CHECK:STDOUT: --- default_api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "default.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- default.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_import_default.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_import_default.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib_import_default.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib_import_default.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_invalid.carbon b/toolchain/check/testdata/packages/fail_import_invalid.carbon index 47e90dcb3d71..4bfb3bb3a43f 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -82,27 +82,54 @@ package NotFound api; // CHECK:STDERR: ^~~~~~ import ImportNotFound; -// CHECK:STDOUT: file "main.carbon" { +// CHECK:STDOUT: --- main.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "not_main.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- not_main.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "this.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- this.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "this_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- this_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "implicit_api.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit_api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "implicit.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Implicit: = bind_name Implicit, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "implicit_lib_api.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit_lib_api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "implicit_lib.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- implicit_lib.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %Implicit: = bind_name Implicit, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "not_found.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- not_found.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %ImportNotFound: = bind_name ImportNotFound, %import // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_repeat.carbon b/toolchain/check/testdata/packages/fail_import_repeat.carbon index a218c5cfc26f..1afb74d1f192 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -58,17 +58,32 @@ import library default; // CHECK:STDERR: ^~~~~~ import library default; -// CHECK:STDOUT: file "api.carbon" { +// CHECK:STDOUT: --- api.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "api_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- api_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "import.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- import.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import.loc2: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import.loc2 // CHECK:STDOUT: %import.loc20: = import ir3, ir3 // CHECK:STDOUT: } -// CHECK:STDOUT: file "default_import.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- default_import.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_package_main.carbon b/toolchain/check/testdata/packages/fail_package_main.carbon index 3a04430edafa..3a314f671c9c 100644 --- a/toolchain/check/testdata/packages/fail_package_main.carbon +++ b/toolchain/check/testdata/packages/fail_package_main.carbon @@ -33,11 +33,23 @@ package r#Main api; // CHECK:STDERR: ^~~~~~~ package Main library "lib" api; -// CHECK:STDOUT: file "main.carbon" { +// CHECK:STDOUT: --- main.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "raw_main.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- raw_main.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/implicit_imports.carbon b/toolchain/check/testdata/packages/implicit_imports.carbon index 5c9d9a4da679..19b7785fb38e 100644 --- a/toolchain/check/testdata/packages/implicit_imports.carbon +++ b/toolchain/check/testdata/packages/implicit_imports.carbon @@ -43,30 +43,60 @@ library "lib" api; library "lib" impl; -// CHECK:STDOUT: file "api_only.carbon" { +// CHECK:STDOUT: --- api_only.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "api_only_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- api_only_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "with_impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- with_impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "with_impl.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- with_impl.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %WithImpl: = bind_name WithImpl, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "with_impl_extra.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- with_impl_extra.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %WithImpl: = bind_name WithImpl, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "with_impl_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- with_impl_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "with_impl_lib.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- with_impl_lib.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %WithImpl: = bind_name WithImpl, %import // CHECK:STDOUT: } -// CHECK:STDOUT: file "main.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } -// CHECK:STDOUT: file "main_lib.impl.carbon" { +// CHECK:STDOUT: +// CHECK:STDOUT: --- main_lib.impl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 2d07529ee533..1f9a9093149c 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -9,11 +9,13 @@ fn F() -> i32 { return *&*&n; } +// CHECK:STDOUT: --- address_of_deref.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc9: type = ptr_type i32 // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "address_of_deref.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -31,3 +33,4 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc9_10.2: i32 = bind_value %.loc9_10.1 // CHECK:STDOUT: return %.loc9_10.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index c9b685635f9d..7da8c2b72dcf 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -16,6 +16,8 @@ fn F() { var t1: i32* = &t[1]; } +// CHECK:STDOUT: --- address_of_lvalue.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc8: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc14_19.1: type = tuple_type (type, type) @@ -23,7 +25,7 @@ fn F() { // CHECK:STDOUT: %.loc14_19.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "address_of_lvalue.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -95,3 +97,4 @@ fn F() { // CHECK:STDOUT: assign %t1.var, %.loc16_18 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 4e0ad5b8938d..e164ea578c51 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -11,7 +11,9 @@ fn F() -> i32 { return *p; } -// CHECK:STDOUT: file "basic.carbon" { +// CHECK:STDOUT: --- basic.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -33,3 +35,4 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc11_10.2: i32 = bind_value %.loc11_10.1 // CHECK:STDOUT: return %.loc11_10.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index f2b0faad665e..735faf9cb6de 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -18,12 +18,14 @@ fn Test() { &(&undeclared); } +// CHECK:STDOUT: --- fail_address_of_error.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc11: type = ptr_type // CHECK:STDOUT: %.loc18: type = ptr_type * // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_address_of_error.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Test: = fn_decl @Test // CHECK:STDOUT: } // CHECK:STDOUT: @@ -36,3 +38,4 @@ fn Test() { // CHECK:STDOUT: %.loc18_3: ** = address_of %.loc18_5 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 026bb0a81d6e..8c74dbd3a036 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -82,6 +82,8 @@ fn AddressOfParam(param: i32) { var param_addr: i32* = ¶m; } +// CHECK:STDOUT: --- fail_address_of_value.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = ptr_type i32 // CHECK:STDOUT: %.loc19: type = ptr_type bool @@ -93,7 +95,7 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: %.loc64: type = ptr_type type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_address_of_value.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H // CHECK:STDOUT: %AddressOfLiteral: = fn_decl @AddressOfLiteral @@ -186,3 +188,4 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: assign %param_addr.var, %.loc82_26 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index cb514450216a..ef9906811c4a 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -9,8 +9,11 @@ // CHECK:STDERR: ^~~~~~~~~~ let n: i32 = *undeclared; -// CHECK:STDOUT: file "fail_deref_error.carbon" { +// CHECK:STDOUT: --- fail_deref_error.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %undeclared.ref: = name_ref undeclared, // CHECK:STDOUT: %.loc10: ref = deref // CHECK:STDOUT: %n: i32 = bind_name n, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_function.carbon b/toolchain/check/testdata/pointer/fail_deref_function.carbon index cedbbc264b91..68ad8a678a7f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -11,7 +11,9 @@ fn A() { *A; } -// CHECK:STDOUT: file "fail_deref_function.carbon" { +// CHECK:STDOUT: --- fail_deref_function.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -21,3 +23,4 @@ fn A() { // CHECK:STDOUT: %.loc11: ref = deref // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index 28208e437d4e..cfbc5c04a20d 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -13,7 +13,9 @@ fn F() { *A; } -// CHECK:STDOUT: file "fail_deref_namespace.carbon" { +// CHECK:STDOUT: --- fail_deref_namespace.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7: = namespace {} // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } @@ -24,3 +26,4 @@ fn F() { // CHECK:STDOUT: %.loc13: ref = deref // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index 8cd00735841b..301b183eadea 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -19,12 +19,14 @@ fn Deref(n: i32) { *{}; } +// CHECK:STDOUT: --- fail_deref_not_pointer.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15: type = tuple_type () // CHECK:STDOUT: %.loc19: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_deref_not_pointer.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Deref: = fn_decl @Deref // CHECK:STDOUT: } // CHECK:STDOUT: @@ -42,3 +44,4 @@ fn Deref(n: i32) { // CHECK:STDOUT: %.loc19_3: ref = deref %.loc19_5.3 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 662cc71f3f45..4c97b5cd4615 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -12,8 +12,11 @@ // CHECK:STDERR: ^ var p: *i32; -// CHECK:STDOUT: file "fail_deref_type.carbon" { +// CHECK:STDOUT: --- fail_deref_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc13: ref = deref i32 // CHECK:STDOUT: %p.var: ref = var p // CHECK:STDOUT: %p: ref = bind_name p, %p.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index c349bb06c4f4..35d6f33ee5a1 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -11,11 +11,13 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { return p; } +// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_type_mismatch.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch // CHECK:STDOUT: } // CHECK:STDOUT: @@ -24,3 +26,4 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: %p.ref: const {}* = name_ref p, %p // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index c7c75429f5de..b3a11be6ab52 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -9,7 +9,9 @@ fn F(p: const (const (const i32*)*)) -> const i32 { return **p; } -// CHECK:STDOUT: file "nested_const.carbon" { +// CHECK:STDOUT: --- nested_const.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -22,3 +24,4 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: %.loc9_10.2: const i32 = bind_value %.loc9_10.1 // CHECK:STDOUT: return %.loc9_10.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 75f61b925839..e0c7852469ea 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -12,7 +12,9 @@ fn ConstPtr(p: const i32*) -> (const i32)* { return p; } -// CHECK:STDOUT: file "types.carbon" { +// CHECK:STDOUT: --- types.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Ptr: = fn_decl @Ptr // CHECK:STDOUT: %ConstPtr: = fn_decl @ConstPtr // CHECK:STDOUT: } @@ -28,3 +30,4 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %p.ref: const i32* = name_ref p, %p // CHECK:STDOUT: return %p.ref // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index cd76aa397269..50b3d4e8bb66 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -9,7 +9,9 @@ fn Main() { var n: i32 = 1 + 1; } -// CHECK:STDOUT: file "code_after_return.carbon" { +// CHECK:STDOUT: --- code_after_return.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -17,3 +19,4 @@ fn Main() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index e30c25145ebb..20e5e85273bf 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -16,7 +16,9 @@ fn F(b: bool) -> i32 { // Unreachable, no error on missing return. } -// CHECK:STDOUT: file "code_after_return_value.carbon" { +// CHECK:STDOUT: --- code_after_return_value.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -25,3 +27,4 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: return %.loc8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index 3fc14d515a4b..3b98b531d85b 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -12,7 +12,9 @@ fn ReturnType() -> type { return i32; } // CHECK:STDERR: ^ fn Six() -> ReturnType() { return 6; } -// CHECK:STDOUT: file "fail_call_in_type.carbon" { +// CHECK:STDOUT: --- fail_call_in_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } @@ -27,3 +29,4 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: %.loc13: i32 = int_literal 6 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index 5a9d3b2d2616..def89d952c42 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -9,8 +9,11 @@ // CHECK:STDERR: ^ fn Six() -> x; -// CHECK:STDOUT: file "fail_error_in_type.carbon" { +// CHECK:STDOUT: --- fail_error_in_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Six() -> ; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_let_in_type.carbon b/toolchain/check/testdata/return/fail_let_in_type.carbon index e8e55b12cf52..4d2354faf8fd 100644 --- a/toolchain/check/testdata/return/fail_let_in_type.carbon +++ b/toolchain/check/testdata/return/fail_let_in_type.carbon @@ -11,7 +11,9 @@ let x: type = i32; // CHECK:STDERR: ^ fn Six() -> x { return 6; } -// CHECK:STDOUT: file "fail_let_in_type.carbon" { +// CHECK:STDOUT: --- fail_let_in_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x: type = bind_name x, i32 // CHECK:STDOUT: %Six: = fn_decl @Six // CHECK:STDOUT: } @@ -21,3 +23,4 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: %.loc12: i32 = int_literal 6 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 24c57f4f44fb..df84031cbd76 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -10,10 +10,13 @@ fn Main() -> i32 { // CHECK:STDERR: ^ } -// CHECK:STDOUT: file "fail_missing_return.carbon" { +// CHECK:STDOUT: --- fail_missing_return.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index a5538d86edf7..dd45a651c773 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -10,14 +10,17 @@ fn F() -> () { // CHECK:STDERR: ^ } +// CHECK:STDOUT: --- fail_missing_return_empty_tuple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_missing_return_empty_tuple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> () { // CHECK:STDOUT: !entry: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon index e50661ba6a48..0f09fc96a305 100644 --- a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon @@ -11,7 +11,9 @@ fn Procedure() -> i32 { return var; } -// CHECK:STDOUT: file "fail_return_var_no_returned_var.carbon" { +// CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Procedure: = fn_decl @Procedure // CHECK:STDOUT: } // CHECK:STDOUT: @@ -19,3 +21,4 @@ fn Procedure() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon index b06b632e0e80..52785e966ea0 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -27,12 +27,14 @@ fn G() -> C { return c; } +// CHECK:STDOUT: --- fail_return_with_returned_var.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc18_35.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc18_35.2: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_return_with_returned_var.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C @@ -79,3 +81,4 @@ fn G() -> C { // CHECK:STDOUT: %c.ref: ref C = name_ref c, %c // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon index b05bef35a870..83789494fd84 100644 --- a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon @@ -15,11 +15,13 @@ fn Procedure() { return; } +// CHECK:STDOUT: --- fail_returned_var_no_return_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc14: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_returned_var_no_return_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Procedure: = fn_decl @Procedure // CHECK:STDOUT: } // CHECK:STDOUT: @@ -32,3 +34,4 @@ fn Procedure() { // CHECK:STDOUT: assign , // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index f2b3054b588e..a6057de1c502 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -34,7 +34,9 @@ fn DifferentScopes() -> i32 { return 0; } -// CHECK:STDOUT: file "fail_returned_var_shadow.carbon" { +// CHECK:STDOUT: --- fail_returned_var_shadow.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %SameScope: = fn_decl @SameScope // CHECK:STDOUT: %DifferentScopes: = fn_decl @DifferentScopes // CHECK:STDOUT: } @@ -87,3 +89,4 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: %.loc34: i32 = int_literal 0 // CHECK:STDOUT: return %.loc34 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 7a7b73cbbe24..c747645516c0 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -15,7 +15,9 @@ fn Mismatch() -> i32 { return var; } -// CHECK:STDOUT: file "fail_returned_var_type.carbon" { +// CHECK:STDOUT: --- fail_returned_var_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch // CHECK:STDOUT: } // CHECK:STDOUT: @@ -26,3 +28,4 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: assign , // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 23f44c73b69a..4a6746295973 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -11,7 +11,9 @@ fn Main() -> i32 { return 1.0; } -// CHECK:STDOUT: file "fail_type_mismatch.carbon" { +// CHECK:STDOUT: --- fail_type_mismatch.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc11: f64 = real_literal 10e-1 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index fd71dd4b499b..722a9c7ff7d6 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -14,7 +14,9 @@ fn Main() { return 0; } -// CHECK:STDOUT: file "fail_value_disallowed.carbon" { +// CHECK:STDOUT: --- fail_value_disallowed.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -23,3 +25,4 @@ fn Main() { // CHECK:STDOUT: %.loc14: i32 = int_literal 0 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index b74f750d76ed..58ae6547c7be 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -14,7 +14,9 @@ fn Main() -> i32 { return; } -// CHECK:STDOUT: file "fail_value_missing.carbon" { +// CHECK:STDOUT: --- fail_value_missing.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -22,3 +24,4 @@ fn Main() -> i32 { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index 8d14969fd430..98a099adc2d9 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -10,7 +10,9 @@ var x: type = i32; // CHECK:STDERR: ^ fn Six() -> x { return 6; } -// CHECK:STDOUT: file "fail_var_in_type.carbon" { +// CHECK:STDOUT: --- fail_var_in_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: assign %x.var, i32 @@ -22,3 +24,4 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: %.loc11: i32 = int_literal 6 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/missing_return_no_return_type.carbon b/toolchain/check/testdata/return/missing_return_no_return_type.carbon index 5a08b6c94ac1..3cd896faa221 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -7,7 +7,9 @@ fn F() { } -// CHECK:STDOUT: file "missing_return_no_return_type.carbon" { +// CHECK:STDOUT: --- missing_return_no_return_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -15,3 +17,4 @@ fn F() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index c0cfbc2fc3f9..4721164d8e82 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -8,7 +8,9 @@ fn Main() { return; } -// CHECK:STDOUT: file "no_value.carbon" { +// CHECK:STDOUT: --- no_value.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -16,3 +18,4 @@ fn Main() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 6c92184481b0..6c1e3cc60609 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -19,12 +19,14 @@ fn G() -> i32 { return var; } +// CHECK:STDOUT: --- returned_var.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_1.1: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_1.2: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "returned_var.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @C, () // CHECK:STDOUT: %C: type = class_type @C // CHECK:STDOUT: %F: = fn_decl @F @@ -70,3 +72,4 @@ fn G() -> i32 { // CHECK:STDOUT: %.loc18_16: i32 = bind_value %result // CHECK:STDOUT: return %.loc18_16 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 62ec1e5c29c9..238f5a60b284 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -23,7 +23,9 @@ fn EnclosingButAfter(b: bool) -> i32 { return var; } -// CHECK:STDOUT: file "returned_var_scope.carbon" { +// CHECK:STDOUT: --- returned_var_scope.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes // CHECK:STDOUT: %EnclosingButAfter: = fn_decl @EnclosingButAfter // CHECK:STDOUT: } @@ -77,3 +79,4 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: %.loc22_16: i32 = bind_value %w // CHECK:STDOUT: return %.loc22_16 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index 247f4f433bf7..540d92205460 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -8,7 +8,9 @@ fn Main() -> {.a: i32} { return {.a = 3}; } -// CHECK:STDOUT: file "struct.carbon" { +// CHECK:STDOUT: --- struct.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: %.loc8_17.3: {.a: i32} = converted %.loc8_17.1, %.loc8_17.2 // CHECK:STDOUT: return %.loc8_17.3 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index b1ff4682f005..05bbca23eb6a 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -9,13 +9,15 @@ fn Main() -> (i32, i32) { return (15, 35); } +// CHECK:STDOUT: --- tuple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc8_23.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc8_23.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc8_23.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "tuple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -32,3 +34,4 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: %.loc9_17.7: init (i32, i32) = converted %.loc9_17.1, %.loc9_17.6 // CHECK:STDOUT: return %.loc9_17.7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index feb24d61ffa9..9394f8361304 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -8,7 +8,9 @@ fn Main() -> i32 { return 0; } -// CHECK:STDOUT: file "value.carbon" { +// CHECK:STDOUT: --- value.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -17,3 +19,4 @@ fn Main() -> i32 { // CHECK:STDOUT: %.loc8: i32 = int_literal 0 // CHECK:STDOUT: return %.loc8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 1fb9d6a7684f..5e80aa46868d 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -7,12 +7,14 @@ var x: {} = {}; var y: {} = x; +// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_9.1: type = struct_type {} // CHECK:STDOUT: %.loc7_9.2: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.loc7_9.1 // CHECK:STDOUT: %x.var: ref {} = var x @@ -30,3 +32,4 @@ var y: {} = x; // CHECK:STDOUT: %.loc8_13.2: init {} = converted %x.ref, %.loc8_13.1 // CHECK:STDOUT: assign %y.var, %.loc8_13.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 49256d96acc7..ff61fca870a4 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -10,7 +10,9 @@ // CHECK:STDERR: ^ fn F() { a.b; } -// CHECK:STDOUT: file "fail_access_into_invalid.carbon" { +// CHECK:STDOUT: --- fail_access_into_invalid.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } // CHECK:STDOUT: @@ -19,3 +21,4 @@ fn F() { a.b; } // CHECK:STDOUT: %a.ref: = name_ref a, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 374976008cad..447fb42337b3 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -9,14 +9,17 @@ // CHECK:STDERR: ^ var x: {.a: i32} = {}; +// CHECK:STDOUT: --- fail_assign_empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var // CHECK:STDOUT: %.loc10_21: {} = struct_literal () // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index cb50d17f93ea..5146c08cd2f3 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -9,6 +9,8 @@ // CHECK:STDERR: ^ var x: {.a: {}} = {.b = {}}; +// CHECK:STDOUT: --- fail_assign_nested.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_14.1: type = struct_type {} // CHECK:STDOUT: %.loc10_14.2: type = tuple_type () @@ -16,7 +18,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: %.loc10_27: type = struct_type {.b: {}} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_nested.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.loc10_14.1 // CHECK:STDOUT: %.loc10_15: type = struct_type {.a: {}} @@ -26,3 +28,4 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: %.loc10_27: {.b: {}} = struct_literal (%.loc10_26) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index 72644f492655..4869374cb579 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -9,13 +9,15 @@ // CHECK:STDERR: ^ var x: {} = {.a = 1}; +// CHECK:STDOUT: --- fail_assign_to_empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_9.1: type = struct_type {} // CHECK:STDOUT: %.loc10_9.2: type = tuple_type () // CHECK:STDOUT: %.loc10_20: type = struct_type {.a: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_to_empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.loc10_9.1 // CHECK:STDOUT: %x.var: ref {} = var x @@ -24,3 +26,4 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: %.loc10_20: {.a: i32} = struct_literal (%.loc10_19) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 9cd9ef40c2b2..16f557300139 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -44,12 +44,14 @@ var x: {.a: i32} = {.a = 1, .a = 2}; // CHECK:STDERR: ^ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; +// CHECK:STDOUT: --- fail_duplicate_name.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc21: type = struct_type {.a: i32} // CHECK:STDOUT: %.loc45: type = ptr_type {.b: i32, .c: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_duplicate_name.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %.loc21_35: i32 = int_literal 1 // CHECK:STDOUT: %.loc21_36: {.a: i32} = struct_literal (%.loc21_35) @@ -72,3 +74,4 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> ; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 6e16df1496fa..58d0d9c1d0d8 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -14,11 +14,13 @@ var x: {.a: i32} = {.b = 1}; // CHECK:STDERR: ^ var y: {.b: i32} = x; +// CHECK:STDOUT: --- fail_field_name_mismatch.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {.b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_field_name_mismatch.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var @@ -31,3 +33,4 @@ var y: {.b: i32} = x; // CHECK:STDOUT: %x.ref: ref {.a: i32} = name_ref x, %x // CHECK:STDOUT: assign %y.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index 100081621ce6..dcdabb8c8255 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -9,11 +9,13 @@ // CHECK:STDERR: ^ var x: {.a: i32} = {.b = 1.0}; +// CHECK:STDOUT: --- fail_field_type_mismatch.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {.b: f64} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_field_type_mismatch.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var @@ -21,3 +23,4 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: %.loc10_29: {.b: f64} = struct_literal (%.loc10_26) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 2cc0db7d84de..a7df0376f1e3 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -10,7 +10,9 @@ var x: {.a: f64} = {.a = 4.0}; // CHECK:STDERR: ^ var y: i32 = x.b; -// CHECK:STDOUT: file "fail_member_access_type.carbon" { +// CHECK:STDOUT: --- fail_member_access_type.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: f64} // CHECK:STDOUT: %x.var: ref {.a: f64} = var x // CHECK:STDOUT: %x: ref {.a: f64} = bind_name x, %x.var @@ -24,3 +26,4 @@ var y: i32 = x.b; // CHECK:STDOUT: %x.ref: ref {.a: f64} = name_ref x, %x // CHECK:STDOUT: assign %y.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_member_of_function.carbon b/toolchain/check/testdata/struct/fail_member_of_function.carbon index 6aa7fbec5a9d..f7f2bf11a378 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -11,7 +11,9 @@ fn A() { A.y; } -// CHECK:STDOUT: file "fail_member_of_function.carbon" { +// CHECK:STDOUT: --- fail_member_of_function.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn A() { // CHECK:STDOUT: %A.ref: = name_ref A, file.%A // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index e2fb4c471784..39982d8e4915 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -19,11 +19,13 @@ var s: {.a: Incomplete}; // CHECK:STDERR: ^ var p: Incomplete* = &s.a; +// CHECK:STDOUT: --- fail_nested_incomplete.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc20: type = ptr_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_nested_incomplete.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete @@ -40,3 +42,4 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Incomplete; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index 04d518af3dda..47cfb5b0ef44 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -10,7 +10,9 @@ var x: {.a: i32} = {.a = 4}; // CHECK:STDERR: ^ var y: i32 = x.b; -// CHECK:STDOUT: file "fail_non_member_access.carbon" { +// CHECK:STDOUT: --- fail_non_member_access.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var @@ -24,3 +26,4 @@ var y: i32 = x.b; // CHECK:STDOUT: %x.ref: ref {.a: i32} = name_ref x, %x // CHECK:STDOUT: assign %y.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index a545b19789a7..0433154d1c3e 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -9,12 +9,14 @@ // CHECK:STDERR: ^ var x: {.a: i32, .b: i32} = {.a = 1}; +// CHECK:STDOUT: --- fail_too_few_values.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_25: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: %.loc10_36: type = struct_type {.a: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_too_few_values.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_25: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var @@ -22,3 +24,4 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: %.loc10_36: {.a: i32} = struct_literal (%.loc10_35) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index dd822a5d93d5..fb1094cc4824 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -9,10 +9,13 @@ // CHECK:STDERR: ^ var x: {.a: i32} = {.a: i32}; -// CHECK:STDOUT: file "fail_type_assign.carbon" { +// CHECK:STDOUT: --- fail_type_assign.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var // CHECK:STDOUT: %.loc10_28: type = struct_type {.a: i32} // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index e49925d835da..30271be6d67a 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -9,13 +9,16 @@ // CHECK:STDERR: ^ var x: {.a = 1}; +// CHECK:STDOUT: --- fail_value_as_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_value_as_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_15: {.a: i32} = struct_literal (%.loc10_14) // CHECK:STDOUT: %x.var: ref = var x // CHECK:STDOUT: %x: ref = bind_name x, %x.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index f1eb8d9ea3a8..26c512d213d6 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -10,6 +10,8 @@ fn F() -> i32 { return {.a = 1, .b = G(), .c = 3}.b.y; } +// CHECK:STDOUT: --- literal_member_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type {.x: i32, .y: i32, .z: i32} // CHECK:STDOUT: %.loc10_35.1: type = struct_type {.a: i32, .b: {.x: i32, .y: i32, .z: i32}, .c: i32} @@ -17,7 +19,7 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc10_35.3: type = ptr_type {.a: i32, .b: {.x: i32, .y: i32, .z: i32}*, .c: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "literal_member_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: } @@ -47,3 +49,4 @@ fn F() -> i32 { // CHECK:STDOUT: %.loc10_38: i32 = struct_access %.loc10_36, member1 // CHECK:STDOUT: return %.loc10_38 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 74af0092597a..41097437278c 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -8,11 +8,13 @@ var x: {.a: f64, .b: i32} = {.a = 0.0, .b = 1}; var y: i32 = x.b; var z: i32 = y; +// CHECK:STDOUT: --- member_access.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type {.a: f64, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "member_access.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: f64, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: f64, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: f64, .b: i32} = bind_name x, %x.var @@ -38,3 +40,4 @@ var z: i32 = y; // CHECK:STDOUT: %.loc9: i32 = bind_value %y.ref // CHECK:STDOUT: assign %z.var, %.loc9 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index 0a3974a0ab40..cfee9a5d1653 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -10,6 +10,8 @@ fn G() { var v: {.a: (i32, i32, i32), .b: (i32, i32, i32)} = {.a = F(), .b = F()}; } +// CHECK:STDOUT: --- nested_struct_in_place.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_25.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc7_25.2: type = tuple_type (i32, i32, i32) @@ -18,7 +20,7 @@ fn G() { // CHECK:STDOUT: %.loc10_51.2: type = ptr_type {.a: (i32, i32, i32)*, .b: (i32, i32, i32)*} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested_struct_in_place.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: } @@ -46,3 +48,4 @@ fn G() { // CHECK:STDOUT: assign %v.var, %.loc10_74.5 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index 394e19f7d1d7..9cb34447ecdb 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -7,7 +7,9 @@ var x: {.a: i32} = {.a = 4}; var y: {.a: i32} = x; -// CHECK:STDOUT: file "one_entry.carbon" { +// CHECK:STDOUT: --- one_entry.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var @@ -26,3 +28,4 @@ var y: {.a: i32} = x; // CHECK:STDOUT: %.loc8_20.4: init {.a: i32} = converted %x.ref, %.loc8_20.3 // CHECK:STDOUT: assign %y.var, %.loc8_20.4 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index aa2c2ba390d9..ed0809fab1e5 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -13,13 +13,15 @@ fn F() -> {.a: i32, .b: f64} { return y; } +// CHECK:STDOUT: --- reorder_fields.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = ptr_type {.a: i32, .b: f64} // CHECK:STDOUT: %.loc11_62.1: type = struct_type {.b: f64, .a: i32} // CHECK:STDOUT: %.loc11_62.2: type = ptr_type {.b: f64, .a: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "reorder_fields.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 // CHECK:STDOUT: %MakeF64: = fn_decl @MakeF64 // CHECK:STDOUT: %F: = fn_decl @F @@ -62,3 +64,4 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: %.loc13_10.8: init {.a: i32, .b: f64} = converted %y.ref, %.loc13_10.7 // CHECK:STDOUT: return %.loc13_10.8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 5e53905edd3f..4e9ee478f385 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -7,13 +7,15 @@ var x: {.a: i32, .b: (i32,)} = {.a = 1, .b = (2,)}; var y: {.a: i32, .b: (i32,)} = x; +// CHECK:STDOUT: --- tuple_as_element.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_27.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_27.2: type = tuple_type (i32) // CHECK:STDOUT: %.loc7_28: type = ptr_type {.a: i32, .b: (i32,)} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "tuple_as_element.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_27.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_27.2: type = converted %.loc7_27.1, constants.%.loc7_27.2 // CHECK:STDOUT: %.loc7_28: type = struct_type {.a: i32, .b: (i32,)} @@ -53,3 +55,4 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: %.loc8_32.13: init {.a: i32, .b: (i32,)} = converted %x.ref, %.loc8_32.12 // CHECK:STDOUT: assign %y.var, %.loc8_32.13 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index 8b41cc48dd02..f51679b6c88f 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -7,11 +7,13 @@ var x: {.a: i32, .b: i32} = {.a = 1, .b = 2}; var y: {.a: i32, .b: i32} = x; +// CHECK:STDOUT: --- two_entries.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = ptr_type {.a: i32, .b: i32} // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "two_entries.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: i32, .b: i32} // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var @@ -41,3 +43,4 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: %.loc8_29.10: init {.a: i32, .b: i32} = converted %x.ref, %.loc8_29.9 // CHECK:STDOUT: assign %y.var, %.loc8_29.10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/empty.carbon b/toolchain/check/testdata/tuples/empty.carbon index d45fabc4d3e1..54de4c08c6a4 100644 --- a/toolchain/check/testdata/tuples/empty.carbon +++ b/toolchain/check/testdata/tuples/empty.carbon @@ -7,11 +7,13 @@ var x: () = (); var y: () = x; +// CHECK:STDOUT: --- empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.loc7 // CHECK:STDOUT: %x.var: ref () = var x @@ -29,3 +31,4 @@ var y: () = x; // CHECK:STDOUT: %.loc8_13.2: init () = converted %x.ref, %.loc8_13.1 // CHECK:STDOUT: assign %y.var, %.loc8_13.2 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_assign_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_empty.carbon index 796245e8a50a..34207259d433 100644 --- a/toolchain/check/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_empty.carbon @@ -9,13 +9,15 @@ // CHECK:STDERR: ^ var x: (i32,) = (); +// CHECK:STDOUT: --- fail_assign_empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc10_13.2: type = tuple_type (i32) // CHECK:STDOUT: %.loc10_18: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_13.2: type = converted %.loc10_13.1, constants.%.loc10_13.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x @@ -23,3 +25,4 @@ var x: (i32,) = (); // CHECK:STDOUT: %.loc10_18: () = tuple_literal () // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_assign_nested.carbon b/toolchain/check/testdata/tuples/fail_assign_nested.carbon index c1c6bfb9fd71..70fa384509ca 100644 --- a/toolchain/check/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_nested.carbon @@ -9,6 +9,8 @@ // CHECK:STDERR: ^ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); +// CHECK:STDOUT: --- fail_assign_nested.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_18: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_31.1: type = tuple_type ((type, type), (type, type)) @@ -21,7 +23,7 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: %.loc10_56: type = tuple_type ((i32, i32, i32), (i32, i32, i32)) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_nested.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_18: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_30: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_31.1: ((type, type), (type, type)) = tuple_literal (%.loc10_18, %.loc10_30) @@ -41,3 +43,4 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: %.loc10_56: ((i32, i32, i32), (i32, i32, i32)) = tuple_literal (%.loc10_44, %.loc10_55) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon index 7e8176fe7ca0..1ee42cfc22a0 100644 --- a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon @@ -9,11 +9,13 @@ // CHECK:STDERR: ^ var x: () = (66); +// CHECK:STDOUT: --- fail_assign_to_empty.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_assign_to_empty.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.loc10 // CHECK:STDOUT: %x.var: ref () = var x @@ -21,3 +23,4 @@ var x: () = (66); // CHECK:STDOUT: %.loc10_14: i32 = int_literal 66 // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon index b2842b206b81..455f3cf17dc1 100644 --- a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon @@ -9,6 +9,8 @@ // CHECK:STDERR: ^ var x: (i32, i32) = (2, 65.89); +// CHECK:STDOUT: --- fail_element_type_mismatch.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_17.2: type = tuple_type (i32, i32) @@ -16,7 +18,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: %.loc10_30: type = tuple_type (i32, f64) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_element_type_mismatch.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x @@ -28,3 +30,4 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: %.loc10_30.3: init i32 = initialize_from %.loc10_22 to %.loc10_30.2 // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon index bab46cb9552c..0580411ba94a 100644 --- a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon @@ -19,13 +19,15 @@ var t: (i32, Incomplete); // CHECK:STDERR: ^ var p: Incomplete* = &t[1]; +// CHECK:STDOUT: --- fail_nested_incomplete.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc15_24.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc15_24.2: type = tuple_type (i32, Incomplete) // CHECK:STDOUT: %.loc20: type = ptr_type // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_nested_incomplete.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete: type = class_type @Incomplete // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete @@ -44,3 +46,4 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Incomplete; +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_too_few_element.carbon b/toolchain/check/testdata/tuples/fail_too_few_element.carbon index e53b4574c1ff..680d37e54c74 100644 --- a/toolchain/check/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuples/fail_too_few_element.carbon @@ -9,6 +9,8 @@ // CHECK:STDERR: ^ var x: (i32, i32) = (2, ); +// CHECK:STDOUT: --- fail_too_few_element.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc10_17.2: type = tuple_type (i32, i32) @@ -16,7 +18,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: %.loc10_25: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_too_few_element.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x @@ -25,3 +27,4 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: %.loc10_25: (i32,) = tuple_literal (%.loc10_22) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_type_assign.carbon b/toolchain/check/testdata/tuples/fail_type_assign.carbon index 18af13f5f5e4..43f6180a2347 100644 --- a/toolchain/check/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuples/fail_type_assign.carbon @@ -9,12 +9,14 @@ // CHECK:STDERR: ^ var x: (i32, ) = (i32, ); +// CHECK:STDOUT: --- fail_type_assign.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_14.1: type = tuple_type (type) // CHECK:STDOUT: %.loc10_14.2: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_type_assign.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.loc10_14.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x @@ -22,3 +24,4 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: %.loc10_24: (type,) = tuple_literal (i32) // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/fail_value_as_type.carbon b/toolchain/check/testdata/tuples/fail_value_as_type.carbon index 030fd734663e..377137344413 100644 --- a/toolchain/check/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuples/fail_value_as_type.carbon @@ -9,15 +9,18 @@ // CHECK:STDERR: ^ var x: (1, ); +// CHECK:STDOUT: --- fail_value_as_type.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc10_12.1: type = tuple_type (i32) // CHECK:STDOUT: %.loc10_12.2: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_value_as_type.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 // CHECK:STDOUT: %.loc10_12.1: (i32,) = tuple_literal (%.loc10_9) // CHECK:STDOUT: %.loc10_12.2: type = converted %.loc10_12.1, constants.%.loc10_12.2 // CHECK:STDOUT: %x.var: ref (,) = var x // CHECK:STDOUT: %x: ref (,) = bind_name x, %x.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/nested_tuple.carbon b/toolchain/check/testdata/tuples/nested_tuple.carbon index 31eac4146ee7..e50dc96db55f 100644 --- a/toolchain/check/testdata/tuples/nested_tuple.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple.carbon @@ -6,6 +6,8 @@ var x: ((i32, i32), i32) = ((12, 76), 6); +// CHECK:STDOUT: --- nested_tuple.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_18: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_24.1: type = tuple_type ((type, type), type) @@ -16,7 +18,7 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: %.loc7_24.6: type = ptr_type ((i32, i32)*, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested_tuple.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_18: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.1: ((type, type), type) = tuple_literal (%.loc7_18, i32) // CHECK:STDOUT: %.loc7_24.2: type = converted %.loc7_18, constants.%.loc7_24.2 @@ -41,3 +43,4 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: %.loc7_40.6: init ((i32, i32), i32) = converted %.loc7_40.1, %.loc7_40.5 // CHECK:STDOUT: assign %x.var, %.loc7_40.6 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon index 4de0baa8fa38..b6709adb1eb2 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -14,6 +14,8 @@ fn H() { var v: (i32, (i32, i32, i32), i32) = (1, F(), 2); } +// CHECK:STDOUT: --- nested_tuple_in_place.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_25.1: type = tuple_type (type, type, type) // CHECK:STDOUT: %.loc7_25.2: type = tuple_type (i32, i32, i32) @@ -28,7 +30,7 @@ fn H() { // CHECK:STDOUT: %.loc14_36.4: type = ptr_type (i32, (i32, i32, i32)*, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "nested_tuple_in_place.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G // CHECK:STDOUT: %H: = fn_decl @H @@ -82,3 +84,4 @@ fn H() { // CHECK:STDOUT: assign %v.var, %.loc14_50.8 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/one_element.carbon b/toolchain/check/testdata/tuples/one_element.carbon index 30933dec0ff7..ce2a9c7c597a 100644 --- a/toolchain/check/testdata/tuples/one_element.carbon +++ b/toolchain/check/testdata/tuples/one_element.carbon @@ -7,12 +7,14 @@ var x: (i32,) = (4,); var y: (i32,) = x; +// CHECK:STDOUT: --- one_element.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_13.1: type = tuple_type (type) // CHECK:STDOUT: %.loc7_13.2: type = tuple_type (i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "one_element.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.loc7_13.2 // CHECK:STDOUT: %x.var: ref (i32,) = var x @@ -33,3 +35,4 @@ var y: (i32,) = x; // CHECK:STDOUT: %.loc8_17.4: init (i32,) = converted %x.ref, %.loc8_17.3 // CHECK:STDOUT: assign %y.var, %.loc8_17.4 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/tuples/two_elements.carbon b/toolchain/check/testdata/tuples/two_elements.carbon index a1d751e21b99..cfcf00ed1bd5 100644 --- a/toolchain/check/testdata/tuples/two_elements.carbon +++ b/toolchain/check/testdata/tuples/two_elements.carbon @@ -7,13 +7,15 @@ var x: (i32, i32) = (4, 102); var y: (i32, i32) = x; +// CHECK:STDOUT: --- two_elements.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc7_17.1: type = tuple_type (type, type) // CHECK:STDOUT: %.loc7_17.2: type = tuple_type (i32, i32) // CHECK:STDOUT: %.loc7_17.3: type = ptr_type (i32, i32) // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "two_elements.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.loc7_17.2 // CHECK:STDOUT: %x.var: ref (i32, i32) = var x @@ -45,3 +47,4 @@ var y: (i32, i32) = x; // CHECK:STDOUT: %.loc8_21.10: init (i32, i32) = converted %x.ref, %.loc8_21.9 // CHECK:STDOUT: assign %y.var, %.loc8_21.10 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/decl.carbon b/toolchain/check/testdata/var/decl.carbon index 834dddadab2c..728a9a7c2a08 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -8,7 +8,9 @@ fn Main() { var x: i32; } -// CHECK:STDOUT: file "decl.carbon" { +// CHECK:STDOUT: --- decl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -18,3 +20,4 @@ fn Main() { // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index 782acf58fd05..7176d766cec9 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -8,7 +8,9 @@ fn Main() { var x: i32 = 0; } -// CHECK:STDOUT: file "decl_with_init.carbon" { +// CHECK:STDOUT: --- decl_with_init.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -20,3 +22,4 @@ fn Main() { // CHECK:STDOUT: assign %x.var, %.loc8 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 6b7d4f56d071..820d6650a7e4 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -16,7 +16,9 @@ fn Main() { var x: i32 = 0; } -// CHECK:STDOUT: file "fail_duplicate_decl.carbon" { +// CHECK:STDOUT: --- fail_duplicate_decl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -32,3 +34,4 @@ fn Main() { // CHECK:STDOUT: assign %x.var.loc16, %.loc16 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 4c0d7766232a..e4e4c27bd4f8 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -11,7 +11,9 @@ fn Main() { var x: i32 = 1.0; } -// CHECK:STDOUT: file "fail_init_type_mismatch.carbon" { +// CHECK:STDOUT: --- fail_init_type_mismatch.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -23,3 +25,4 @@ fn Main() { // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 1280111c9d0c..71ec7e5d5c7f 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -11,7 +11,9 @@ fn Main() { var x: i32 = x; } -// CHECK:STDOUT: file "fail_init_with_self.carbon" { +// CHECK:STDOUT: --- fail_init_with_self.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -23,3 +25,4 @@ fn Main() { // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index 13239aaecd7f..a80154c57403 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -13,7 +13,9 @@ fn Main() { // CHECK:STDERR: ^ var y: i32 = x; -// CHECK:STDOUT: file "fail_lookup_outside_scope.carbon" { +// CHECK:STDOUT: --- fail_lookup_outside_scope.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: %y.var: ref i32 = var y // CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var @@ -27,3 +29,4 @@ var y: i32 = x; // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_not_copyable.carbon b/toolchain/check/testdata/var/fail_not_copyable.carbon index 85129438925f..7121c6ded818 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -22,6 +22,8 @@ fn F(x: X) { var y: X = x; } +// CHECK:STDOUT: --- fail_not_copyable.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc8_1.1: type = struct_type {} // CHECK:STDOUT: %.loc8_1.2: type = tuple_type () @@ -29,7 +31,7 @@ fn F(x: X) { // CHECK:STDOUT: %.1: type = ptr_type String // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_not_copyable.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: class_decl @X, () // CHECK:STDOUT: %X: type = class_type @X // CHECK:STDOUT: %F: = fn_decl @F @@ -53,3 +55,4 @@ fn F(x: X) { // CHECK:STDOUT: assign %y.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index b931b8501aa7..b4832caf2b38 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -11,7 +11,9 @@ fn Main() { var x: 1 = 1; } -// CHECK:STDOUT: file "fail_storage_is_literal.carbon" { +// CHECK:STDOUT: --- fail_storage_is_literal.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -24,3 +26,4 @@ fn Main() { // CHECK:STDOUT: assign %x.var, // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index b98832938a46..1f7a44ce2eaa 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -6,7 +6,10 @@ var x: i32; -// CHECK:STDOUT: file "global_decl.carbon" { +// CHECK:STDOUT: --- global_decl.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 91c4b6dd7492..181b25e2a566 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -6,9 +6,12 @@ var x: i32 = 0; -// CHECK:STDOUT: file "global_decl_with_init.carbon" { +// CHECK:STDOUT: --- global_decl_with_init.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 // CHECK:STDOUT: assign %x.var, %.loc7 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index e26a84399eb8..c4e52d213725 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -7,7 +7,9 @@ var x: i32 = 0; var y: i32 = x; -// CHECK:STDOUT: file "global_lookup.carbon" { +// CHECK:STDOUT: --- global_lookup.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 @@ -18,3 +20,4 @@ var y: i32 = x; // CHECK:STDOUT: %.loc8: i32 = bind_value %x.ref // CHECK:STDOUT: assign %y.var, %.loc8 // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index 26c5f58e99c2..7a288f756fa2 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -10,7 +10,9 @@ fn Main() { var y: i32 = x; } -// CHECK:STDOUT: file "global_lookup_in_scope.carbon" { +// CHECK:STDOUT: --- global_lookup_in_scope.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 @@ -27,3 +29,4 @@ fn Main() { // CHECK:STDOUT: assign %y.var, %.loc10 // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index d5660f10f063..dcf6c5f23363 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -9,7 +9,9 @@ fn Main() { x; } -// CHECK:STDOUT: file "lookup.carbon" { +// CHECK:STDOUT: --- lookup.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -22,3 +24,4 @@ fn Main() { // CHECK:STDOUT: %x.ref: ref i32 = name_ref x, %x // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index e548bbf5a875..aacb5e93160e 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -14,7 +14,9 @@ fn Main() { } } -// CHECK:STDOUT: file "shadowing.carbon" { +// CHECK:STDOUT: --- shadowing.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %Main: = fn_decl @Main // CHECK:STDOUT: } // CHECK:STDOUT: @@ -40,3 +42,4 @@ fn Main() { // CHECK:STDOUT: !if.else: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index 3cb1b4ddc18f..88acbc078acc 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -26,7 +26,9 @@ fn While() { } } -// CHECK:STDOUT: file "break_continue.carbon" { +// CHECK:STDOUT: --- break_continue.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %A: = fn_decl @A // CHECK:STDOUT: %B: = fn_decl @B // CHECK:STDOUT: %C: = fn_decl @C @@ -144,3 +146,4 @@ fn While() { // CHECK:STDOUT: !while.done.loc17: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index 6433ce5ccc81..0c7965cc9000 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -11,11 +11,13 @@ fn While() { while ("Hello") {} } +// CHECK:STDOUT: --- fail_bad_condition.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.1: type = ptr_type String // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "fail_bad_condition.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %While: = fn_decl @While // CHECK:STDOUT: } // CHECK:STDOUT: @@ -33,3 +35,4 @@ fn While() { // CHECK:STDOUT: !while.done: // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/fail_break_continue.carbon b/toolchain/check/testdata/while/fail_break_continue.carbon index e351580c6b98..55613d1c7a5c 100644 --- a/toolchain/check/testdata/while/fail_break_continue.carbon +++ b/toolchain/check/testdata/while/fail_break_continue.carbon @@ -27,10 +27,13 @@ fn While() { break; } -// CHECK:STDOUT: file "fail_break_continue.carbon" { +// CHECK:STDOUT: --- fail_break_continue.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: %While: = fn_decl @While // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @While() { // CHECK:STDOUT: !entry: // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index 8ff0e7d816c8..d7aaa2b8b7df 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -19,11 +19,13 @@ fn While() { H(); } +// CHECK:STDOUT: --- unreachable_end.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc14: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "unreachable_end.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Cond: = fn_decl @Cond // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G @@ -62,3 +64,4 @@ fn While() { // CHECK:STDOUT: %.loc19: init () = call %H.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 0b34f762b333..d9ed551f616f 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -18,11 +18,13 @@ fn While() { H(); } +// CHECK:STDOUT: --- while.carbon +// CHECK:STDOUT: // CHECK:STDOUT: constants { // CHECK:STDOUT: %.loc14: type = tuple_type () // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: file "while.carbon" { +// CHECK:STDOUT: file { // CHECK:STDOUT: %Cond: = fn_decl @Cond // CHECK:STDOUT: %F: = fn_decl @F // CHECK:STDOUT: %G: = fn_decl @G @@ -61,3 +63,4 @@ fn While() { // CHECK:STDOUT: %.loc18: init () = call %H.ref() // CHECK:STDOUT: return // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index 1bec73cf13ad..80961472ae88 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -6,5 +6,8 @@ // // AUTOUPDATE -// CHECK:STDOUT: file "" { +// CHECK:STDOUT: --- +// CHECK:STDOUT: +// CHECK:STDOUT: file { // CHECK:STDOUT: } +// CHECK:STDOUT: diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index 0ac3aa1eeb45..563615e1d014 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -496,10 +496,17 @@ class Formatter { out_(out), inst_namer_(tokenized_buffer, parse_tree, sem_ir) {} + // Prints the SemIR. + // + // Constants are printed first and may be referenced by later sections, + // including file-scoped instructions. The file scope may contain entity + // declarations which are defined later, such as classes. auto Format() -> void { + out_ << "--- " << sem_ir_.filename() << "\n\n"; + FormatConstants(); - out_ << "file \"" << sem_ir_.filename() << "\" {\n"; + out_ << "file {\n"; // TODO: Handle the case where there are multiple top-level instruction // blocks. For example, there may be branching in the initializer of a // global or a type expression. @@ -516,6 +523,9 @@ class Formatter { for (int i : llvm::seq(sem_ir_.functions().size())) { FormatFunction(FunctionId(i)); } + + // End-of-file newline. + out_ << "\n"; } auto FormatConstants() -> void {