From 064123d93f61bb198d4a28194225ef9329fff7da Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Thu, 29 Feb 2024 15:51:32 -0800 Subject: [PATCH] If a SemIR instruction has a braced block and a constant value, print the constant value first. (#3734) --- .../testdata/alias/alias_of_alias.carbon | 4 +- .../check/testdata/alias/builtins.carbon | 4 +- .../alias/fail_aliased_name_in_diag.carbon | 4 +- .../testdata/alias/fail_bool_value.carbon | 4 +- .../alias/fail_local_in_namespace.carbon | 10 +-- .../testdata/alias/fail_modifiers.carbon | 4 +- .../testdata/alias/fail_name_conflict.carbon | 4 +- .../testdata/alias/fail_not_constant.carbon | 6 +- .../testdata/alias/fail_todo_private.carbon | 4 +- toolchain/check/testdata/alias/import.carbon | 8 +- .../check/testdata/alias/import_order.carbon | 8 +- .../check/testdata/alias/in_namespace.carbon | 12 +-- toolchain/check/testdata/alias/local.carbon | 8 +- .../testdata/array/array_in_place.carbon | 10 +-- .../testdata/array/array_vs_tuple.carbon | 6 +- .../testdata/array/assign_return_value.carbon | 10 +-- .../check/testdata/array/assign_var.carbon | 4 +- toolchain/check/testdata/array/base.carbon | 4 +- .../testdata/array/fail_bound_overflow.carbon | 4 +- .../array/fail_incomplete_element.carbon | 6 +- .../testdata/array/fail_invalid_type.carbon | 4 +- .../testdata/array/fail_out_of_bound.carbon | 4 +- .../fail_out_of_bound_non_literal.carbon | 4 +- .../testdata/array/fail_type_mismatch.carbon | 4 +- .../testdata/array/function_param.carbon | 12 +-- .../testdata/array/index_not_literal.carbon | 4 +- .../check/testdata/array/nine_elements.carbon | 4 +- toolchain/check/testdata/as/as_type.carbon | 2 +- toolchain/check/testdata/as/basic.carbon | 8 +- .../testdata/as/fail_no_conversion.carbon | 2 +- .../check/testdata/as/fail_not_type.carbon | 2 +- toolchain/check/testdata/as/identity.carbon | 20 ++--- toolchain/check/testdata/as/tuple.carbon | 14 ++-- .../testdata/basics/builtin_types.carbon | 4 +- toolchain/check/testdata/basics/empty.carbon | 2 +- .../check/testdata/basics/empty_decl.carbon | 2 +- .../check/testdata/basics/fail_bad_run.carbon | 8 +- .../testdata/basics/fail_bad_run_2.carbon | 8 +- .../testdata/basics/fail_name_lookup.carbon | 6 +- .../basics/fail_non_type_as_type.carbon | 4 +- .../basics/fail_qualifier_unsupported.carbon | 4 +- .../check/testdata/basics/multifile.carbon | 12 +-- .../multifile_raw_and_textual_ir.carbon | 12 +-- .../testdata/basics/numeric_literals.carbon | 6 +- toolchain/check/testdata/basics/parens.carbon | 4 +- .../testdata/basics/raw_and_textual_ir.carbon | 8 +- .../testdata/basics/raw_identifier.carbon | 16 ++-- toolchain/check/testdata/basics/run.carbon | 6 +- .../check/testdata/basics/run_i32.carbon | 8 +- .../check/testdata/basics/textual_ir.carbon | 8 +- toolchain/check/testdata/class/base.carbon | 16 ++-- .../check/testdata/class/base_field.carbon | 12 +-- .../class/base_function_unqualified.carbon | 16 ++-- .../check/testdata/class/base_method.carbon | 20 ++--- .../testdata/class/base_method_shadow.carbon | 28 +++---- toolchain/check/testdata/class/basic.carbon | 22 +++--- .../testdata/class/derived_to_base.carbon | 32 ++++---- .../check/testdata/class/fail_abstract.carbon | 16 ++-- .../testdata/class/fail_addr_not_self.carbon | 14 ++-- .../testdata/class/fail_addr_self.carbon | 18 ++--- .../testdata/class/fail_base_bad_type.carbon | 76 +++++++++---------- .../class/fail_base_method_define.carbon | 18 ++--- .../testdata/class/fail_base_modifiers.carbon | 14 ++-- .../testdata/class/fail_base_no_extend.carbon | 8 +- .../testdata/class/fail_base_repeated.carbon | 12 +-- .../testdata/class/fail_base_unbound.carbon | 8 +- .../class/fail_convert_to_invalid.carbon | 10 +-- .../class/fail_derived_to_base.carbon | 20 ++--- .../class/fail_field_modifiers.carbon | 6 +- .../testdata/class/fail_import_misuses.carbon | 20 ++--- .../testdata/class/fail_incomplete.carbon | 40 +++++----- .../check/testdata/class/fail_init.carbon | 8 +- .../class/fail_init_as_inplace.carbon | 12 +-- .../class/fail_memaccess_category.carbon | 16 ++-- .../testdata/class/fail_member_of_let.carbon | 12 +-- .../check/testdata/class/fail_method.carbon | 16 ++-- .../class/fail_method_modifiers.carbon | 30 ++++---- .../testdata/class/fail_modifiers.carbon | 16 ++-- .../class/fail_out_of_line_decl.carbon | 8 +- .../fail_redeclaration_introducer.carbon | 34 ++++----- .../class/fail_redeclaration_scope.carbon | 22 +++--- .../testdata/class/fail_redefinition.carbon | 18 ++--- .../check/testdata/class/fail_reorder.carbon | 14 ++-- .../check/testdata/class/fail_scope.carbon | 14 ++-- .../check/testdata/class/fail_self.carbon | 32 ++++---- .../testdata/class/fail_todo_generic.carbon | 6 +- .../class/fail_todo_generic_method.carbon | 16 ++-- .../fail_todo_import_forward_decl.carbon | 16 ++-- .../testdata/class/fail_todo_modifiers.carbon | 24 +++--- .../testdata/class/fail_unbound_field.carbon | 14 ++-- .../testdata/class/fail_unknown_member.carbon | 10 +-- .../check/testdata/class/field_access.carbon | 8 +- .../class/field_access_in_value.carbon | 8 +- .../testdata/class/forward_declared.carbon | 10 +-- toolchain/check/testdata/class/import.carbon | 36 ++++----- .../check/testdata/class/import_base.carbon | 26 +++---- .../testdata/class/import_member_cycle.carbon | 14 ++-- .../testdata/class/import_struct_cyle.carbon | 16 ++-- toolchain/check/testdata/class/init.carbon | 14 ++-- toolchain/check/testdata/class/init_as.carbon | 10 +-- .../check/testdata/class/init_nested.carbon | 16 ++-- toolchain/check/testdata/class/method.carbon | 54 ++++++------- toolchain/check/testdata/class/nested.carbon | 12 +-- .../check/testdata/class/nested_name.carbon | 16 ++-- .../check/testdata/class/raw_self.carbon | 22 +++--- .../check/testdata/class/raw_self_type.carbon | 20 ++--- .../check/testdata/class/redeclaration.carbon | 16 ++-- .../class/redeclaration_introducer.carbon | 16 ++-- .../check/testdata/class/reenter_scope.carbon | 18 ++--- toolchain/check/testdata/class/scope.carbon | 20 ++--- toolchain/check/testdata/class/self.carbon | 22 +++--- .../testdata/class/self_conversion.carbon | 28 +++---- .../check/testdata/class/self_type.carbon | 14 ++-- .../check/testdata/class/static_method.carbon | 14 ++-- toolchain/check/testdata/const/basic.carbon | 12 +-- .../check/testdata/const/collapse.carbon | 8 +- .../check/testdata/const/fail_collapse.carbon | 8 +- toolchain/check/testdata/const/import.carbon | 12 +-- .../check/testdata/eval/aggregate.carbon | 4 +- .../check/testdata/eval/fail_aggregate.carbon | 4 +- .../check/testdata/eval/fail_symbolic.carbon | 8 +- toolchain/check/testdata/eval/symbolic.carbon | 8 +- .../expr_category/in_place_tuple_init.carbon | 16 ++-- .../check/testdata/function/call/alias.carbon | 10 +-- .../function/call/empty_struct.carbon | 10 +-- .../testdata/function/call/empty_tuple.carbon | 10 +-- .../function/call/fail_not_callable.carbon | 6 +- .../function/call/fail_param_count.carbon | 16 ++-- .../function/call/fail_param_type.carbon | 10 +-- .../call/fail_return_type_mismatch.carbon | 10 +-- .../check/testdata/function/call/i32.carbon | 10 +-- .../function/call/more_param_ir.carbon | 10 +-- .../testdata/function/call/params_one.carbon | 10 +-- .../function/call/params_one_comma.carbon | 10 +-- .../testdata/function/call/params_two.carbon | 10 +-- .../function/call/params_two_comma.carbon | 10 +-- .../testdata/function/call/params_zero.carbon | 8 +- .../function/call/return_implicit.carbon | 8 +- .../declaration/fail_modifiers.carbon | 16 ++-- .../declaration/fail_param_in_type.carbon | 8 +- .../declaration/fail_param_redecl.carbon | 8 +- .../declaration/fail_todo_modifiers.carbon | 6 +- .../function/declaration/import.carbon | 18 ++--- .../declaration/param_same_name.carbon | 12 +-- .../function/declaration/simple.carbon | 8 +- .../fail_todo_import_forward_decl.carbon | 12 +-- .../function/definition/forward_decl.carbon | 8 +- .../function/definition/import.carbon | 18 ++--- .../testdata/function/definition/order.carbon | 10 +-- .../function/definition/params_one.carbon | 8 +- .../definition/params_one_comma.carbon | 8 +- .../function/definition/params_two.carbon | 8 +- .../definition/params_two_comma.carbon | 8 +- .../function/definition/params_zero.carbon | 6 +- .../generic/fail_todo_param_in_type.carbon | 8 +- .../generic/fail_type_param_mismatch.carbon | 8 +- .../function/generic/type_param.carbon | 8 +- .../function/generic/type_param_scope.carbon | 8 +- .../check/testdata/global/class_obj.carbon | 6 +- .../testdata/global/class_with_fun.carbon | 10 +-- toolchain/check/testdata/global/decl.carbon | 4 +- .../check/testdata/global/simple_init.carbon | 4 +- .../testdata/global/simple_with_fun.carbon | 8 +- toolchain/check/testdata/if/else.carbon | 14 ++-- .../if/fail_reachable_fallthrough.carbon | 16 ++-- toolchain/check/testdata/if/fail_scope.carbon | 8 +- toolchain/check/testdata/if/no_else.carbon | 12 +-- .../if/unreachable_fallthrough.carbon | 8 +- toolchain/check/testdata/if_expr/basic.carbon | 8 +- .../if_expr/constant_condition.carbon | 20 ++--- .../testdata/if_expr/control_flow.carbon | 16 ++-- .../if_expr/fail_not_in_function.carbon | 2 +- .../check/testdata/if_expr/nested.carbon | 8 +- .../check/testdata/if_expr/struct.carbon | 12 +-- toolchain/check/testdata/impl/basic.carbon | 10 +-- .../check/testdata/impl/declaration.carbon | 6 +- toolchain/check/testdata/impl/empty.carbon | 6 +- .../impl/fail_extend_impl_forall.carbon | 18 ++--- .../impl/fail_extend_impl_scope.carbon | 6 +- .../impl/fail_extend_impl_type_as.carbon | 12 +-- .../impl/fail_extend_non_interface.carbon | 6 +- ..._extend_partially_defined_interface.carbon | 8 +- .../fail_extend_undefined_interface.carbon | 8 +- .../testdata/impl/fail_impl_as_scope.carbon | 10 +-- .../impl/fail_impl_bad_interface.carbon | 2 +- .../testdata/impl/fail_impl_bad_type.carbon | 6 +- .../testdata/impl/fail_redefinition.carbon | 6 +- .../impl/fail_todo_extend_impl.carbon | 16 ++-- toolchain/check/testdata/impl/impl_as.carbon | 12 +-- .../check/testdata/impl/impl_forall.carbon | 10 +-- .../check/testdata/impl/redeclaration.carbon | 8 +- .../index/array_element_access.carbon | 4 +- .../check/testdata/index/expr_category.carbon | 16 ++-- .../index/fail_array_large_index.carbon | 4 +- .../index/fail_array_non_int_indexing.carbon | 4 +- .../fail_array_out_of_bound_access.carbon | 4 +- .../index/fail_empty_tuple_access.carbon | 8 +- .../testdata/index/fail_expr_category.carbon | 12 +-- .../testdata/index/fail_invalid_base.carbon | 8 +- .../testdata/index/fail_name_not_found.carbon | 6 +- .../index/fail_non_deterministic_type.carbon | 4 +- .../index/fail_non_tuple_access.carbon | 6 +- .../fail_out_of_bound_not_literal.carbon | 4 +- .../index/fail_tuple_index_error.carbon | 4 +- .../index/fail_tuple_large_index.carbon | 4 +- .../index/fail_tuple_non_int_indexing.carbon | 4 +- .../fail_tuple_out_of_bound_access.carbon | 4 +- .../testdata/index/index_not_literal.carbon | 4 +- .../index/tuple_element_access.carbon | 4 +- .../index/tuple_return_value_access.carbon | 12 +-- .../check/testdata/interface/as_type.carbon | 10 +-- .../check/testdata/interface/basic.carbon | 12 +-- .../fail_add_member_outside_definition.carbon | 16 ++-- .../interface/fail_as_type_of_type.carbon | 10 +-- .../testdata/interface/fail_duplicate.carbon | 18 ++--- .../interface/fail_lookup_undefined.carbon | 18 ++--- .../interface/fail_member_lookup.carbon | 10 +-- .../testdata/interface/fail_modifiers.carbon | 12 +-- .../interface/fail_redeclare_member.carbon | 10 +-- .../fail_todo_define_out_of_line.carbon | 10 +-- .../interface/fail_todo_facet_lookup.carbon | 12 +-- .../interface/fail_todo_generic.carbon | 6 +- .../interface/fail_todo_modifiers.carbon | 12 +-- .../check/testdata/interface/import.carbon | 28 +++---- .../ir/duplicate_name_same_line.carbon | 6 +- toolchain/check/testdata/let/convert.carbon | 8 +- .../testdata/let/fail_duplicate_decl.carbon | 6 +- .../check/testdata/let/fail_generic.carbon | 8 +- .../testdata/let/fail_generic_import.carbon | 6 +- .../check/testdata/let/fail_modifiers.carbon | 2 +- .../testdata/let/fail_todo_modifiers.carbon | 2 +- .../testdata/let/fail_use_in_init.carbon | 6 +- toolchain/check/testdata/let/generic.carbon | 6 +- .../check/testdata/let/generic_import.carbon | 6 +- toolchain/check/testdata/let/global.carbon | 8 +- toolchain/check/testdata/let/import.carbon | 6 +- toolchain/check/testdata/let/local.carbon | 8 +- .../check/testdata/let/shadowed_decl.carbon | 8 +- .../testdata/namespace/add_to_import.carbon | 18 ++--- .../check/testdata/namespace/alias.carbon | 20 ++--- .../fail_conflict_after_merge.carbon | 20 ++--- ...l_conflict_imported_namespace_first.carbon | 18 ++--- ..._conflict_imported_namespace_second.carbon | 14 ++-- ...conflict_in_imports_namespace_first.carbon | 26 +++---- ...onflict_in_imports_namespace_second.carbon | 26 +++---- .../namespace/fail_decl_in_alias.carbon | 10 +-- .../testdata/namespace/fail_duplicate.carbon | 12 +-- .../testdata/namespace/fail_modifiers.carbon | 8 +- .../namespace/fail_unresolved_scope.carbon | 4 +- .../check/testdata/namespace/function.carbon | 14 ++-- .../check/testdata/namespace/imported.carbon | 28 +++---- .../namespace/imported_indirect.carbon | 64 ++++++++-------- .../check/testdata/namespace/merging.carbon | 38 +++++----- .../check/testdata/namespace/nested.carbon | 16 ++-- .../check/testdata/namespace/shadow.carbon | 20 ++--- .../namespace/unqualified_lookup.carbon | 24 +++--- toolchain/check/testdata/operators/and.carbon | 16 ++-- .../testdata/operators/assignment.carbon | 6 +- .../operators/fail_assignment_to_error.carbon | 6 +- .../fail_assignment_to_non_assignable.carbon | 10 +-- .../operators/fail_type_mismatch.carbon | 6 +- .../fail_type_mismatch_assignment.carbon | 6 +- toolchain/check/testdata/operators/or.carbon | 16 ++-- .../check/testdata/operators/unary_op.carbon | 8 +- .../package_expr/fail_not_found.carbon | 6 +- .../check/testdata/package_expr/syntax.carbon | 26 +++---- .../testdata/packages/explicit_imports.carbon | 12 +-- .../packages/fail_api_not_found.carbon | 12 +-- .../fail_conflict_no_namespaces.carbon | 14 ++-- .../check/testdata/packages/fail_cycle.carbon | 12 +-- .../packages/fail_duplicate_api.carbon | 16 ++-- .../testdata/packages/fail_extension.carbon | 20 ++--- .../packages/fail_import_default.carbon | 8 +- .../packages/fail_import_invalid.carbon | 18 ++--- .../packages/fail_import_repeat.carbon | 10 +-- .../packages/fail_import_type_error.carbon | 8 +- .../fail_name_with_import_failure.carbon | 4 +- .../packages/fail_package_main.carbon | 8 +- .../testdata/packages/implicit_imports.carbon | 20 ++--- .../testdata/packages/loaded_global.carbon | 20 ++--- .../packages/unused_lazy_import.carbon | 10 +-- .../testdata/pointer/address_of_deref.carbon | 8 +- .../testdata/pointer/address_of_lvalue.carbon | 6 +- toolchain/check/testdata/pointer/basic.carbon | 8 +- .../pointer/fail_address_of_error.carbon | 6 +- .../pointer/fail_address_of_value.carbon | 26 +++---- .../testdata/pointer/fail_deref_error.carbon | 2 +- .../pointer/fail_deref_function.carbon | 6 +- .../pointer/fail_deref_namespace.carbon | 8 +- .../pointer/fail_deref_not_pointer.carbon | 8 +- .../testdata/pointer/fail_deref_type.carbon | 4 +- .../pointer/fail_type_mismatch.carbon | 8 +- .../check/testdata/pointer/import.carbon | 8 +- .../testdata/pointer/nested_const.carbon | 8 +- toolchain/check/testdata/pointer/types.carbon | 12 +-- .../testdata/return/code_after_return.carbon | 6 +- .../return/code_after_return_value.carbon | 8 +- .../testdata/return/fail_call_in_type.carbon | 12 +-- .../testdata/return/fail_error_in_type.carbon | 8 +- .../return/fail_missing_return.carbon | 8 +- .../fail_missing_return_empty_tuple.carbon | 8 +- .../fail_return_var_no_returned_var.carbon | 8 +- .../fail_return_with_returned_var.carbon | 14 ++-- .../fail_returned_var_no_return_type.carbon | 6 +- .../return/fail_returned_var_shadow.carbon | 12 +-- .../return/fail_returned_var_type.carbon | 8 +- .../testdata/return/fail_type_mismatch.carbon | 8 +- .../return/fail_value_disallowed.carbon | 6 +- .../testdata/return/fail_value_missing.carbon | 8 +- .../testdata/return/fail_var_in_type.carbon | 8 +- .../missing_return_no_return_type.carbon | 6 +- .../check/testdata/return/no_value.carbon | 6 +- .../check/testdata/return/returned_var.carbon | 14 ++-- .../testdata/return/returned_var_scope.carbon | 12 +-- toolchain/check/testdata/return/struct.carbon | 8 +- toolchain/check/testdata/return/tuple.carbon | 8 +- toolchain/check/testdata/return/value.carbon | 8 +- toolchain/check/testdata/struct/empty.carbon | 4 +- .../struct/fail_access_into_invalid.carbon | 6 +- .../testdata/struct/fail_assign_empty.carbon | 4 +- .../testdata/struct/fail_assign_nested.carbon | 4 +- .../struct/fail_assign_to_empty.carbon | 4 +- .../struct/fail_duplicate_name.carbon | 8 +- .../struct/fail_field_name_mismatch.carbon | 4 +- .../struct/fail_field_type_mismatch.carbon | 4 +- .../struct/fail_member_access_type.carbon | 4 +- .../struct/fail_member_of_function.carbon | 6 +- .../struct/fail_nested_incomplete.carbon | 6 +- .../struct/fail_non_member_access.carbon | 4 +- .../struct/fail_too_few_values.carbon | 4 +- .../testdata/struct/fail_type_assign.carbon | 4 +- .../testdata/struct/fail_value_as_type.carbon | 4 +- toolchain/check/testdata/struct/import.carbon | 8 +- .../struct/literal_member_access.carbon | 12 +-- .../testdata/struct/member_access.carbon | 4 +- .../struct/nested_struct_in_place.carbon | 10 +-- .../check/testdata/struct/one_entry.carbon | 4 +- .../testdata/struct/reorder_fields.carbon | 16 ++-- .../testdata/struct/tuple_as_element.carbon | 4 +- .../check/testdata/struct/two_entries.carbon | 4 +- toolchain/check/testdata/tuples/empty.carbon | 4 +- .../testdata/tuples/fail_assign_empty.carbon | 4 +- .../testdata/tuples/fail_assign_nested.carbon | 4 +- .../tuples/fail_assign_to_empty.carbon | 4 +- .../tuples/fail_element_type_mismatch.carbon | 4 +- .../tuples/fail_nested_incomplete.carbon | 6 +- .../tuples/fail_too_few_element.carbon | 4 +- .../testdata/tuples/fail_type_assign.carbon | 4 +- .../testdata/tuples/fail_value_as_type.carbon | 4 +- toolchain/check/testdata/tuples/import.carbon | 8 +- .../check/testdata/tuples/nested_tuple.carbon | 4 +- .../tuples/nested_tuple_in_place.carbon | 12 +-- .../check/testdata/tuples/one_element.carbon | 4 +- .../check/testdata/tuples/two_elements.carbon | 4 +- toolchain/check/testdata/var/decl.carbon | 6 +- .../check/testdata/var/decl_with_init.carbon | 6 +- .../testdata/var/fail_duplicate_decl.carbon | 6 +- .../check/testdata/var/fail_generic.carbon | 6 +- .../var/fail_init_type_mismatch.carbon | 6 +- .../testdata/var/fail_init_with_self.carbon | 6 +- .../var/fail_lookup_outside_scope.carbon | 6 +- .../check/testdata/var/fail_modifiers.carbon | 4 +- .../var/fail_namespace_conflict.carbon | 6 +- .../testdata/var/fail_not_copyable.carbon | 10 +-- .../var/fail_storage_is_literal.carbon | 6 +- .../testdata/var/fail_todo_modifiers.carbon | 4 +- .../check/testdata/var/global_decl.carbon | 4 +- .../testdata/var/global_decl_with_init.carbon | 4 +- .../check/testdata/var/global_lookup.carbon | 4 +- .../var/global_lookup_in_scope.carbon | 6 +- toolchain/check/testdata/var/import.carbon | 8 +- toolchain/check/testdata/var/lookup.carbon | 6 +- toolchain/check/testdata/var/shadowing.carbon | 8 +- .../testdata/while/break_continue.carbon | 38 +++++----- .../testdata/while/fail_bad_condition.carbon | 6 +- .../testdata/while/fail_break_continue.carbon | 6 +- .../testdata/while/unreachable_end.carbon | 16 ++-- toolchain/check/testdata/while/while.carbon | 16 ++-- toolchain/driver/testdata/stdin.carbon | 2 +- toolchain/sem_ir/formatter.cpp | 75 ++++++++++++++---- 380 files changed, 2070 insertions(+), 2023 deletions(-) diff --git a/toolchain/check/testdata/alias/alias_of_alias.carbon b/toolchain/check/testdata/alias/alias_of_alias.carbon index caf41960d298..c8b98c53a870 100644 --- a/toolchain/check/testdata/alias/alias_of_alias.carbon +++ b/toolchain/check/testdata/alias/alias_of_alias.carbon @@ -16,11 +16,11 @@ let d: c = false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a: type = bind_alias a, bool [template = bool] // CHECK:STDOUT: %a.ref: type = name_ref a, %a [template = bool] // CHECK:STDOUT: %b: type = bind_alias b, %a [template = bool] diff --git a/toolchain/check/testdata/alias/builtins.carbon b/toolchain/check/testdata/alias/builtins.carbon index dd86f1890160..4f0b7861d755 100644 --- a/toolchain/check/testdata/alias/builtins.carbon +++ b/toolchain/check/testdata/alias/builtins.carbon @@ -18,10 +18,10 @@ let b_test: b = false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a: type = bind_alias a, i32 [template = i32] // CHECK:STDOUT: %a.ref: type = name_ref a, %a [template = i32] // CHECK:STDOUT: %.loc8: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon b/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon index b21499d254cf..ddf20949f795 100644 --- a/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon +++ b/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon @@ -17,9 +17,9 @@ let c: b = 2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %b: type = bind_alias b, bool [template = bool] // CHECK:STDOUT: %b.ref: type = name_ref b, %b [template = bool] // CHECK:STDOUT: %.loc11: i32 = int_literal 2 [template = constants.%.1] diff --git a/toolchain/check/testdata/alias/fail_bool_value.carbon b/toolchain/check/testdata/alias/fail_bool_value.carbon index 0f0fd96ff4ea..f4843f5866e2 100644 --- a/toolchain/check/testdata/alias/fail_bool_value.carbon +++ b/toolchain/check/testdata/alias/fail_bool_value.carbon @@ -17,9 +17,9 @@ let a_test: bool = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: bool = bool_literal false [template = constants.%.1] // CHECK:STDOUT: %a: = bind_alias a, [template = ] // CHECK:STDOUT: %a.ref: = name_ref a, %a [template = ] diff --git a/toolchain/check/testdata/alias/fail_local_in_namespace.carbon b/toolchain/check/testdata/alias/fail_local_in_namespace.carbon index 977136d1416b..3cccf15a86e4 100644 --- a/toolchain/check/testdata/alias/fail_local_in_namespace.carbon +++ b/toolchain/check/testdata/alias/fail_local_in_namespace.carbon @@ -27,14 +27,14 @@ fn F() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7 // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref bool = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/alias/fail_modifiers.carbon b/toolchain/check/testdata/alias/fail_modifiers.carbon index 8ab287c08ba7..6fd0cb10c58d 100644 --- a/toolchain/check/testdata/alias/fail_modifiers.carbon +++ b/toolchain/check/testdata/alias/fail_modifiers.carbon @@ -35,10 +35,10 @@ impl alias B = i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %A: type = bind_alias A, i32 [template = i32] // CHECK:STDOUT: %B: type = bind_alias B, i32 [template = i32] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/alias/fail_name_conflict.carbon b/toolchain/check/testdata/alias/fail_name_conflict.carbon index 0d79aa13c369..dc1367b87187 100644 --- a/toolchain/check/testdata/alias/fail_name_conflict.carbon +++ b/toolchain/check/testdata/alias/fail_name_conflict.carbon @@ -30,10 +30,10 @@ alias b = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a.loc7 // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.loc7: type = bind_alias a, i32 [template = i32] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a.loc14: ref i32 = bind_name a, %a.var diff --git a/toolchain/check/testdata/alias/fail_not_constant.carbon b/toolchain/check/testdata/alias/fail_not_constant.carbon index c31d7ab9a070..92023389a8b1 100644 --- a/toolchain/check/testdata/alias/fail_not_constant.carbon +++ b/toolchain/check/testdata/alias/fail_not_constant.carbon @@ -21,10 +21,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/alias/fail_todo_private.carbon b/toolchain/check/testdata/alias/fail_todo_private.carbon index 5e9060d36bdc..f5b44e068fd3 100644 --- a/toolchain/check/testdata/alias/fail_todo_private.carbon +++ b/toolchain/check/testdata/alias/fail_todo_private.carbon @@ -12,9 +12,9 @@ private alias A = i32; // CHECK:STDOUT: --- fail_todo_private.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %A: type = bind_alias A, i32 [template = i32] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/alias/import.carbon b/toolchain/check/testdata/alias/import.carbon index 2ff87e7fa8fe..7068ab7e12a5 100644 --- a/toolchain/check/testdata/alias/import.carbon +++ b/toolchain/check/testdata/alias/import.carbon @@ -27,10 +27,10 @@ var c: i32 = b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %a.ref: ref i32 = name_ref a, %a @@ -47,11 +47,11 @@ var c: i32 = b; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %import_ref.1 // CHECK:STDOUT: .b = %import_ref.2 // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+2, unused // CHECK:STDOUT: %import_ref.2: ref i32 = import_ref ir1, inst+7, used // CHECK:STDOUT: %c.var: ref i32 = var c diff --git a/toolchain/check/testdata/alias/import_order.carbon b/toolchain/check/testdata/alias/import_order.carbon index 0f82ea7a6ab8..5ddf36d05e5e 100644 --- a/toolchain/check/testdata/alias/import_order.carbon +++ b/toolchain/check/testdata/alias/import_order.carbon @@ -29,12 +29,12 @@ var i32_val: i32 = a_val; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a: type = bind_alias a, i32 [template = i32] // CHECK:STDOUT: %a.ref: type = name_ref a, %a [template = i32] // CHECK:STDOUT: %b: type = bind_alias b, %a [template = i32] @@ -51,7 +51,7 @@ var i32_val: i32 = a_val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %import_ref.1 // CHECK:STDOUT: .b = %import_ref.2 // CHECK:STDOUT: .c = %import_ref.3 @@ -61,7 +61,7 @@ var i32_val: i32 = a_val; // CHECK:STDOUT: .b_val = %b_val // CHECK:STDOUT: .a_val = %a_val // CHECK:STDOUT: .i32_val = %i32_val -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: type = import_ref ir1, inst+1, used [template = i32] // CHECK:STDOUT: %import_ref.2: type = import_ref ir1, inst+3, used [template = i32] // CHECK:STDOUT: %import_ref.3: type = import_ref ir1, inst+5, used [template = i32] diff --git a/toolchain/check/testdata/alias/in_namespace.carbon b/toolchain/check/testdata/alias/in_namespace.carbon index 59151a810029..b180eed56bb0 100644 --- a/toolchain/check/testdata/alias/in_namespace.carbon +++ b/toolchain/check/testdata/alias/in_namespace.carbon @@ -20,23 +20,23 @@ fn F() -> NS.a { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7 // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a: type = bind_alias a, bool [template = bool] // CHECK:STDOUT: %NS.ref.loc10: = name_ref NS, %.loc7 [template = %.loc7] // CHECK:STDOUT: %a.ref.loc10: type = name_ref a, %a [template = bool] // CHECK:STDOUT: %.loc10: bool = bool_literal false [template = constants.%.1] // CHECK:STDOUT: %b: bool = bind_name b, %.loc10 -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %NS.ref.loc12: = name_ref NS, %.loc7 [template = %.loc7] // CHECK:STDOUT: %a.ref.loc12: type = name_ref a, %a [template = bool] // CHECK:STDOUT: %return.var: ref bool = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/alias/local.carbon b/toolchain/check/testdata/alias/local.carbon index dc3b089be9b4..e697edaff472 100644 --- a/toolchain/check/testdata/alias/local.carbon +++ b/toolchain/check/testdata/alias/local.carbon @@ -17,12 +17,12 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index e5bdf227e3a0..3ee32a5135fd 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -25,16 +25,16 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_25.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_25.2: type = converted %.loc7_25.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref (i32, i32, i32) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/array/array_vs_tuple.carbon b/toolchain/check/testdata/array/array_vs_tuple.carbon index 1d5948b15aa3..ba935a7683d8 100644 --- a/toolchain/check/testdata/array/array_vs_tuple.carbon +++ b/toolchain/check/testdata/array/array_vs_tuple.carbon @@ -29,10 +29,10 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() { diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index c4e2e8060fb7..83183a3e7f77 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -24,16 +24,16 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_16.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_16.2: type = converted %.loc7_16.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %return.var: ref (i32,) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> (i32,) { diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index a95d9612aca9..d1e5817696dd 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -25,10 +25,10 @@ var b: [i32; 3] = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a diff --git a/toolchain/check/testdata/array/base.carbon b/toolchain/check/testdata/array/base.carbon index 5a3527ff7e6d..12e4e705966e 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -38,11 +38,11 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_bound_overflow.carbon b/toolchain/check/testdata/array/fail_bound_overflow.carbon index 5af8cbd4eb9b..0e8a93bba4ee 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -25,10 +25,10 @@ var b: [1; 39999999999999999993]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14: i32 = int_literal 39999999999999999993 [template = constants.%.1] // CHECK:STDOUT: %.loc10_34: type = array_type %.loc10_14, i32 [template = ] // CHECK:STDOUT: %a.var: ref = var a diff --git a/toolchain/check/testdata/array/fail_incomplete_element.carbon b/toolchain/check/testdata/array/fail_incomplete_element.carbon index 09a90602602e..efcc2226bb14 100644 --- a/toolchain/check/testdata/array/fail_incomplete_element.carbon +++ b/toolchain/check/testdata/array/fail_incomplete_element.carbon @@ -27,12 +27,12 @@ var p: Incomplete* = &a[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Incomplete = %Incomplete.decl // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .p = %p -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15_21: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc15_22: type = array_type %.loc15_21, Incomplete [template = constants.%.2] diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index 8714fa6a767a..8e52be3e1ff5 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -16,9 +16,9 @@ var a: [1; 1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_12: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, [template = ] diff --git a/toolchain/check/testdata/array/fail_out_of_bound.carbon b/toolchain/check/testdata/array/fail_out_of_bound.carbon index 4c8bdaaa47cb..212a3c1b04e6 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -21,9 +21,9 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon index d2c43d4205b0..3a8932c38286 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon @@ -28,10 +28,10 @@ var b: i32 = a[{.index = 3}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/fail_type_mismatch.carbon b/toolchain/check/testdata/array/fail_type_mismatch.carbon index e2e6c90bd6c5..9635cb83d75f 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -49,14 +49,14 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .t1 = %t1 // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .t2 = %t2 // CHECK:STDOUT: .d = %d -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index 4b34469b399c..194620bf45fd 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -28,11 +28,11 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] // CHECK:STDOUT: %arr.loc7_6.1: [i32; 3] = param arr @@ -40,10 +40,10 @@ fn G() -> i32 { // CHECK:STDOUT: %i.loc7_21.1: i32 = param i // CHECK:STDOUT: @F.%i: i32 = bind_name i, %i.loc7_21.1 // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc11: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%arr: [i32; 3], %i: i32) -> i32 { diff --git a/toolchain/check/testdata/array/index_not_literal.carbon b/toolchain/check/testdata/array/index_not_literal.carbon index a0e5b79ec11f..a711cb47a151 100644 --- a/toolchain/check/testdata/array/index_not_literal.carbon +++ b/toolchain/check/testdata/array/index_not_literal.carbon @@ -25,10 +25,10 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/nine_elements.carbon b/toolchain/check/testdata/array/nine_elements.carbon index ff1a31717e06..5aad5395546d 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -34,9 +34,9 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 9 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 9] = var a diff --git a/toolchain/check/testdata/as/as_type.carbon b/toolchain/check/testdata/as/as_type.carbon index 32c70864e5a5..78a9fe1ae29e 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -14,7 +14,7 @@ let t: type = (i32, i32) as type; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc7_24.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.2: type = converted %.loc7_24.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %t: type = bind_name t, %.loc7_24.2 diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index de44756f599a..6c3b38e3327e 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -15,12 +15,12 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index f44be549ca81..ce0806615574 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -19,7 +19,7 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc10_21: i32 = int_literal 1 [template = constants.%.4] diff --git a/toolchain/check/testdata/as/fail_not_type.carbon b/toolchain/check/testdata/as/fail_not_type.carbon index 32e6a527edad..3d581e1e8699 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -17,7 +17,7 @@ let n: i32 = 1 as 2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_19: i32 = int_literal 2 [template = constants.%.2] // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/as/identity.carbon b/toolchain/check/testdata/as/identity.carbon index eb60a4d48ebe..a2a60ca6bdda 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -35,30 +35,30 @@ fn Initializing() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .X = %X.decl // CHECK:STDOUT: .Value = %Value // CHECK:STDOUT: .Reference = %Reference // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .Initializing = %Initializing -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %X.decl = class_decl @X {} [template = constants.%X] -// CHECK:STDOUT: %Value: = fn_decl @Value { +// CHECK:STDOUT: } +// CHECK:STDOUT: %X.decl = class_decl @X [template = constants.%X] {} +// CHECK:STDOUT: %Value: = fn_decl @Value [template] { // CHECK:STDOUT: %X.ref.loc13: type = name_ref X, %X.decl [template = constants.%X] // CHECK:STDOUT: %n.loc13_10.1: X = param n // CHECK:STDOUT: @Value.%n: X = bind_name n, %n.loc13_10.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Reference: = fn_decl @Reference { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Reference: = fn_decl @Reference [template] { // CHECK:STDOUT: %X.ref.loc17: type = name_ref X, %X.decl [template = constants.%X] // CHECK:STDOUT: %.loc17: type = ptr_type X [template = constants.%.4] // CHECK:STDOUT: %p.loc17_14.1: X* = param p // CHECK:STDOUT: @Reference.%p: X* = bind_name p, %p.loc17_14.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %X.ref.loc21: type = name_ref X, %X.decl [template = constants.%X] // CHECK:STDOUT: @Make.%return: ref X = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Initializing: = fn_decl @Initializing {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Initializing: = fn_decl @Initializing [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { diff --git a/toolchain/check/testdata/as/tuple.carbon b/toolchain/check/testdata/as/tuple.carbon index fe1e736eb95a..3b9692de0e9d 100644 --- a/toolchain/check/testdata/as/tuple.carbon +++ b/toolchain/check/testdata/as/tuple.carbon @@ -34,19 +34,19 @@ fn Var() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .X = %X.decl // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .Let = %Let // CHECK:STDOUT: .Var = %Var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %X.decl = class_decl @X {} [template = constants.%X] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %X.decl = class_decl @X [template = constants.%X] {} +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %X.ref: type = name_ref X, %X.decl [template = constants.%X] // CHECK:STDOUT: @Make.%return: ref X = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Let: = fn_decl @Let {} [template] -// CHECK:STDOUT: %Var: = fn_decl @Var {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Let: = fn_decl @Let [template] {} +// CHECK:STDOUT: %Var: = fn_decl @Var [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index df66dcbe5701..f0ff2e96db4a 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -19,11 +19,11 @@ var test_type: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .test_i32 = %test_i32 // CHECK:STDOUT: .test_f64 = %test_f64 // CHECK:STDOUT: .test_type = %test_type -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // 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: %test_f64.var: ref f64 = var test_f64 diff --git a/toolchain/check/testdata/basics/empty.carbon b/toolchain/check/testdata/basics/empty.carbon index 3fa678c1f66a..55039f0e3c12 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -7,6 +7,6 @@ // CHECK:STDOUT: --- empty.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/empty_decl.carbon b/toolchain/check/testdata/basics/empty_decl.carbon index c881f3187f10..50110a1d6161 100644 --- a/toolchain/check/testdata/basics/empty_decl.carbon +++ b/toolchain/check/testdata/basics/empty_decl.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- empty_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // 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 0237bb7e254a..739c3f58be84 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -20,12 +20,12 @@ fn Run() -> String {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: @Run.%return: ref String = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() -> %return: String { diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index 93fa6336c4ee..7554f0839b71 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -12,13 +12,13 @@ fn Run(n: i32) {} // CHECK:STDOUT: --- fail_bad_run_2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: %n.loc10_8.1: i32 = param n // CHECK:STDOUT: @Run.%n: i32 = bind_name n, %n.loc10_8.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run(%n: i32) { diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index 9933471cf422..5b8ba49af880 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -14,10 +14,10 @@ fn Main() { // CHECK:STDOUT: --- fail_name_lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { 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 212513157fc1..d6ba851e6c83 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -16,9 +16,9 @@ var x: type = 42; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon index edb2010530e8..7a3b3dae8d58 100644 --- a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon @@ -13,10 +13,10 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_qualifier_unsupported.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // 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 diff --git a/toolchain/check/testdata/basics/multifile.carbon b/toolchain/check/testdata/basics/multifile.carbon index 75c8f879930f..7e05aee48161 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -17,10 +17,10 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -31,10 +31,10 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() { 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 e747f1bd6bc7..a52ede3ff872 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -54,10 +54,10 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -101,10 +101,10 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B() { diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 3f49290ee908..309db8db1cab 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -58,10 +58,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 28b30dd1ad39..283a4e8a4bf9 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -15,10 +15,10 @@ var b: i32 = ((2)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %b.var: ref i32 = var b diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index 1daa73df241b..7c2938bc153e 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -138,16 +138,16 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %n.loc11_8.1: i32 = param n // CHECK:STDOUT: @Foo.%n: i32 = bind_name n, %n.loc11_8.1 // CHECK:STDOUT: %.loc11_33.1: (type, type, type) = tuple_literal (i32, i32, f64) // CHECK:STDOUT: %.loc11_33.2: type = converted %.loc11_33.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @Foo.%return: ref (i32, i32, f64) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%n: i32) -> %return: (i32, i32, f64) { diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index 01d2604643ac..debf53f506cd 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -23,26 +23,26 @@ fn C(r#if: i32) -> i32 { // CHECK:STDOUT: --- raw_identifier.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %n.loc11_6.1: i32 = param n // CHECK:STDOUT: @A.%n: i32 = bind_name n, %n.loc11_6.1 // CHECK:STDOUT: %return.var.loc11: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %n.loc15_6.1: i32 = param n // CHECK:STDOUT: @B.%n: i32 = bind_name n, %n.loc15_6.1 // CHECK:STDOUT: %return.var.loc15: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C: = fn_decl @C { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C: = fn_decl @C [template] { // CHECK:STDOUT: %if.loc19_6.1: i32 = param r#if // CHECK:STDOUT: @C.%if: i32 = bind_name r#if, %if.loc19_6.1 // CHECK:STDOUT: %return.var.loc19: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(%n: i32) -> i32 { diff --git a/toolchain/check/testdata/basics/run.carbon b/toolchain/check/testdata/basics/run.carbon index a5afb61f8ad1..7de1bc5b4f69 100644 --- a/toolchain/check/testdata/basics/run.carbon +++ b/toolchain/check/testdata/basics/run.carbon @@ -9,10 +9,10 @@ fn Run() {} // CHECK:STDOUT: --- run.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index 223fd5123b3f..f9ee6bd2e1b4 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -13,12 +13,12 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() -> i32 { diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index 72641f111fef..e28e133f9960 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -23,16 +23,16 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %n.loc11_8.1: i32 = param n // CHECK:STDOUT: @Foo.%n: i32 = bind_name n, %n.loc11_8.1 // CHECK:STDOUT: %.loc11_33.1: (type, type, type) = tuple_literal (i32, i32, f64) // CHECK:STDOUT: %.loc11_33.2: type = converted %.loc11_33.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @Foo.%return: ref (i32, i32, f64) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%n: i32) -> %return: (i32, i32, f64) { diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index c9743da262a0..445d2bd012c3 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -47,26 +47,26 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Derived = %Derived.decl // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .Access = %Access -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %Derived.ref.loc17: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: @Make.%return: ref Derived = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Access: = fn_decl @Access { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Access: = fn_decl @Access [template] { // CHECK:STDOUT: %Derived.ref.loc21: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %d.loc21_11.1: Derived = param d // CHECK:STDOUT: @Access.%d: Derived = bind_name d, %d.loc21_11.1 // CHECK:STDOUT: %.loc21_35.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc21_35.2: type = converted %.loc21_35.1, constants.%.16 [template = constants.%.16] // CHECK:STDOUT: @Access.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index e4d58abbfd9b..efb0ec33e0ca 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -40,21 +40,21 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Derived = %Derived.decl // CHECK:STDOUT: .Access = %Access -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %Access: = fn_decl @Access { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %Access: = fn_decl @Access [template] { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc20_21: type = ptr_type Derived [template = constants.%.7] // CHECK:STDOUT: %p.loc20_11.1: Derived* = param p // CHECK:STDOUT: @Access.%p: Derived* = bind_name p, %p.loc20_11.1 // CHECK:STDOUT: %.loc20_30: type = ptr_type i32 [template = constants.%.8] // CHECK:STDOUT: %return.var: ref i32* = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { diff --git a/toolchain/check/testdata/class/base_function_unqualified.carbon b/toolchain/check/testdata/class/base_function_unqualified.carbon index ae0da65aeea2..e807927eaf70 100644 --- a/toolchain/check/testdata/class/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/base_function_unqualified.carbon @@ -32,17 +32,17 @@ fn Derived.H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Derived = %Derived.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base @@ -52,8 +52,8 @@ fn Derived.H() { // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %Base.ref: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc12: = base_decl Base, element0 [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index 550982662d2c..994d0f2a7461 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -41,37 +41,37 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Derived = %Derived.decl // CHECK:STDOUT: .Call = %Call -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Base.ref: type = name_ref Base, %Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc13_26: type = ptr_type Base [template = constants.%.2] // CHECK:STDOUT: %self.loc13_16.1: Base* = param self // CHECK:STDOUT: @F.%self: Base* = bind_name self, %self.loc13_16.1 // CHECK:STDOUT: @F.%.loc13: Base* = addr_pattern @F.%self -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %Call: = fn_decl @Call { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %Call: = fn_decl @Call [template] { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc21: type = ptr_type Derived [template = constants.%.8] // CHECK:STDOUT: %p.loc21_9.1: Derived* = param p // CHECK:STDOUT: @Call.%p: Derived* = bind_name p, %p.loc21_9.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { // CHECK:STDOUT: %.loc8: = field_decl a, element0 [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %.loc10_23: type = ptr_type Base [template = constants.%.2] // CHECK:STDOUT: %self.loc10_13.1: Base* = param self // CHECK:STDOUT: %self.loc10_13.3: Base* = bind_name self, %self.loc10_13.1 // CHECK:STDOUT: %.loc10_8: Base* = addr_pattern %self.loc10_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index 21ce111f4015..c9044b0066f2 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -55,18 +55,18 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .D = %D.decl // CHECK:STDOUT: .Call = %Call -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %D.decl = class_decl @D {} [template = constants.%D] -// CHECK:STDOUT: %Call: = fn_decl @Call { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %D.decl = class_decl @D [template = constants.%D] {} +// CHECK:STDOUT: %Call: = fn_decl @Call [template] { // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %.loc25_13: type = ptr_type A [template = constants.%.1] // CHECK:STDOUT: %a.loc25_9.1: A* = param a @@ -83,17 +83,17 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: %.loc25_34: type = ptr_type D [template = constants.%.14] // CHECK:STDOUT: %d.loc25_30.1: D* = param d // CHECK:STDOUT: @Call.%d: D* = bind_name d, %d.loc25_30.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%A [template = constants.%A] // CHECK:STDOUT: %.loc8_23: type = ptr_type A [template = constants.%.1] // CHECK:STDOUT: %self.loc8_13.1: A* = param self // CHECK:STDOUT: %self.loc8_13.3: A* = bind_name self, %self.loc8_13.1 // CHECK:STDOUT: %.loc8_8: A* = addr_pattern %self.loc8_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A @@ -103,13 +103,13 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: class @B { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc12: = base_decl A, element0 [template] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%B [template = constants.%B] // CHECK:STDOUT: %.loc13_23: type = ptr_type B [template = constants.%.6] // CHECK:STDOUT: %self.loc13_13.1: B* = param self // CHECK:STDOUT: %self.loc13_13.3: B* = bind_name self, %self.loc13_13.1 // CHECK:STDOUT: %.loc13_8: B* = addr_pattern %self.loc13_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B @@ -121,13 +121,13 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: class @C { // CHECK:STDOUT: %B.ref: type = name_ref B, file.%B.decl [template = constants.%B] // CHECK:STDOUT: %.loc17: = base_decl B, element0 [template] -// CHECK:STDOUT: %F: = fn_decl @F.3 { +// CHECK:STDOUT: %F: = fn_decl @F.3 [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%C [template = constants.%C] // CHECK:STDOUT: %.loc18_23: type = ptr_type C [template = constants.%.11] // CHECK:STDOUT: %self.loc18_13.1: C* = param self // CHECK:STDOUT: %self.loc18_13.3: C* = bind_name self, %self.loc18_13.1 // CHECK:STDOUT: %.loc18_8: C* = addr_pattern %self.loc18_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index f2f744b2dfca..66ac9e715d4c 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -32,32 +32,32 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %n.loc17_12.1: i32 = param n // CHECK:STDOUT: @G.%n: i32 = bind_name n, %n.loc17_12.1 // CHECK:STDOUT: %return.var.loc17: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: %return.var.loc21: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %n.loc8_8.1: i32 = param n // CHECK:STDOUT: %n.loc8_8.2: i32 = bind_name n, %n.loc8_8.1 // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %n.loc12_8.1: i32 = param n // CHECK:STDOUT: %n.loc12_8.2: i32 = bind_name n, %n.loc12_8.1 // CHECK:STDOUT: %return.var.loc12: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc14: = field_decl k, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index bb508194994b..c2286e6239d7 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -69,7 +69,7 @@ fn ConvertInit() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .C = %C.decl @@ -79,11 +79,11 @@ fn ConvertInit() { // CHECK:STDOUT: .ConvertValue = %ConvertValue // CHECK:STDOUT: .ConvertRef = %ConvertRef // CHECK:STDOUT: .ConvertInit = %ConvertInit -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %ConvertCToB: = fn_decl @ConvertCToB { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %ConvertCToB: = fn_decl @ConvertCToB [template] { // CHECK:STDOUT: %C.ref.loc21: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %.loc21_20: type = ptr_type C [template = constants.%.13] // CHECK:STDOUT: %p.loc21_16.1: C* = param p @@ -91,8 +91,8 @@ fn ConvertInit() { // CHECK:STDOUT: %B.ref.loc21: type = name_ref B, %B.decl [template = constants.%B] // CHECK:STDOUT: %.loc21_27: type = ptr_type B [template = constants.%.14] // CHECK:STDOUT: %return.var.loc21: ref B* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConvertBToA: = fn_decl @ConvertBToA { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConvertBToA: = fn_decl @ConvertBToA [template] { // CHECK:STDOUT: %B.ref.loc22: type = name_ref B, %B.decl [template = constants.%B] // CHECK:STDOUT: %.loc22_20: type = ptr_type B [template = constants.%.14] // CHECK:STDOUT: %p.loc22_16.1: B* = param p @@ -100,8 +100,8 @@ fn ConvertInit() { // CHECK:STDOUT: %A.ref.loc22: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %.loc22_27: type = ptr_type A [template = constants.%.18] // CHECK:STDOUT: %return.var.loc22: ref A* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConvertCToA: = fn_decl @ConvertCToA { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConvertCToA: = fn_decl @ConvertCToA [template] { // CHECK:STDOUT: %C.ref.loc23: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %.loc23_20: type = ptr_type C [template = constants.%.13] // CHECK:STDOUT: %p.loc23_16.1: C* = param p @@ -109,13 +109,13 @@ fn ConvertInit() { // CHECK:STDOUT: %A.ref.loc23: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %.loc23_27: type = ptr_type A [template = constants.%.18] // CHECK:STDOUT: %return.var.loc23: ref A* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConvertValue: = fn_decl @ConvertValue { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConvertValue: = fn_decl @ConvertValue [template] { // CHECK:STDOUT: %C.ref.loc25: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %c.loc25_17.1: C = param c // CHECK:STDOUT: @ConvertValue.%c: C = bind_name c, %c.loc25_17.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConvertRef: = fn_decl @ConvertRef { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConvertRef: = fn_decl @ConvertRef [template] { // CHECK:STDOUT: %C.ref.loc29: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %.loc29_19: type = ptr_type C [template = constants.%.13] // CHECK:STDOUT: %c.loc29_15.1: C* = param c @@ -123,8 +123,8 @@ fn ConvertInit() { // CHECK:STDOUT: %A.ref.loc29: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %.loc29_26: type = ptr_type A [template = constants.%.18] // CHECK:STDOUT: %return.var.loc29: ref A* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConvertInit: = fn_decl @ConvertInit {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConvertInit: = fn_decl @ConvertInit [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index 1e4bafd168f4..d7a12a72b2ab 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -49,26 +49,26 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Abstract = %Abstract.decl // CHECK:STDOUT: .Derived = %Derived.decl // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .Access = %Access -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract {} [template = constants.%Abstract] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract [template = constants.%Abstract] {} +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %Derived.ref.loc17: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: @Make.%return: ref Derived = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Access: = fn_decl @Access { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Access: = fn_decl @Access [template] { // CHECK:STDOUT: %Derived.ref.loc25: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %d.loc25_11.1: Derived = param d // CHECK:STDOUT: @Access.%d: Derived = bind_name d, %d.loc25_11.1 // CHECK:STDOUT: %.loc25_35.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc25_35.2: type = converted %.loc25_35.1, constants.%.14 [template = constants.%.14] // CHECK:STDOUT: @Access.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract { diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index c6bc631757dc..19d888f0213a 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -25,25 +25,25 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Class.ref.loc11: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc11: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %a.loc11_13.1: Class* = param a // CHECK:STDOUT: %a.loc11_13.2: Class* = bind_name a, %a.loc11_13.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Class.ref.loc16: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc16: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %b.loc16_13.1: Class* = param b // CHECK:STDOUT: %b.loc16_13.2: Class* = bind_name b, %b.loc16_13.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index 6b77abf7bb20..d760abde0c53 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -49,12 +49,12 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %Class.ref.loc12_9: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc12_6.1: Class = param c // CHECK:STDOUT: @F.2.%c: Class = bind_name c, %c.loc12_6.1 @@ -62,23 +62,23 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: %.loc12: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %p.loc12_16.1: Class* = param p // CHECK:STDOUT: @F.2.%p: Class* = bind_name p, %p.loc12_16.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %Class.ref.loc8: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc8_24: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc8_13.1: Class* = param self // CHECK:STDOUT: %self.loc8_13.3: Class* = bind_name self, %self.loc8_13.1 // CHECK:STDOUT: %.loc8_8: Class* = addr_pattern %self.loc8_13.3 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Class.ref.loc9: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %self.loc9_13.1: Class = param self // CHECK:STDOUT: %self.loc9_13.3: Class = bind_name self, %self.loc9_13.1 // CHECK:STDOUT: %.loc9: Class = addr_pattern %self.loc9_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index d3a8a454fa5e..a71afe42d984 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -160,7 +160,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Final = %Final.decl // CHECK:STDOUT: .DeriveFromError = %DeriveFromError.decl @@ -184,43 +184,43 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: .ConvertToBadBaseFinal = %ConvertToBadBaseFinal // CHECK:STDOUT: .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember // CHECK:STDOUT: .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Final.decl = class_decl @Final {} [template = constants.%Final] -// CHECK:STDOUT: %DeriveFromError.decl = class_decl @DeriveFromError {} [template = constants.%DeriveFromError] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseError: = fn_decl @AccessMemberWithInvalidBaseError { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Final.decl = class_decl @Final [template = constants.%Final] {} +// CHECK:STDOUT: %DeriveFromError.decl = class_decl @DeriveFromError [template = constants.%DeriveFromError] {} +// CHECK:STDOUT: %AccessMemberWithInvalidBaseError: = fn_decl @AccessMemberWithInvalidBaseError [template] { // CHECK:STDOUT: %DeriveFromError.ref: type = name_ref DeriveFromError, %DeriveFromError.decl [template = constants.%DeriveFromError] // CHECK:STDOUT: %.loc20: type = ptr_type DeriveFromError [template = constants.%.4] // CHECK:STDOUT: %p.loc20_37.1: DeriveFromError* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseError.%p: DeriveFromError* = bind_name p, %p.loc20_37.1 // CHECK:STDOUT: %return.var.loc20: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DeriveFromNonType.decl = class_decl @DeriveFromNonType {} [template = constants.%DeriveFromNonType] -// CHECK:STDOUT: %AccessMemberWithInvalidBasNonType: = fn_decl @AccessMemberWithInvalidBasNonType { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DeriveFromNonType.decl = class_decl @DeriveFromNonType [template = constants.%DeriveFromNonType] {} +// CHECK:STDOUT: %AccessMemberWithInvalidBasNonType: = fn_decl @AccessMemberWithInvalidBasNonType [template] { // CHECK:STDOUT: %DeriveFromNonType.ref: type = name_ref DeriveFromNonType, %DeriveFromNonType.decl [template = constants.%DeriveFromNonType] // CHECK:STDOUT: %.loc29: type = ptr_type DeriveFromNonType [template = constants.%.6] // CHECK:STDOUT: %p.loc29_38.1: DeriveFromNonType* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBasNonType.%p: DeriveFromNonType* = bind_name p, %p.loc29_38.1 // CHECK:STDOUT: %return.var.loc29: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DeriveFromi32.decl = class_decl @DeriveFromi32 {} [template = constants.%DeriveFromi32] -// CHECK:STDOUT: %ConvertToBadBasei32: = fn_decl @ConvertToBadBasei32 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DeriveFromi32.decl = class_decl @DeriveFromi32 [template = constants.%DeriveFromi32] {} +// CHECK:STDOUT: %ConvertToBadBasei32: = fn_decl @ConvertToBadBasei32 [template] { // CHECK:STDOUT: %DeriveFromi32.ref.loc43: type = name_ref DeriveFromi32, %DeriveFromi32.decl [template = constants.%DeriveFromi32] // CHECK:STDOUT: %.loc43_40: type = ptr_type DeriveFromi32 [template = constants.%.7] // CHECK:STDOUT: %p.loc43_24.1: DeriveFromi32* = param p // CHECK:STDOUT: @ConvertToBadBasei32.%p: DeriveFromi32* = bind_name p, %p.loc43_24.1 // CHECK:STDOUT: %.loc43_49: type = ptr_type i32 [template = constants.%.8] // CHECK:STDOUT: %return.var.loc43: ref i32* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBasei32: = fn_decl @AccessMemberWithInvalidBasei32 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBasei32: = fn_decl @AccessMemberWithInvalidBasei32 [template] { // CHECK:STDOUT: %DeriveFromi32.ref.loc45: type = name_ref DeriveFromi32, %DeriveFromi32.decl [template = constants.%DeriveFromi32] // CHECK:STDOUT: %.loc45: type = ptr_type DeriveFromi32 [template = constants.%.7] // CHECK:STDOUT: %p.loc45_35.1: DeriveFromi32* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBasei32.%p: DeriveFromi32* = bind_name p, %p.loc45_35.1 // CHECK:STDOUT: %return.var.loc45: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DeriveFromTuple.decl = class_decl @DeriveFromTuple {} [template = constants.%DeriveFromTuple] -// CHECK:STDOUT: %ConvertToBadBaseTuple: = fn_decl @ConvertToBadBaseTuple { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DeriveFromTuple.decl = class_decl @DeriveFromTuple [template = constants.%DeriveFromTuple] {} +// CHECK:STDOUT: %ConvertToBadBaseTuple: = fn_decl @ConvertToBadBaseTuple [template] { // CHECK:STDOUT: %DeriveFromTuple.ref.loc57: type = name_ref DeriveFromTuple, %DeriveFromTuple.decl [template = constants.%DeriveFromTuple] // CHECK:STDOUT: %.loc57_44: type = ptr_type DeriveFromTuple [template = constants.%.14] // CHECK:STDOUT: %p.loc57_26.1: DeriveFromTuple* = param p @@ -230,16 +230,16 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %.loc57_56.2: type = converted %.loc57_56.1, constants.%.10 [template = constants.%.10] // CHECK:STDOUT: %.loc57_57: type = ptr_type (Base,) [template = constants.%.15] // CHECK:STDOUT: %return.var.loc57: ref (Base,)* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseTuple: = fn_decl @AccessMemberWithInvalidBaseTuple { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBaseTuple: = fn_decl @AccessMemberWithInvalidBaseTuple [template] { // CHECK:STDOUT: %DeriveFromTuple.ref.loc59: type = name_ref DeriveFromTuple, %DeriveFromTuple.decl [template = constants.%DeriveFromTuple] // CHECK:STDOUT: %.loc59: type = ptr_type DeriveFromTuple [template = constants.%.14] // CHECK:STDOUT: %p.loc59_37.1: DeriveFromTuple* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseTuple.%p: DeriveFromTuple* = bind_name p, %p.loc59_37.1 // CHECK:STDOUT: %return.var.loc59: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DeriveFromStruct.decl = class_decl @DeriveFromStruct {} [template = constants.%DeriveFromStruct] -// CHECK:STDOUT: %ConvertToBadBaseStruct: = fn_decl @ConvertToBadBaseStruct { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DeriveFromStruct.decl = class_decl @DeriveFromStruct [template = constants.%DeriveFromStruct] {} +// CHECK:STDOUT: %ConvertToBadBaseStruct: = fn_decl @ConvertToBadBaseStruct [template] { // CHECK:STDOUT: %DeriveFromStruct.ref.loc73: type = name_ref DeriveFromStruct, %DeriveFromStruct.decl [template = constants.%DeriveFromStruct] // CHECK:STDOUT: %.loc73_46: type = ptr_type DeriveFromStruct [template = constants.%.18] // CHECK:STDOUT: %p.loc73_27.1: DeriveFromStruct* = param p @@ -247,17 +247,17 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %.loc73_69: type = struct_type {.a: i32, .b: i32} [template = constants.%.16] // CHECK:STDOUT: %.loc73_70: type = ptr_type {.a: i32, .b: i32} [template = constants.%.17] // CHECK:STDOUT: %return.var.loc73: ref {.a: i32, .b: i32}* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseStruct: = fn_decl @AccessMemberWithInvalidBaseStruct { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBaseStruct: = fn_decl @AccessMemberWithInvalidBaseStruct [template] { // CHECK:STDOUT: %DeriveFromStruct.ref.loc76: type = name_ref DeriveFromStruct, %DeriveFromStruct.decl [template = constants.%DeriveFromStruct] // CHECK:STDOUT: %.loc76: type = ptr_type DeriveFromStruct [template = constants.%.18] // CHECK:STDOUT: %p.loc76_38.1: DeriveFromStruct* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseStruct.%p: DeriveFromStruct* = bind_name p, %p.loc76_38.1 // CHECK:STDOUT: %return.var.loc76: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] -// CHECK:STDOUT: %DeriveFromIncomplete.decl = class_decl @DeriveFromIncomplete {} [template = constants.%DeriveFromIncomplete] -// CHECK:STDOUT: %ConvertToBadBaseIncomplete: = fn_decl @ConvertToBadBaseIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} +// CHECK:STDOUT: %DeriveFromIncomplete.decl = class_decl @DeriveFromIncomplete [template = constants.%DeriveFromIncomplete] {} +// CHECK:STDOUT: %ConvertToBadBaseIncomplete: = fn_decl @ConvertToBadBaseIncomplete [template] { // CHECK:STDOUT: %DeriveFromIncomplete.ref.loc93: type = name_ref DeriveFromIncomplete, %DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] // CHECK:STDOUT: %.loc93_54: type = ptr_type DeriveFromIncomplete [template = constants.%.19] // CHECK:STDOUT: %p.loc93_31.1: DeriveFromIncomplete* = param p @@ -265,16 +265,16 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc93_70: type = ptr_type Incomplete [template = constants.%.20] // CHECK:STDOUT: %return.var.loc93: ref Incomplete* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseIncomplete: = fn_decl @AccessMemberWithInvalidBaseIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBaseIncomplete: = fn_decl @AccessMemberWithInvalidBaseIncomplete [template] { // CHECK:STDOUT: %DeriveFromIncomplete.ref.loc95: type = name_ref DeriveFromIncomplete, %DeriveFromIncomplete.decl [template = constants.%DeriveFromIncomplete] // CHECK:STDOUT: %.loc95: type = ptr_type DeriveFromIncomplete [template = constants.%.19] // CHECK:STDOUT: %p.loc95_42.1: DeriveFromIncomplete* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseIncomplete.%p: DeriveFromIncomplete* = bind_name p, %p.loc95_42.1 // CHECK:STDOUT: %return.var.loc95: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DeriveFromFinal.decl = class_decl @DeriveFromFinal {} [template = constants.%DeriveFromFinal] -// CHECK:STDOUT: %ConvertToBadBaseFinal: = fn_decl @ConvertToBadBaseFinal { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DeriveFromFinal.decl = class_decl @DeriveFromFinal [template = constants.%DeriveFromFinal] {} +// CHECK:STDOUT: %ConvertToBadBaseFinal: = fn_decl @ConvertToBadBaseFinal [template] { // CHECK:STDOUT: %DeriveFromFinal.ref.loc105: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc105_44: type = ptr_type DeriveFromFinal [template = constants.%.24] // CHECK:STDOUT: %p.loc105_26.1: DeriveFromFinal* = param p @@ -282,21 +282,21 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: %Final.ref: type = name_ref Final, %Final.decl [template = constants.%Final] // CHECK:STDOUT: %.loc105_55: type = ptr_type Final [template = constants.%.25] // CHECK:STDOUT: %return.var.loc105: ref Final* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_WithMember: = fn_decl @AccessMemberWithInvalidBaseFinal_WithMember { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_WithMember: = fn_decl @AccessMemberWithInvalidBaseFinal_WithMember [template] { // CHECK:STDOUT: %DeriveFromFinal.ref.loc109: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc109: type = ptr_type DeriveFromFinal [template = constants.%.24] // CHECK:STDOUT: %p.loc109_48.1: DeriveFromFinal* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_WithMember.%p: DeriveFromFinal* = bind_name p, %p.loc109_48.1 // CHECK:STDOUT: %return.var.loc109: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_NoMember: = fn_decl @AccessMemberWithInvalidBaseFinal_NoMember { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AccessMemberWithInvalidBaseFinal_NoMember: = fn_decl @AccessMemberWithInvalidBaseFinal_NoMember [template] { // CHECK:STDOUT: %DeriveFromFinal.ref.loc113: type = name_ref DeriveFromFinal, %DeriveFromFinal.decl [template = constants.%DeriveFromFinal] // CHECK:STDOUT: %.loc113: type = ptr_type DeriveFromFinal [template = constants.%.24] // CHECK:STDOUT: %p.loc113_46.1: DeriveFromFinal* = param p // CHECK:STDOUT: @AccessMemberWithInvalidBaseFinal_NoMember.%p: DeriveFromFinal* = bind_name p, %p.loc113_46.1 // CHECK:STDOUT: %return.var.loc113: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { diff --git a/toolchain/check/testdata/class/fail_base_method_define.carbon b/toolchain/check/testdata/class/fail_base_method_define.carbon index 57dff4db5954..3a59f2b505e8 100644 --- a/toolchain/check/testdata/class/fail_base_method_define.carbon +++ b/toolchain/check/testdata/class/fail_base_method_define.carbon @@ -40,19 +40,19 @@ fn D.C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .D = %D.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %D.decl = class_decl @D {} [template = constants.%D] -// CHECK:STDOUT: %F: = fn_decl @F.3 {} [template] -// CHECK:STDOUT: %.loc27: = fn_decl @.1 {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %D.decl = class_decl @D [template = constants.%D] {} +// CHECK:STDOUT: %F: = fn_decl @F.3 [template] {} +// CHECK:STDOUT: %.loc27: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%B @@ -61,7 +61,7 @@ fn D.C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C diff --git a/toolchain/check/testdata/class/fail_base_modifiers.carbon b/toolchain/check/testdata/class/fail_base_modifiers.carbon index 14450bc3bbb4..b8a12018aff4 100644 --- a/toolchain/check/testdata/class/fail_base_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_base_modifiers.carbon @@ -62,18 +62,18 @@ class C4 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .C1 = %C1.decl // CHECK:STDOUT: .C2 = %C2.decl // CHECK:STDOUT: .C3 = %C3.decl // CHECK:STDOUT: .C4 = %C4.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C1.decl = class_decl @C1 {} [template = constants.%C1] -// CHECK:STDOUT: %C2.decl = class_decl @C2 {} [template = constants.%C2] -// CHECK:STDOUT: %C3.decl = class_decl @C3 {} [template = constants.%C3] -// CHECK:STDOUT: %C4.decl = class_decl @C4 {} [template = constants.%C4] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C1.decl = class_decl @C1 [template = constants.%C1] {} +// CHECK:STDOUT: %C2.decl = class_decl @C2 [template = constants.%C2] {} +// CHECK:STDOUT: %C3.decl = class_decl @C3 [template = constants.%C3] {} +// CHECK:STDOUT: %C4.decl = class_decl @C4 [template = constants.%C4] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { diff --git a/toolchain/check/testdata/class/fail_base_no_extend.carbon b/toolchain/check/testdata/class/fail_base_no_extend.carbon index acd9a45d27b9..bfaf9f8ac049 100644 --- a/toolchain/check/testdata/class/fail_base_no_extend.carbon +++ b/toolchain/check/testdata/class/fail_base_no_extend.carbon @@ -26,12 +26,12 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B { diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index d114d4c27293..e54938538cb8 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -46,16 +46,16 @@ class D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B1 = %B1.decl // CHECK:STDOUT: .B2 = %B2.decl // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .D = %D.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B1.decl = class_decl @B1 {} [template = constants.%B1] -// CHECK:STDOUT: %B2.decl = class_decl @B2 {} [template = constants.%B2] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %D.decl = class_decl @D {} [template = constants.%D] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B1.decl = class_decl @B1 [template = constants.%B1] {} +// CHECK:STDOUT: %B2.decl = class_decl @B2 [template = constants.%B2] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %D.decl = class_decl @D [template = constants.%D] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @B1 { diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index 55c05645f728..e7e2cfde86b7 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -28,12 +28,12 @@ let b: B = C.base; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %base.ref: = name_ref base, @C.%.loc10 [template = @C.%.loc10] diff --git a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon index d9608451d83c..0c19ff929877 100644 --- a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon +++ b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon @@ -24,15 +24,15 @@ fn Make() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .Make = %Make -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: @Make.%return: ref C = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 1a711e9e5708..40fb79b0e78a 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -53,18 +53,18 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A1 = %A1.decl // CHECK:STDOUT: .A2 = %A2.decl // CHECK:STDOUT: .B2 = %B2.decl // CHECK:STDOUT: .ConvertUnrelated = %ConvertUnrelated // CHECK:STDOUT: .Incomplete = %Incomplete.decl // CHECK:STDOUT: .ConvertIncomplete = %ConvertIncomplete -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A1.decl = class_decl @A1 {} [template = constants.%A1] -// CHECK:STDOUT: %A2.decl = class_decl @A2 {} [template = constants.%A2] -// CHECK:STDOUT: %B2.decl = class_decl @B2 {} [template = constants.%B2] -// CHECK:STDOUT: %ConvertUnrelated: = fn_decl @ConvertUnrelated { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A1.decl = class_decl @A1 [template = constants.%A1] {} +// CHECK:STDOUT: %A2.decl = class_decl @A2 [template = constants.%A2] {} +// CHECK:STDOUT: %B2.decl = class_decl @B2 [template = constants.%B2] {} +// CHECK:STDOUT: %ConvertUnrelated: = fn_decl @ConvertUnrelated [template] { // CHECK:STDOUT: %B2.ref: type = name_ref B2, %B2.decl [template = constants.%B2] // CHECK:STDOUT: %.loc23_26: type = ptr_type B2 [template = constants.%.8] // CHECK:STDOUT: %p.loc23_21.1: B2* = param p @@ -72,9 +72,9 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: %A1.ref: type = name_ref A1, %A1.decl [template = constants.%A1] // CHECK:STDOUT: %.loc23_34: type = ptr_type A1 [template = constants.%.9] // CHECK:STDOUT: %return.var.loc23: ref A1* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] -// CHECK:STDOUT: %ConvertIncomplete: = fn_decl @ConvertIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} +// CHECK:STDOUT: %ConvertIncomplete: = fn_decl @ConvertIncomplete [template] { // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc30_35: type = ptr_type Incomplete [template = constants.%.13] // CHECK:STDOUT: %p.loc30_22.1: Incomplete* = param p @@ -82,7 +82,7 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: %A2.ref: type = name_ref A2, %A2.decl [template = constants.%A2] // CHECK:STDOUT: %.loc30_43: type = ptr_type A2 [template = constants.%.14] // CHECK:STDOUT: %return.var.loc30: ref A2* = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A1 { diff --git a/toolchain/check/testdata/class/fail_field_modifiers.carbon b/toolchain/check/testdata/class/fail_field_modifiers.carbon index a1cfdc5fd268..795efdf40ec1 100644 --- a/toolchain/check/testdata/class/fail_field_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_field_modifiers.carbon @@ -38,10 +38,10 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/fail_import_misuses.carbon b/toolchain/check/testdata/class/fail_import_misuses.carbon index 8e3ed27db79e..7716739bdf83 100644 --- a/toolchain/check/testdata/class/fail_import_misuses.carbon +++ b/toolchain/check/testdata/class/fail_import_misuses.carbon @@ -43,12 +43,12 @@ var a: Incomplete; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .Incomplete = %Incomplete.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = class_decl @Empty {} [template = constants.%Empty] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = class_decl @Empty [template = constants.%Empty] {} +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Empty { @@ -68,17 +68,17 @@ var a: Incomplete; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %import_ref.1 // CHECK:STDOUT: .Incomplete = %import_ref.2 // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: type = import_ref ir1, inst+1, used [template = constants.%Empty] // CHECK:STDOUT: %import_ref.2: type = import_ref ir1, inst+4, used [template = constants.%Incomplete] -// CHECK:STDOUT: %.decl = class_decl @.1 { -// CHECK:STDOUT: %Empty.decl = class_decl @Empty {} [template = constants.%Empty] -// CHECK:STDOUT: } [template = constants.%.2] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: %.decl = class_decl @.1 [template = constants.%.2] { +// CHECK:STDOUT: %Empty.decl = class_decl @Empty [template = constants.%Empty] {} +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, %import_ref.2 [template = constants.%Incomplete] // CHECK:STDOUT: %a.var: ref = var a // CHECK:STDOUT: %a: ref = bind_name a, %a.var diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index ea3c6d614433..5d71e8c9d4ab 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -125,7 +125,7 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .CallClassFunction = %CallClassFunction // CHECK:STDOUT: .global_var = %global_var @@ -137,54 +137,54 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: .ReturnIncomplete = %ReturnIncomplete // CHECK:STDOUT: .CallTakeIncomplete = %CallTakeIncomplete // CHECK:STDOUT: .CallReturnIncomplete = %CallReturnIncomplete -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %.loc15: = fn_decl @.1 {} [template] -// CHECK:STDOUT: %CallClassFunction: = fn_decl @CallClassFunction {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %.loc15: = fn_decl @.1 [template] {} +// CHECK:STDOUT: %CallClassFunction: = fn_decl @CallClassFunction [template] {} // CHECK:STDOUT: %Class.ref.loc33: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %global_var.var: ref = var global_var // CHECK:STDOUT: %global_var: ref = bind_name global_var, %global_var.var -// CHECK:STDOUT: %ConvertFromStruct: = fn_decl @ConvertFromStruct { +// CHECK:STDOUT: %ConvertFromStruct: = fn_decl @ConvertFromStruct [template] { // CHECK:STDOUT: %Class.ref.loc41: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %return.var.loc41: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %MemberAccess: = fn_decl @MemberAccess { +// CHECK:STDOUT: } +// CHECK:STDOUT: %MemberAccess: = fn_decl @MemberAccess [template] { // CHECK:STDOUT: %Class.ref.loc48: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc48: type = ptr_type Class [template = constants.%.2] // CHECK:STDOUT: %p.loc48_17.1: Class* = param p // CHECK:STDOUT: @MemberAccess.%p: Class* = bind_name p, %p.loc48_17.1 // CHECK:STDOUT: %return.var.loc48: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Copy: = fn_decl @Copy { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Copy: = fn_decl @Copy [template] { // CHECK:STDOUT: %Class.ref.loc64_12: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc64: type = ptr_type Class [template = constants.%.2] // CHECK:STDOUT: %p.loc64_9.1: Class* = param p // CHECK:STDOUT: @Copy.%p: Class* = bind_name p, %p.loc64_9.1 // CHECK:STDOUT: %Class.ref.loc64_23: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %return.var.loc64: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Let: = fn_decl @Let { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Let: = fn_decl @Let [template] { // CHECK:STDOUT: %Class.ref.loc68: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc68: type = ptr_type Class [template = constants.%.2] // CHECK:STDOUT: %p.loc68_8.1: Class* = param p // CHECK:STDOUT: @Let.%p: Class* = bind_name p, %p.loc68_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %TakeIncomplete: = fn_decl @TakeIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %TakeIncomplete: = fn_decl @TakeIncomplete [template] { // CHECK:STDOUT: %Class.ref.loc78: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc78_19.1: Class = param c // CHECK:STDOUT: @TakeIncomplete.%c: Class = bind_name c, %c.loc78_19.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ReturnIncomplete: = fn_decl @ReturnIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ReturnIncomplete: = fn_decl @ReturnIncomplete [template] { // CHECK:STDOUT: %Class.ref.loc88: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %return.var.loc88: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallTakeIncomplete: = fn_decl @CallTakeIncomplete { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallTakeIncomplete: = fn_decl @CallTakeIncomplete [template] { // CHECK:STDOUT: %Class.ref.loc90: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc90: type = ptr_type Class [template = constants.%.2] // CHECK:STDOUT: %p.loc90_23.1: Class* = param p // CHECK:STDOUT: @CallTakeIncomplete.%p: Class* = bind_name p, %p.loc90_23.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallReturnIncomplete: = fn_decl @CallReturnIncomplete {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallReturnIncomplete: = fn_decl @CallReturnIncomplete [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class; diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index 25c1a78cca74..fafb5545bcf0 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -40,12 +40,12 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 5baab9344c9f..91ef7dcbfad1 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -37,19 +37,19 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc12: type = ptr_type Class [template = constants.%.3] // CHECK:STDOUT: %p.loc12_6.1: Class* = param p // CHECK:STDOUT: @G.%p: Class* = bind_name p, %p.loc12_6.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index 15284ca97653..c1c950507f4f 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -49,14 +49,14 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .B = %B.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %.loc15: type = struct_type {.a: A} [template = constants.%.6] // CHECK:STDOUT: %s.loc15_6.1: {.a: A} = param s @@ -64,17 +64,17 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: %B.ref: type = name_ref B, %B.decl [template = constants.%B] // CHECK:STDOUT: %b.loc15_18.1: B = param b // CHECK:STDOUT: @F.2.%b: B = bind_name b, %b.loc15_18.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %A.ref: type = name_ref A, file.%A.decl [template = constants.%A] // CHECK:STDOUT: %.loc8_20: type = ptr_type A [template = constants.%.1] // CHECK:STDOUT: %self.loc8_13.1: A* = param self // CHECK:STDOUT: %self.loc8_13.3: A* = bind_name self, %self.loc8_13.1 // CHECK:STDOUT: %.loc8_8: A* = addr_pattern %self.loc8_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index 2ba484902932..0f3493d88a91 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -26,19 +26,19 @@ fn T.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %T: type = bind_name T, %Class.ref -// CHECK:STDOUT: %.loc19: = fn_decl @.1 {} [template] +// CHECK:STDOUT: %.loc19: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 2c8632272cb4..33ed0c0cdfe8 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -50,29 +50,29 @@ fn F(c: Class) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: %Class.ref.loc12: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %WithSelf.ref: = name_ref WithSelf, @Class.%WithSelf [template = @Class.%WithSelf] // CHECK:STDOUT: %A: = bind_alias A, @Class.%WithSelf [template = @Class.%WithSelf] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Class.ref.loc14: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc14_6.1: Class = param c // CHECK:STDOUT: @F.%c: Class = bind_name c, %c.loc14_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %NoSelf: = fn_decl @NoSelf {} [template] -// CHECK:STDOUT: %WithSelf: = fn_decl @WithSelf { +// CHECK:STDOUT: %NoSelf: = fn_decl @NoSelf [template] {} +// CHECK:STDOUT: %WithSelf: = fn_decl @WithSelf [template] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %self.loc9_15.1: Class = param self // CHECK:STDOUT: %self.loc9_15.2: Class = bind_name self, %self.loc9_15.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_method_modifiers.carbon b/toolchain/check/testdata/class/fail_method_modifiers.carbon index 913d503624d8..e6adf551eeb5 100644 --- a/toolchain/check/testdata/class/fail_method_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_method_modifiers.carbon @@ -57,27 +57,27 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .FinalClass = %FinalClass.decl // CHECK:STDOUT: .AbstractClass = %AbstractClass.decl // CHECK:STDOUT: .BaseClass = %BaseClass.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %FinalClass.decl = class_decl @FinalClass {} [template = constants.%FinalClass] -// CHECK:STDOUT: %AbstractClass.decl = class_decl @AbstractClass {} [template = constants.%AbstractClass] -// CHECK:STDOUT: %BaseClass.decl = class_decl @BaseClass {} [template = constants.%BaseClass] +// CHECK:STDOUT: } +// CHECK:STDOUT: %FinalClass.decl = class_decl @FinalClass [template = constants.%FinalClass] {} +// CHECK:STDOUT: %AbstractClass.decl = class_decl @AbstractClass [template = constants.%AbstractClass] {} +// CHECK:STDOUT: %BaseClass.decl = class_decl @BaseClass [template = constants.%BaseClass] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @FinalClass { -// CHECK:STDOUT: %Abstract: = fn_decl @Abstract.1 { +// CHECK:STDOUT: %Abstract: = fn_decl @Abstract.1 [template] { // CHECK:STDOUT: %Self.ref.loc15: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] // CHECK:STDOUT: %self.loc15_24.1: FinalClass = param self // CHECK:STDOUT: %self.loc15_24.2: FinalClass = bind_name self, %self.loc15_24.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Virtual: = fn_decl @Virtual { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Virtual: = fn_decl @Virtual [template] { // CHECK:STDOUT: %Self.ref.loc23: type = name_ref Self, constants.%FinalClass [template = constants.%FinalClass] // CHECK:STDOUT: %self.loc23_22.1: FinalClass = param self // CHECK:STDOUT: %self.loc23_22.2: FinalClass = bind_name self, %self.loc23_22.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%FinalClass @@ -86,16 +86,16 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @AbstractClass { -// CHECK:STDOUT: %Default: = fn_decl @Default { +// CHECK:STDOUT: %Default: = fn_decl @Default [template] { // CHECK:STDOUT: %Self.ref.loc31: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] // CHECK:STDOUT: %self.loc31_22.1: AbstractClass = param self // CHECK:STDOUT: %self.loc31_22.2: AbstractClass = bind_name self, %self.loc31_22.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Final: = fn_decl @Final { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Final: = fn_decl @Final [template] { // CHECK:STDOUT: %Self.ref.loc36: type = name_ref Self, constants.%AbstractClass [template = constants.%AbstractClass] // CHECK:STDOUT: %self.loc36_18.1: AbstractClass = param self // CHECK:STDOUT: %self.loc36_18.2: AbstractClass = bind_name self, %self.loc36_18.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%AbstractClass @@ -104,11 +104,11 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @BaseClass { -// CHECK:STDOUT: %Abstract: = fn_decl @Abstract.2 { +// CHECK:STDOUT: %Abstract: = fn_decl @Abstract.2 [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%BaseClass [template = constants.%BaseClass] // CHECK:STDOUT: %self.loc47_24.1: BaseClass = param self // CHECK:STDOUT: %self.loc47_24.2: BaseClass = bind_name self, %self.loc47_24.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%BaseClass diff --git a/toolchain/check/testdata/class/fail_modifiers.carbon b/toolchain/check/testdata/class/fail_modifiers.carbon index f0319d5b1535..a77b9ff2b26c 100644 --- a/toolchain/check/testdata/class/fail_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_modifiers.carbon @@ -77,20 +77,20 @@ abstract base class AbstractAndBase {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .DuplicatePrivate = %DuplicatePrivate.decl // CHECK:STDOUT: .TwoAccess = %TwoAccess.decl // CHECK:STDOUT: .TwoAbstract = %TwoAbstract.decl // CHECK:STDOUT: .Virtual = %Virtual.decl // CHECK:STDOUT: .WrongOrder = %WrongOrder.decl // CHECK:STDOUT: .AbstractAndBase = %AbstractAndBase.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DuplicatePrivate.decl = class_decl @DuplicatePrivate {} [template = constants.%DuplicatePrivate] -// CHECK:STDOUT: %TwoAccess.decl = class_decl @TwoAccess {} [template = constants.%TwoAccess] -// CHECK:STDOUT: %TwoAbstract.decl = class_decl @TwoAbstract {} [template = constants.%TwoAbstract] -// CHECK:STDOUT: %Virtual.decl = class_decl @Virtual {} [template = constants.%Virtual] -// CHECK:STDOUT: %WrongOrder.decl = class_decl @WrongOrder {} [template = constants.%WrongOrder] -// CHECK:STDOUT: %AbstractAndBase.decl = class_decl @AbstractAndBase {} [template = constants.%AbstractAndBase] +// CHECK:STDOUT: } +// CHECK:STDOUT: %DuplicatePrivate.decl = class_decl @DuplicatePrivate [template = constants.%DuplicatePrivate] {} +// CHECK:STDOUT: %TwoAccess.decl = class_decl @TwoAccess [template = constants.%TwoAccess] {} +// CHECK:STDOUT: %TwoAbstract.decl = class_decl @TwoAbstract [template = constants.%TwoAbstract] {} +// CHECK:STDOUT: %Virtual.decl = class_decl @Virtual [template = constants.%Virtual] {} +// CHECK:STDOUT: %WrongOrder.decl = class_decl @WrongOrder [template = constants.%WrongOrder] {} +// CHECK:STDOUT: %AbstractAndBase.decl = class_decl @AbstractAndBase [template = constants.%AbstractAndBase] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @DuplicatePrivate; diff --git a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon index 45d8d27feef9..c0d567ce14f0 100644 --- a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon +++ b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon @@ -19,11 +19,11 @@ fn C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon index 36e36924296a..f9f28e2ad3d2 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon @@ -88,7 +88,7 @@ base class G; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl.loc7 // CHECK:STDOUT: .B = %B.decl.loc16 // CHECK:STDOUT: .C = %C.decl.loc25 @@ -96,22 +96,22 @@ base class G; // CHECK:STDOUT: .E = %E.decl.loc43 // CHECK:STDOUT: .F = %F.decl.loc52 // CHECK:STDOUT: .G = %G.decl.loc61 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl.loc7 = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %A.decl.loc14 = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl.loc16 = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %B.decl.loc23 = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl.loc25 = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %C.decl.loc32 = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %D.decl.loc34 = class_decl @D {} [template = constants.%D] -// CHECK:STDOUT: %D.decl.loc41 = class_decl @D {} [template = constants.%D] -// CHECK:STDOUT: %E.decl.loc43 = class_decl @E {} [template = constants.%E] -// CHECK:STDOUT: %E.decl.loc50 = class_decl @E {} [template = constants.%E] -// CHECK:STDOUT: %F.decl.loc52 = class_decl @F {} [template = constants.%F] -// CHECK:STDOUT: %F.decl.loc59 = class_decl @F {} [template = constants.%F] -// CHECK:STDOUT: %G.decl.loc61 = class_decl @G {} [template = constants.%G] -// CHECK:STDOUT: %G.decl.loc68 = class_decl @G {} [template = constants.%G] -// CHECK:STDOUT: %G.decl.loc75 = class_decl @G {} [template = constants.%G] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl.loc7 = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %A.decl.loc14 = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl.loc16 = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %B.decl.loc23 = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl.loc25 = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %C.decl.loc32 = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %D.decl.loc34 = class_decl @D [template = constants.%D] {} +// CHECK:STDOUT: %D.decl.loc41 = class_decl @D [template = constants.%D] {} +// CHECK:STDOUT: %E.decl.loc43 = class_decl @E [template = constants.%E] {} +// CHECK:STDOUT: %E.decl.loc50 = class_decl @E [template = constants.%E] {} +// CHECK:STDOUT: %F.decl.loc52 = class_decl @F [template = constants.%F] {} +// CHECK:STDOUT: %F.decl.loc59 = class_decl @F [template = constants.%F] {} +// CHECK:STDOUT: %G.decl.loc61 = class_decl @G [template = constants.%G] {} +// CHECK:STDOUT: %G.decl.loc68 = class_decl @G [template = constants.%G] {} +// CHECK:STDOUT: %G.decl.loc75 = class_decl @G [template = constants.%G] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { diff --git a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon index 640a9cbb1e49..3ff7da9d6eda 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon @@ -35,19 +35,19 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl.loc7 // CHECK:STDOUT: .X = %X.decl // CHECK:STDOUT: .Y = %Y.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl.loc7 = class_decl @A.1 {} [template = constants.%A.1] -// CHECK:STDOUT: %X.decl = class_decl @X {} [template = constants.%X] -// CHECK:STDOUT: %A.decl.loc15 = class_decl @A.1 {} [template = constants.%A.1] -// CHECK:STDOUT: %Y.decl = class_decl @Y {} [template = constants.%Y] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl.loc7 = class_decl @A.1 [template = constants.%A.1] {} +// CHECK:STDOUT: %X.decl = class_decl @X [template = constants.%X] {} +// CHECK:STDOUT: %A.decl.loc15 = class_decl @A.1 [template = constants.%A.1] {} +// CHECK:STDOUT: %Y.decl = class_decl @Y [template = constants.%Y] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A.1 { -// CHECK:STDOUT: %B.decl = class_decl @B.2 {} [template = constants.%B.2] +// CHECK:STDOUT: %B.decl = class_decl @B.2 [template = constants.%B.2] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A.1 @@ -55,8 +55,8 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { -// CHECK:STDOUT: %A.decl = class_decl @A.2 {} [template = constants.%A.2] -// CHECK:STDOUT: %B.decl = class_decl @B.1 {} [template = constants.%B.1] +// CHECK:STDOUT: %A.decl = class_decl @A.2 [template = constants.%A.2] {} +// CHECK:STDOUT: %B.decl = class_decl @B.1 [template = constants.%B.1] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%X @@ -64,7 +64,7 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A.2 { -// CHECK:STDOUT: %B.decl = class_decl @B.1 {} [template = constants.%B.1] +// CHECK:STDOUT: %B.decl = class_decl @B.1 [template = constants.%B.1] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%A.2 @@ -79,7 +79,7 @@ class Y { // CHECK:STDOUT: class @B.2; // CHECK:STDOUT: // CHECK:STDOUT: class @Y { -// CHECK:STDOUT: %.decl = class_decl @.1 {} [template = constants.%.2] +// CHECK:STDOUT: %.decl = class_decl @.1 [template = constants.%.2] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Y diff --git a/toolchain/check/testdata/class/fail_redefinition.carbon b/toolchain/check/testdata/class/fail_redefinition.carbon index efdd5abe239a..1cba19e0ff18 100644 --- a/toolchain/check/testdata/class/fail_redefinition.carbon +++ b/toolchain/check/testdata/class/fail_redefinition.carbon @@ -32,19 +32,19 @@ fn Class.H() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Class.decl.loc18 = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Class.decl.loc18 = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_reorder.carbon b/toolchain/check/testdata/class/fail_reorder.carbon index 513301b125e4..3a405e06c530 100644 --- a/toolchain/check/testdata/class/fail_reorder.carbon +++ b/toolchain/check/testdata/class/fail_reorder.carbon @@ -34,19 +34,19 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc23: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index 6434573b029a..db301433ba37 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -26,20 +26,20 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index be385976be64..cd2e2d122b41 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -61,39 +61,39 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .WrongSelf = %WrongSelf.decl // CHECK:STDOUT: .CallWrongSelf = %CallWrongSelf -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %Self.ref.loc25: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc25_12.1: Class = param self // CHECK:STDOUT: @F.1.%self: Class = bind_name self, %self.loc25_12.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc28: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: @G.%return: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %WrongSelf.decl = class_decl @WrongSelf {} [template = constants.%WrongSelf] -// CHECK:STDOUT: %CallWrongSelf: = fn_decl @CallWrongSelf { +// CHECK:STDOUT: } +// CHECK:STDOUT: %WrongSelf.decl = class_decl @WrongSelf [template = constants.%WrongSelf] {} +// CHECK:STDOUT: %CallWrongSelf: = fn_decl @CallWrongSelf [template] { // CHECK:STDOUT: %WrongSelf.ref: type = name_ref WrongSelf, %WrongSelf.decl [template = constants.%WrongSelf] // CHECK:STDOUT: %ws.loc43_18.1: WrongSelf = param ws // CHECK:STDOUT: @CallWrongSelf.%ws: WrongSelf = bind_name ws, %ws.loc43_18.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %Self.ref.loc11: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc11_8.1: Class = param self // CHECK:STDOUT: %self.loc11_8.2: Class = bind_name self, %self.loc11_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc19: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %return.var: ref Class = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class @@ -102,11 +102,11 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @WrongSelf { -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, file.%Class.decl [template = constants.%Class] // CHECK:STDOUT: %self.loc40_8.1: Class = param self // CHECK:STDOUT: %self.loc40_8.2: Class = bind_name self, %self.loc40_8.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%WrongSelf diff --git a/toolchain/check/testdata/class/fail_todo_generic.carbon b/toolchain/check/testdata/class/fail_todo_generic.carbon index ec157049a17c..7b90ad55e20a 100644 --- a/toolchain/check/testdata/class/fail_todo_generic.carbon +++ b/toolchain/check/testdata/class/fail_todo_generic.carbon @@ -19,10 +19,10 @@ class C[](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C; diff --git a/toolchain/check/testdata/class/fail_todo_generic_method.carbon b/toolchain/check/testdata/class/fail_todo_generic_method.carbon index 8b0c5d5fd785..732d318b3b82 100644 --- a/toolchain/check/testdata/class/fail_todo_generic_method.carbon +++ b/toolchain/check/testdata/class/fail_todo_generic_method.carbon @@ -32,30 +32,30 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] { // CHECK:STDOUT: %T.loc10_13.1: type = param T // CHECK:STDOUT: %T.loc10_13.2: type = bind_symbolic_name T, %T.loc10_13.1 [symbolic] -// CHECK:STDOUT: } [template = constants.%Class] -// CHECK:STDOUT: %.loc24: = fn_decl @.1 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc24: = fn_decl @.1 [template] { // CHECK:STDOUT: %T.loc24_10.1: type = param T // CHECK:STDOUT: @.1.%T: type = bind_symbolic_name T, %T.loc24_10.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %T.ref.loc11: type = name_ref T, file.%T.loc10_13.2 [symbolic = file.%T.loc10_13.2] // CHECK:STDOUT: %.loc11: = field_decl a, element0 [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc12_8.1: Class = param self // CHECK:STDOUT: %self.loc12_8.2: Class = bind_name self, %self.loc12_8.1 // CHECK:STDOUT: %T.ref.loc12: type = name_ref T, file.%T.loc10_13.2 [symbolic = file.%T.loc10_13.2] // CHECK:STDOUT: %n.loc12_20.1: T = param n // CHECK:STDOUT: %n.loc12_20.2: T = bind_name n, %n.loc12_20.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon b/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon index f41bdea48188..5b83b43b17a2 100644 --- a/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon +++ b/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon @@ -33,10 +33,10 @@ class ForwardDecl { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .ForwardDecl = %ForwardDecl.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ForwardDecl.decl = class_decl @ForwardDecl {} [template = constants.%ForwardDecl] +// CHECK:STDOUT: } +// CHECK:STDOUT: %ForwardDecl.decl = class_decl @ForwardDecl [template = constants.%ForwardDecl] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDecl; @@ -50,13 +50,13 @@ class ForwardDecl { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .ForwardDecl = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: type = import_ref ir1, inst+1, used [template = constants.%ForwardDecl] -// CHECK:STDOUT: %.decl = class_decl @.1 { -// CHECK:STDOUT: %ForwardDecl.decl = class_decl @ForwardDecl {} [template = constants.%ForwardDecl] -// CHECK:STDOUT: } [template = constants.%.1] +// CHECK:STDOUT: %.decl = class_decl @.1 [template = constants.%.1] { +// CHECK:STDOUT: %ForwardDecl.decl = class_decl @ForwardDecl [template = constants.%ForwardDecl] {} +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDecl; diff --git a/toolchain/check/testdata/class/fail_todo_modifiers.carbon b/toolchain/check/testdata/class/fail_todo_modifiers.carbon index 8ba7a1d46fc9..c383da897572 100644 --- a/toolchain/check/testdata/class/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_todo_modifiers.carbon @@ -70,19 +70,19 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Access = %Access.decl // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Abstract = %Abstract.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Access.decl = class_decl @Access {} [template = constants.%Access] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract {} [template = constants.%Abstract] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Access.decl = class_decl @Access [template = constants.%Access] {} +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract [template = constants.%Abstract] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Access { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} // CHECK:STDOUT: %.loc22: = field_decl k, element0 [template] // CHECK:STDOUT: %.loc27: = field_decl l, element1 [template] // CHECK:STDOUT: @@ -95,8 +95,8 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { -// CHECK:STDOUT: %H: = fn_decl @H {} [template] -// CHECK:STDOUT: %I: = fn_decl @I {} [template] +// CHECK:STDOUT: %H: = fn_decl @H [template] {} +// CHECK:STDOUT: %I: = fn_decl @I [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Base @@ -105,9 +105,9 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Abstract { -// CHECK:STDOUT: %J: = fn_decl @J {} [template] -// CHECK:STDOUT: %K: = fn_decl @K {} [template] -// CHECK:STDOUT: %L: = fn_decl @L {} [template] +// CHECK:STDOUT: %J: = fn_decl @J [template] {} +// CHECK:STDOUT: %K: = fn_decl @K [template] {} +// CHECK:STDOUT: %L: = fn_decl @L [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Abstract diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index 3865eb8614be..9ad1ecf1a4ae 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -30,21 +30,21 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { // CHECK:STDOUT: %.loc8: = field_decl field, element0 [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 549e6714d56e..87568b2641ed 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -26,17 +26,17 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc11_6.1: Class = param c // CHECK:STDOUT: @G.%c: Class = bind_name c, %c.loc11_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index 907911be22cd..63f9098750c2 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -29,12 +29,12 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index 078087a40b38..db5940e5ac00 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -30,12 +30,12 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Test = %Test -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Test: = fn_decl @Test {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Test: = fn_decl @Test [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 2bf3f4bc55ec..b0967c95dcd9 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -16,12 +16,12 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Class.ref.loc9_9: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc9_14: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %p.loc9_6.1: Class* = param p @@ -29,7 +29,7 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: %Class.ref.loc9_20: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc9_25: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %return.var: ref Class* = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class; diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 634ad92a0cc7..9b1d02320569 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -59,17 +59,17 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .Field = %Field.decl // CHECK:STDOUT: .ForwardDeclared = %ForwardDeclared.decl.loc11 // CHECK:STDOUT: .Incomplete = %Incomplete.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = class_decl @Empty {} [template = constants.%Empty] -// CHECK:STDOUT: %Field.decl = class_decl @Field {} [template = constants.%Field] -// CHECK:STDOUT: %ForwardDeclared.decl.loc11 = class_decl @ForwardDeclared {} [template = constants.%ForwardDeclared] -// CHECK:STDOUT: %ForwardDeclared.decl.loc13 = class_decl @ForwardDeclared {} [template = constants.%ForwardDeclared] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = class_decl @Empty [template = constants.%Empty] {} +// CHECK:STDOUT: %Field.decl = class_decl @Field [template = constants.%Field] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc11 = class_decl @ForwardDeclared [template = constants.%ForwardDeclared] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc13 = class_decl @ForwardDeclared [template = constants.%ForwardDeclared] {} +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Empty { @@ -86,18 +86,18 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @ForwardDeclared { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] // CHECK:STDOUT: %self.loc14_8.1: ForwardDeclared = param self // CHECK:STDOUT: %self.loc14_8.2: ForwardDeclared = bind_name self, %self.loc14_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc15: type = name_ref Self, constants.%ForwardDeclared [template = constants.%ForwardDeclared] // CHECK:STDOUT: %.loc15_23: type = ptr_type ForwardDeclared [template = constants.%.4] // CHECK:STDOUT: %self.loc15_13.1: ForwardDeclared* = param self // CHECK:STDOUT: %self.loc15_13.3: ForwardDeclared* = bind_name self, %self.loc15_13.1 // CHECK:STDOUT: %.loc15_8: ForwardDeclared* = addr_pattern %self.loc15_13.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%ForwardDeclared @@ -134,18 +134,18 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %import_ref.1 // CHECK:STDOUT: .Field = %import_ref.2 // CHECK:STDOUT: .ForwardDeclared = %import_ref.3 // CHECK:STDOUT: .Incomplete = %import_ref.4 // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: type = import_ref ir1, inst+1, used [template = constants.%Empty] // CHECK:STDOUT: %import_ref.2: type = import_ref ir1, inst+4, used [template = constants.%Field] // CHECK:STDOUT: %import_ref.3: type = import_ref ir1, inst+11, used [template = constants.%ForwardDeclared] // CHECK:STDOUT: %import_ref.4: type = import_ref ir1, inst+25, used [template = constants.%Incomplete] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Empty { @@ -179,7 +179,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Empty.decl = class_decl @Empty {} [template = constants.%Empty] +// CHECK:STDOUT: %Empty.decl = class_decl @Empty [template = constants.%Empty] {} // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, file.%import_ref.1 [template = constants.%Empty] // CHECK:STDOUT: %a.var: ref Empty = var a // CHECK:STDOUT: %a: ref Empty = bind_name a, %a.var @@ -187,7 +187,7 @@ fn Run() { // CHECK:STDOUT: %.loc7_19.2: init Empty = class_init (), %a.var [template = constants.%.4] // CHECK:STDOUT: %.loc7_19.3: init Empty = converted %.loc7_19.1, %.loc7_19.2 [template = constants.%.4] // CHECK:STDOUT: assign %a.var, %.loc7_19.3 -// CHECK:STDOUT: %Field.decl = class_decl @Field {} [template = constants.%Field] +// CHECK:STDOUT: %Field.decl = class_decl @Field [template = constants.%Field] {} // CHECK:STDOUT: %Field.ref: type = name_ref Field, file.%import_ref.2 [template = constants.%Field] // CHECK:STDOUT: %b.var: ref Field = var b // CHECK:STDOUT: %b: ref Field = bind_name b, %b.var @@ -202,7 +202,7 @@ fn Run() { // CHECK:STDOUT: %.loc10_4: ref i32 = class_element_access %b.ref, element0 // CHECK:STDOUT: %.loc10_9: i32 = int_literal 2 [template = constants.%.10] // CHECK:STDOUT: assign %.loc10_4, %.loc10_9 -// CHECK:STDOUT: %ForwardDeclared.decl = class_decl @ForwardDeclared {} [template = constants.%ForwardDeclared] +// CHECK:STDOUT: %ForwardDeclared.decl = class_decl @ForwardDeclared [template = constants.%ForwardDeclared] {} // CHECK:STDOUT: %ForwardDeclared.ref.loc12: type = name_ref ForwardDeclared, file.%import_ref.3 [template = constants.%ForwardDeclared] // CHECK:STDOUT: %c.var: ref ForwardDeclared = var c // CHECK:STDOUT: %c: ref ForwardDeclared = bind_name c, %c.var @@ -225,7 +225,7 @@ fn Run() { // CHECK:STDOUT: %c.ref.loc16: ref ForwardDeclared = name_ref c, %c // CHECK:STDOUT: %.loc16_29: ForwardDeclared* = addr_of %c.ref.loc16 // CHECK:STDOUT: assign %d.var, %.loc16_29 -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %Incomplete.ref: type = name_ref Incomplete, file.%import_ref.4 [template = constants.%Incomplete] // CHECK:STDOUT: %.loc18: type = ptr_type Incomplete [template = constants.%.13] // CHECK:STDOUT: %e.var: ref Incomplete* = var e diff --git a/toolchain/check/testdata/class/import_base.carbon b/toolchain/check/testdata/class/import_base.carbon index 1a31ff3adbfd..56722cd4d443 100644 --- a/toolchain/check/testdata/class/import_base.carbon +++ b/toolchain/check/testdata/class/import_base.carbon @@ -45,25 +45,25 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Child = %Child.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Child.decl = class_decl @Child {} [template = constants.%Child] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Child.decl = class_decl @Child [template = constants.%Child] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc5: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %self.loc5_8.1: Base = param self // CHECK:STDOUT: %self.loc5_8.2: Base = bind_name self, %self.loc5_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Unused: = fn_decl @Unused { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Unused: = fn_decl @Unused [template] { // CHECK:STDOUT: %Self.ref.loc6: type = name_ref Self, constants.%Base [template = constants.%Base] // CHECK:STDOUT: %self.loc6_13.1: Base = param self // CHECK:STDOUT: %self.loc6_13.2: Base = bind_name self, %self.loc6_13.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc8: = field_decl x, element0 [template] // CHECK:STDOUT: %.loc9: = field_decl unused, element1 [template] // CHECK:STDOUT: @@ -111,14 +111,14 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %import_ref.1 // CHECK:STDOUT: .Child = %import_ref.2 // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+1, unused // CHECK:STDOUT: %import_ref.2: type = import_ref ir1, inst+19, used [template = constants.%Child] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Child { @@ -148,8 +148,8 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Child.decl = class_decl @Child {} [template = constants.%Child] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] +// CHECK:STDOUT: %Child.decl = class_decl @Child [template = constants.%Child] {} +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} // CHECK:STDOUT: %Child.ref: type = name_ref Child, file.%import_ref.2 [template = constants.%Child] // CHECK:STDOUT: %a.var: ref Child = var a // CHECK:STDOUT: %a: ref Child = bind_name a, %a.var diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index 23e8896d3f90..be2eefc49cca 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -32,10 +32,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cycle = %Cycle.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle {} [template = constants.%Cycle] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle [template = constants.%Cycle] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle { @@ -57,12 +57,12 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cycle = %import_ref // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: type = import_ref ir1, inst+1, used [template = constants.%Cycle] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle { @@ -76,7 +76,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle {} [template = constants.%Cycle] +// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle [template = constants.%Cycle] {} // CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, file.%import_ref [template = constants.%Cycle] // CHECK:STDOUT: %.loc7: type = ptr_type Cycle [template = constants.%.1] // CHECK:STDOUT: %a.var: ref Cycle* = var a diff --git a/toolchain/check/testdata/class/import_struct_cyle.carbon b/toolchain/check/testdata/class/import_struct_cyle.carbon index e6d321ac518c..0b63ccee30f3 100644 --- a/toolchain/check/testdata/class/import_struct_cyle.carbon +++ b/toolchain/check/testdata/class/import_struct_cyle.carbon @@ -38,17 +38,17 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cycle = %Cycle.decl.loc4 // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Cycle.decl.loc4 = class_decl @Cycle {} [template = constants.%Cycle] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Cycle.decl.loc4 = class_decl @Cycle [template = constants.%Cycle] {} // CHECK:STDOUT: %Cycle.ref: type = name_ref Cycle, %Cycle.decl.loc4 [template = constants.%Cycle] // CHECK:STDOUT: %.loc6_18: type = ptr_type Cycle [template = constants.%.1] // CHECK:STDOUT: %.loc6_19: type = struct_type {.b: Cycle*} [template = constants.%.2] // CHECK:STDOUT: %a.var: ref {.b: Cycle*} = var a // CHECK:STDOUT: %a: ref {.b: Cycle*} = bind_name a, %a.var -// CHECK:STDOUT: %Cycle.decl.loc8 = class_decl @Cycle {} [template = constants.%Cycle] +// CHECK:STDOUT: %Cycle.decl.loc8 = class_decl @Cycle [template = constants.%Cycle] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle { @@ -74,14 +74,14 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cycle = %import_ref.1 // CHECK:STDOUT: .a = %import_ref.2 // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+1, unused // CHECK:STDOUT: %import_ref.2: ref {.b: Cycle*} = import_ref ir1, inst+11, used -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Cycle { @@ -95,7 +95,7 @@ fn Run() { // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { // CHECK:STDOUT: !entry: -// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle {} [template = constants.%Cycle] +// CHECK:STDOUT: %Cycle.decl = class_decl @Cycle [template = constants.%Cycle] {} // CHECK:STDOUT: %a.ref.loc7_3: ref {.b: Cycle*} = name_ref a, file.%import_ref.2 // CHECK:STDOUT: %.loc7_4: ref Cycle* = struct_access %a.ref.loc7_3, element0 // CHECK:STDOUT: %a.ref.loc7_11: ref {.b: Cycle*} = name_ref a, file.%import_ref.2 diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index b7edb95b20d5..5ae663693768 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -30,13 +30,13 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .MakeReorder = %MakeReorder -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %n.loc12_9.1: i32 = param n // CHECK:STDOUT: @Make.%n: i32 = bind_name n, %n.loc12_9.1 // CHECK:STDOUT: %Class.ref.loc12_23: type = name_ref Class, %Class.decl [template = constants.%Class] @@ -45,8 +45,8 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: @Make.%next: Class* = bind_name next, %next.loc12_17.1 // CHECK:STDOUT: %Class.ref.loc12_34: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: @Make.%return: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %MakeReorder: = fn_decl @MakeReorder { +// CHECK:STDOUT: } +// CHECK:STDOUT: %MakeReorder: = fn_decl @MakeReorder [template] { // CHECK:STDOUT: %n.loc16_16.1: i32 = param n // CHECK:STDOUT: @MakeReorder.%n: i32 = bind_name n, %n.loc16_16.1 // CHECK:STDOUT: %Class.ref.loc16_30: type = name_ref Class, %Class.decl [template = constants.%Class] @@ -55,7 +55,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: @MakeReorder.%next: Class* = bind_name next, %next.loc16_24.1 // CHECK:STDOUT: %Class.ref.loc16_41: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: @MakeReorder.%return: ref Class = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index 3b4d43959d1a..ab180d50683c 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -26,14 +26,14 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 5601fd020e54..b420182519b7 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -36,22 +36,22 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Inner = %Inner.decl // CHECK:STDOUT: .MakeInner = %MakeInner // CHECK:STDOUT: .Outer = %Outer.decl // CHECK:STDOUT: .MakeOuter = %MakeOuter -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Inner.decl = class_decl @Inner {} [template = constants.%Inner] -// CHECK:STDOUT: %MakeInner: = fn_decl @MakeInner { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Inner.decl = class_decl @Inner [template = constants.%Inner] {} +// CHECK:STDOUT: %MakeInner: = fn_decl @MakeInner [template] { // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, %Inner.decl [template = constants.%Inner] // CHECK:STDOUT: @MakeInner.%return: ref Inner = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Outer.decl = class_decl @Outer {} [template = constants.%Outer] -// CHECK:STDOUT: %MakeOuter: = fn_decl @MakeOuter { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Outer.decl = class_decl @Outer [template = constants.%Outer] {} +// CHECK:STDOUT: %MakeOuter: = fn_decl @MakeOuter [template] { // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer] // CHECK:STDOUT: @MakeOuter.%return: ref Outer = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Inner { diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index a1aebf1dd6fa..4f7f287ebea2 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -67,7 +67,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Call = %Call // CHECK:STDOUT: .CallAlias = %CallAlias @@ -78,73 +78,73 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: .Make = %Make // CHECK:STDOUT: .CallFOnInitializingExpr = %CallFOnInitializingExpr // CHECK:STDOUT: .CallGOnInitializingExpr = %CallGOnInitializingExpr -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc16_12.1: Class = param self // CHECK:STDOUT: @F.%self: Class = bind_name self, %self.loc16_12.1 // CHECK:STDOUT: %return.var.loc16: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Call: = fn_decl @Call { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Call: = fn_decl @Call [template] { // CHECK:STDOUT: %Class.ref.loc20: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc20_9.1: Class = param c // CHECK:STDOUT: @Call.%c: Class = bind_name c, %c.loc20_9.1 // CHECK:STDOUT: %return.var.loc20: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallAlias: = fn_decl @CallAlias { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallAlias: = fn_decl @CallAlias [template] { // CHECK:STDOUT: %Class.ref.loc26: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %c.loc26_14.1: Class = param c // CHECK:STDOUT: @CallAlias.%c: Class = bind_name c, %c.loc26_14.1 // CHECK:STDOUT: %return.var.loc26: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallOnConstBoundMethod: = fn_decl @CallOnConstBoundMethod { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallOnConstBoundMethod: = fn_decl @CallOnConstBoundMethod [template] { // CHECK:STDOUT: %return.var.loc30: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallWithAddr: = fn_decl @CallWithAddr { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallWithAddr: = fn_decl @CallWithAddr [template] { // CHECK:STDOUT: %return.var.loc34: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallFThroughPointer: = fn_decl @CallFThroughPointer { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallFThroughPointer: = fn_decl @CallFThroughPointer [template] { // CHECK:STDOUT: %Class.ref.loc39: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc39: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %p.loc39_24.1: Class* = param p // CHECK:STDOUT: @CallFThroughPointer.%p: Class* = bind_name p, %p.loc39_24.1 // CHECK:STDOUT: %return.var.loc39: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallGThroughPointer: = fn_decl @CallGThroughPointer { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallGThroughPointer: = fn_decl @CallGThroughPointer [template] { // CHECK:STDOUT: %Class.ref.loc43: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %.loc43: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %p.loc43_24.1: Class* = param p // CHECK:STDOUT: @CallGThroughPointer.%p: Class* = bind_name p, %p.loc43_24.1 // CHECK:STDOUT: %return.var.loc43: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Make: = fn_decl @Make { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Make: = fn_decl @Make [template] { // CHECK:STDOUT: %Class.ref.loc47: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: @Make.%return: ref Class = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallFOnInitializingExpr: = fn_decl @CallFOnInitializingExpr { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallFOnInitializingExpr: = fn_decl @CallFOnInitializingExpr [template] { // CHECK:STDOUT: %return.var.loc49: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %CallGOnInitializingExpr: = fn_decl @CallGOnInitializingExpr { +// CHECK:STDOUT: } +// CHECK:STDOUT: %CallGOnInitializingExpr: = fn_decl @CallGOnInitializingExpr [template] { // CHECK:STDOUT: %return.var.loc53: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc8: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc8_8.1: Class = param self // CHECK:STDOUT: %self.loc8_8.2: Class = bind_name self, %self.loc8_8.1 // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc9: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc9_23: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc9_13.1: Class* = param self // CHECK:STDOUT: %self.loc9_13.3: Class* = bind_name self, %self.loc9_13.1 // CHECK:STDOUT: %.loc9_8: Class* = addr_pattern %self.loc9_13.3 // CHECK:STDOUT: %return.var.loc9: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %F.ref: = name_ref F, %F [template = %F] // CHECK:STDOUT: %A: = bind_alias A, %F [template = %F] // CHECK:STDOUT: %.loc13: = field_decl k, element0 [template] diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 2855ac8f9b0e..1303b0d4c3ee 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -45,21 +45,21 @@ fn F(a: Outer*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Outer = %Outer.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Outer.decl = class_decl @Outer {} [template = constants.%Outer] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Outer.decl = class_decl @Outer [template = constants.%Outer] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %.loc19: type = ptr_type Outer [template = constants.%.3] // CHECK:STDOUT: %a.loc19_6.1: Outer* = param a // CHECK:STDOUT: @F.%a: Outer* = bind_name a, %a.loc19_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Outer { -// CHECK:STDOUT: %Inner.decl = class_decl @Inner {} [template = constants.%Inner] +// CHECK:STDOUT: %Inner.decl = class_decl @Inner [template = constants.%Inner] {} // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Outer [template = constants.%Outer] // CHECK:STDOUT: %.loc14_15: type = ptr_type Outer [template = constants.%.3] // CHECK:STDOUT: %.loc14_9: = field_decl po, element0 [template] diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 18615a8e2c12..16390c78eea5 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -32,28 +32,28 @@ fn G(o: Outer) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Outer = %Outer.decl // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Outer.decl = class_decl @Outer {} [template = constants.%Outer] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Outer.decl = class_decl @Outer [template = constants.%Outer] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Outer.ref.loc13: type = name_ref Outer, %Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %Inner.ref: type = name_ref Inner, @Outer.%Inner.decl [template = constants.%Inner] // CHECK:STDOUT: %oi.loc13_6.1: Inner = param oi // CHECK:STDOUT: @F.%oi: Inner = bind_name oi, %oi.loc13_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Outer.ref.loc17: type = name_ref Outer, %Outer.decl [template = constants.%Outer] // CHECK:STDOUT: %o.loc17_6.1: Outer = param o // CHECK:STDOUT: @G.%o: Outer = bind_name o, %o.loc17_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Outer { -// CHECK:STDOUT: %Inner.decl = class_decl @Inner {} [template = constants.%Inner] +// CHECK:STDOUT: %Inner.decl = class_decl @Inner [template = constants.%Inner] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Outer diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index 43da9bf75a23..116195322a54 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -32,11 +32,11 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc13: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc13_27: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc13_17.1: Class* = param self @@ -44,8 +44,8 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: @F.%.loc13: Class* = addr_pattern @F.%self.loc13_17 // CHECK:STDOUT: %self.loc13_30.1: i32 = param r#self // CHECK:STDOUT: @F.%self.loc13_30: i32 = bind_name r#self, %self.loc13_30.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc17: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc17_12.1: Class = param self // CHECK:STDOUT: @G.%self.loc17_12: Class = bind_name self, %self.loc17_12.1 @@ -54,11 +54,11 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc17_49.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc17_49.2: type = converted %.loc17_49.1, constants.%.3 [template = constants.%.3] // CHECK:STDOUT: @G.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc8: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc8_23: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc8_13.1: Class* = param self @@ -66,8 +66,8 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc8_8: Class* = addr_pattern %self.loc8_13.3 // CHECK:STDOUT: %self.loc8_26.1: i32 = param r#self // CHECK:STDOUT: %self.loc8_26.2: i32 = bind_name r#self, %self.loc8_26.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc9: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc9_8.1: Class = param self // CHECK:STDOUT: %self.loc9_8.2: Class = bind_name self, %self.loc9_8.1 @@ -76,7 +76,7 @@ fn Class.G[self: Self](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: %.loc9_45.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc9_45.2: type = converted %.loc9_45.1, constants.%.3 [template = constants.%.3] // CHECK:STDOUT: %return.var: ref (i32, i32) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index 0692f8eb2275..118fb1e711f9 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -32,24 +32,24 @@ fn MemberNamedSelf.F(x: Self, y: r#Self) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .MemberNamedSelf = %MemberNamedSelf.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %MemberNamedSelf.decl = class_decl @MemberNamedSelf {} [template = constants.%MemberNamedSelf] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %MemberNamedSelf.decl = class_decl @MemberNamedSelf [template = constants.%MemberNamedSelf] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %Self.ref.loc20_25: type = name_ref Self, constants.%MemberNamedSelf [template = constants.%MemberNamedSelf] // CHECK:STDOUT: %x.loc20_22.1: MemberNamedSelf = param x // CHECK:STDOUT: @F.2.%x: MemberNamedSelf = bind_name x, %x.loc20_22.1 // CHECK:STDOUT: %Self.ref.loc20_34: type = name_ref r#Self, @MemberNamedSelf.%Self.decl [template = constants.%Self] // CHECK:STDOUT: %y.loc20_31.1: r#Self = param y // CHECK:STDOUT: @F.2.%y: r#Self = bind_name y, %y.loc20_31.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class @@ -57,15 +57,15 @@ fn MemberNamedSelf.F(x: Self, y: r#Self) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @MemberNamedSelf { -// CHECK:STDOUT: %Self.decl = class_decl @Self {} [template = constants.%Self] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: %Self.decl = class_decl @Self [template = constants.%Self] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %Self.ref.loc17_11: type = name_ref Self, constants.%MemberNamedSelf [template = constants.%MemberNamedSelf] // CHECK:STDOUT: %x.loc17_8.1: MemberNamedSelf = param x // CHECK:STDOUT: %x.loc17_8.2: MemberNamedSelf = bind_name x, %x.loc17_8.1 // CHECK:STDOUT: %Self.ref.loc17_20: type = name_ref r#Self, %Self.decl [template = constants.%Self] // CHECK:STDOUT: %y.loc17_17.1: r#Self = param y // CHECK:STDOUT: %y.loc17_17.2: r#Self = bind_name y, %y.loc17_17.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%MemberNamedSelf diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index f932462f6eeb..c6cdfcb22931 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -22,28 +22,28 @@ fn Class.F[self: Self](b: bool) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Class.decl.loc9 = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Class.decl.loc9 = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc13_12.1: Class = param self // CHECK:STDOUT: @F.%self: Class = bind_name self, %self.loc13_12.1 // CHECK:STDOUT: %b.loc13_24.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc13_24.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc10_8.1: Class = param self // CHECK:STDOUT: %self.loc10_8.2: Class = bind_name self, %self.loc10_8.1 // CHECK:STDOUT: %b.loc10_20.1: bool = param b // CHECK:STDOUT: %b.loc10_20.2: bool = bind_name b, %b.loc10_20.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index e1abfd882cce..30f4f52d0489 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -22,17 +22,17 @@ abstract class C {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl.loc7 // CHECK:STDOUT: .B = %B.decl.loc8 // CHECK:STDOUT: .C = %C.decl.loc9 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl.loc7 = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl.loc8 = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl.loc9 = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %A.decl.loc11 = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %B.decl.loc12 = class_decl @B {} [template = constants.%B] -// CHECK:STDOUT: %C.decl.loc13 = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl.loc7 = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl.loc8 = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl.loc9 = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %A.decl.loc11 = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %B.decl.loc12 = class_decl @B [template = constants.%B] {} +// CHECK:STDOUT: %C.decl.loc13 = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @A { diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index e07e01f4191a..e5ab046f2ab5 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -22,22 +22,22 @@ fn Class.F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc9: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index a41d7bfc9774..0493997e888d 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -33,25 +33,25 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc12: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index ae23ab00466a..3eabb4e80f4e 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -30,41 +30,41 @@ fn Class.G[addr self: Self*]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc14: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc14_12.1: Class = param self // CHECK:STDOUT: @F.%self: Class = bind_name self, %self.loc14_12.1 // CHECK:STDOUT: %return.var.loc14: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc18: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc18_27: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc18_17.1: Class* = param self // CHECK:STDOUT: @G.%self: Class* = bind_name self, %self.loc18_17.1 // CHECK:STDOUT: @G.%.loc18: Class* = addr_pattern @G.%self // CHECK:STDOUT: %return.var.loc18: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc8: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc8_8.1: Class = param self // CHECK:STDOUT: %self.loc8_8.2: Class = bind_name self, %self.loc8_8.1 // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %Self.ref.loc9: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc9_23: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %self.loc9_13.1: Class* = param self // CHECK:STDOUT: %self.loc9_13.3: Class* = bind_name self, %self.loc9_13.1 // CHECK:STDOUT: %.loc9_8: Class* = addr_pattern %self.loc9_13.3 // CHECK:STDOUT: %return.var.loc9: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc11: = field_decl n, element0 [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index a7f96256f8f1..047794631e0c 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -47,33 +47,33 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Base = %Base.decl // CHECK:STDOUT: .Derived = %Derived.decl // CHECK:STDOUT: .Call = %Call -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Base.decl = class_decl @Base {} [template = constants.%Base] -// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived] -// CHECK:STDOUT: %SelfBase: = fn_decl @SelfBase { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Base.decl = class_decl @Base [template = constants.%Base] {} +// CHECK:STDOUT: %Derived.decl = class_decl @Derived [template = constants.%Derived] {} +// CHECK:STDOUT: %SelfBase: = fn_decl @SelfBase [template] { // CHECK:STDOUT: %Base.ref.loc18: type = name_ref Base, %Base.decl [template = constants.%Base] // CHECK:STDOUT: %self.loc18_21.1: Base = param self // CHECK:STDOUT: @SelfBase.%self: Base = bind_name self, %self.loc18_21.1 // CHECK:STDOUT: %return.var.loc18: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AddrSelfBase: = fn_decl @AddrSelfBase { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AddrSelfBase: = fn_decl @AddrSelfBase [template] { // CHECK:STDOUT: %Base.ref.loc22: type = name_ref Base, %Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc22_40: type = ptr_type Base [template = constants.%.5] // CHECK:STDOUT: %self.loc22_30.1: Base* = param self // CHECK:STDOUT: @AddrSelfBase.%self: Base* = bind_name self, %self.loc22_30.1 // CHECK:STDOUT: @AddrSelfBase.%.loc22: Base* = addr_pattern @AddrSelfBase.%self -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Call: = fn_decl @Call { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Call: = fn_decl @Call [template] { // CHECK:STDOUT: %Derived.ref: type = name_ref Derived, %Derived.decl [template = constants.%Derived] // CHECK:STDOUT: %.loc26: type = ptr_type Derived [template = constants.%.8] // CHECK:STDOUT: %p.loc26_9.1: Derived* = param p // CHECK:STDOUT: @Call.%p: Derived* = bind_name p, %p.loc26_9.1 // CHECK:STDOUT: %return.var.loc26: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Base { @@ -87,19 +87,19 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: class @Derived { // CHECK:STDOUT: %Base.ref.loc12: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc12: = base_decl Base, element0 [template] -// CHECK:STDOUT: %SelfBase: = fn_decl @SelfBase { +// CHECK:STDOUT: %SelfBase: = fn_decl @SelfBase [template] { // CHECK:STDOUT: %Base.ref.loc14: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %self.loc14_15.1: Base = param self // CHECK:STDOUT: %self.loc14_15.2: Base = bind_name self, %self.loc14_15.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AddrSelfBase: = fn_decl @AddrSelfBase { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AddrSelfBase: = fn_decl @AddrSelfBase [template] { // CHECK:STDOUT: %Base.ref.loc15: type = name_ref Base, file.%Base.decl [template = constants.%Base] // CHECK:STDOUT: %.loc15_34: type = ptr_type Base [template = constants.%.5] // CHECK:STDOUT: %self.loc15_24.1: Base* = param self // CHECK:STDOUT: %self.loc15_24.3: Base* = bind_name self, %self.loc15_24.1 // CHECK:STDOUT: %.loc15_19: Base* = addr_pattern %self.loc15_24.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Derived diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index 13ab9b045141..97b32fdac6a1 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -24,25 +24,25 @@ fn Class.F[self: Self]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc12_12.1: Class = param self // CHECK:STDOUT: @F.%self: Class = bind_name self, %self.loc12_12.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Self.ref.loc8: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %self.loc8_8.1: Class = param self // CHECK:STDOUT: %self.loc8_8.2: Class = bind_name self, %self.loc8_8.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %Self.ref.loc9: type = name_ref Self, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %.loc9_14: type = ptr_type Class [template = constants.%.1] // CHECK:STDOUT: %.loc9_8: = field_decl p, element0 [template] diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 12898f56d772..d8d7af99c47e 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -23,20 +23,20 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Class = %Class.decl // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @Class { -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%Class diff --git a/toolchain/check/testdata/const/basic.carbon b/toolchain/check/testdata/const/basic.carbon index 2151341a9b4d..c3d915419863 100644 --- a/toolchain/check/testdata/const/basic.carbon +++ b/toolchain/check/testdata/const/basic.carbon @@ -23,11 +23,11 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %.loc7_9: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = ptr_type const i32 [template = constants.%.2] // CHECK:STDOUT: %.loc7_19: type = ptr_type const i32* [template = constants.%.3] @@ -37,8 +37,8 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: %.loc7_34: type = ptr_type const i32 [template = constants.%.2] // CHECK:STDOUT: %.loc7_35: type = ptr_type const i32* [template = constants.%.3] // CHECK:STDOUT: %return.var.loc7: ref const i32** = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %.loc11_19: type = ptr_type i32 [template = constants.%.4] // CHECK:STDOUT: %.loc11_9: type = const_type i32* [template = constants.%.5] // CHECK:STDOUT: %p.loc11_6.1: const (i32*) = param p @@ -46,7 +46,7 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: %.loc11_36: type = ptr_type i32 [template = constants.%.4] // CHECK:STDOUT: %.loc11_26: type = const_type i32* [template = constants.%.5] // CHECK:STDOUT: %return.var.loc11: ref const (i32*) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(%p: const i32**) -> const i32** { diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 1dad4d2c17cc..8be68db3e3f9 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -21,10 +21,10 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc11_9: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc11_18: type = ptr_type const i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_19: type = ptr_type const i32* [template = constants.%.3] @@ -35,7 +35,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: %.loc11_42: type = ptr_type const i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_43: type = ptr_type const i32* [template = constants.%.3] // CHECK:STDOUT: %return.var: ref const i32** = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%p: const i32**) -> const i32** { diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index 3bc92083f339..8a55ad58dd41 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -25,10 +25,10 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc10_16: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc10_9: type = const_type const i32 [template = constants.%.1] // CHECK:STDOUT: %.loc10_26: type = ptr_type const i32 [template = constants.%.2] @@ -38,7 +38,7 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: %.loc10_36: type = ptr_type i32 [template = constants.%.4] // CHECK:STDOUT: %.loc10_37: type = ptr_type i32* [template = constants.%.5] // CHECK:STDOUT: %return.var: ref i32** = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%p: const i32**) -> i32** { diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index 83db0b54fe46..d769358e33d4 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -30,15 +30,15 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .a_ref = %a_ref // CHECK:STDOUT: .a_ptr_ref = %a_ptr_ref -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc4: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref const i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc6: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %a_ref.var: ref const i32 = var a_ref // CHECK:STDOUT: %a_ref: ref const i32 = bind_name a_ref, %a_ref.var @@ -69,13 +69,13 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %import_ref.1 // CHECK:STDOUT: .a_ref = %import_ref.2 // CHECK:STDOUT: .a_ptr_ref = %import_ref.3 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .a_ptr = %a_ptr -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+4, unused // CHECK:STDOUT: %import_ref.2: ref const i32 = import_ref ir1, inst+7, used // CHECK:STDOUT: %import_ref.3: ref const i32* = import_ref ir1, inst+15, used diff --git a/toolchain/check/testdata/eval/aggregate.carbon b/toolchain/check/testdata/eval/aggregate.carbon index 92fc3f732806..63a282ee7238 100644 --- a/toolchain/check/testdata/eval/aggregate.carbon +++ b/toolchain/check/testdata/eval/aggregate.carbon @@ -47,12 +47,12 @@ var struct_access: [i32; 1] = (0,) as [i32; {.a = 3, .b = 1}.b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .tuple_copy = %tuple_copy // CHECK:STDOUT: .struct_copy = %struct_copy // CHECK:STDOUT: .tuple_index = %tuple_index // CHECK:STDOUT: .struct_access = %struct_access -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_26.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_26.2: type = converted %.loc7_26.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %tuple_copy.var: ref (i32, i32) = var tuple_copy diff --git a/toolchain/check/testdata/eval/fail_aggregate.carbon b/toolchain/check/testdata/eval/fail_aggregate.carbon index 094e379c059a..289f397c8cbd 100644 --- a/toolchain/check/testdata/eval/fail_aggregate.carbon +++ b/toolchain/check/testdata/eval/fail_aggregate.carbon @@ -35,9 +35,9 @@ var array_index: [i32; 1] = (0,) as [i32; ((5, 7, 1, 9) as [i32; 4])[2]]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .array_index = %array_index -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc12_24: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc12_25: type = array_type %.loc12_24, i32 [template = constants.%.2] // CHECK:STDOUT: %array_index.var: ref [i32; 1] = var array_index diff --git a/toolchain/check/testdata/eval/fail_symbolic.carbon b/toolchain/check/testdata/eval/fail_symbolic.carbon index 371f5de88fa1..976b97ab67ca 100644 --- a/toolchain/check/testdata/eval/fail_symbolic.carbon +++ b/toolchain/check/testdata/eval/fail_symbolic.carbon @@ -15,13 +15,13 @@ fn G(N:! i32) { // CHECK:STDOUT: --- fail_symbolic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %N.loc8_6.1: i32 = param N // CHECK:STDOUT: @G.%N: i32 = bind_symbolic_name N, %N.loc8_6.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%N: i32) { diff --git a/toolchain/check/testdata/eval/symbolic.carbon b/toolchain/check/testdata/eval/symbolic.carbon index a09a461bf78c..719eeaace30e 100644 --- a/toolchain/check/testdata/eval/symbolic.carbon +++ b/toolchain/check/testdata/eval/symbolic.carbon @@ -27,13 +27,13 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %T.loc8_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc8_6.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%T: type) { 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 da5d87698bc3..0dba1bd70b03 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -26,24 +26,24 @@ fn H() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_20.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_20.2: type = converted %.loc7_20.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc9_20.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc9_20.2: type = converted %.loc9_20.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @G.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %H: = fn_decl @H { +// CHECK:STDOUT: } +// CHECK:STDOUT: %H: = fn_decl @H [template] { // CHECK:STDOUT: %return.var.loc15: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32); diff --git a/toolchain/check/testdata/function/call/alias.carbon b/toolchain/check/testdata/function/call/alias.carbon index 2a82969a91d9..8bc47b722998 100644 --- a/toolchain/check/testdata/function/call/alias.carbon +++ b/toolchain/check/testdata/function/call/alias.carbon @@ -19,17 +19,17 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %A.ref: = name_ref A, %A [template = %A] // CHECK:STDOUT: %B: = bind_alias B, %A [template = %A] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index 5069afdbe4f4..8a04253a22c4 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -21,11 +21,11 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Echo = %Echo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Echo: = fn_decl @Echo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Echo: = fn_decl @Echo [template] { // CHECK:STDOUT: %.loc7_13.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %a.loc7_9.1: {} = param a @@ -33,8 +33,8 @@ fn Main() { // CHECK:STDOUT: %.loc7_20.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_20.2: type = converted %.loc7_20.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref {} = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: {}) -> {} { diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index 3ff4fabcc43b..7319ca2cf32a 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -20,11 +20,11 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Echo = %Echo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Echo: = fn_decl @Echo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Echo: = fn_decl @Echo [template] { // CHECK:STDOUT: %.loc7_13.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %a.loc7_9.1: () = param a @@ -32,8 +32,8 @@ fn Main() { // CHECK:STDOUT: %.loc7_20.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_20.2: type = converted %.loc7_20.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref () = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: ()) -> () { diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index c03e1002c232..923a108f92e7 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -19,10 +19,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run() { diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index df5e58e964a0..5017ebb0e05f 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -64,24 +64,24 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Run0 = %Run0 // CHECK:STDOUT: .Run1 = %Run1 // CHECK:STDOUT: .Run2 = %Run2 // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run0: = fn_decl @Run0 {} [template] -// CHECK:STDOUT: %Run1: = fn_decl @Run1 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run0: = fn_decl @Run0 [template] {} +// CHECK:STDOUT: %Run1: = fn_decl @Run1 [template] { // CHECK:STDOUT: %a.loc8_9.1: i32 = param a // CHECK:STDOUT: @Run1.%a: i32 = bind_name a, %a.loc8_9.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run2: = fn_decl @Run2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run2: = fn_decl @Run2 [template] { // CHECK:STDOUT: %a.loc9_9.1: i32 = param a // CHECK:STDOUT: @Run2.%a: i32 = bind_name a, %a.loc9_9.1 // CHECK:STDOUT: %b.loc9_17.1: i32 = param b // CHECK:STDOUT: @Run2.%b: i32 = bind_name b, %b.loc9_17.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Run0() { diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index baad9eb61057..0844d371314c 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -24,15 +24,15 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @G.%a: i32 = bind_name a, %a.loc7_6.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%a: i32) { 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 b79add06960d..c75491d007a9 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -20,14 +20,14 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %return.var: ref f64 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() -> f64 { diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 95b6c608eef3..432a0e1fc222 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -19,16 +19,16 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Echo = %Echo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Echo: = fn_decl @Echo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Echo: = fn_decl @Echo [template] { // CHECK:STDOUT: %a.loc7_9.1: i32 = param a // CHECK:STDOUT: @Echo.%a: i32 = bind_name a, %a.loc7_9.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Echo(%a: i32) -> i32 { diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index c2f420dd76ee..0db309c0f629 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -25,17 +25,17 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 // CHECK:STDOUT: %b.loc7_16.1: i32 = param b // CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc7_16.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 29c299c8e6ed..a00be369aa66 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -18,15 +18,15 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index a382ef1d958d..81b0a1ed3286 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -19,15 +19,15 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index 4fade68f1cd3..248a16c85a8b 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -19,17 +19,17 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 // CHECK:STDOUT: %b.loc7_16.1: i32 = param b // CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc7_16.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index cf8073de01d4..5a1a804c93cd 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -20,17 +20,17 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 // CHECK:STDOUT: %b.loc7_16.1: i32 = param b // CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc7_16.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 2b980ac7238f..3e8f0912e228 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -17,12 +17,12 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index 1ac9d31f3f60..0e54d5cc78ef 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -18,12 +18,12 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %MakeImplicitEmptyTuple: = fn_decl @MakeImplicitEmptyTuple {} [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %MakeImplicitEmptyTuple: = fn_decl @MakeImplicitEmptyTuple [template] {} +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MakeImplicitEmptyTuple() { diff --git a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon index ea2a4a39ec20..67585653db9c 100644 --- a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon @@ -73,20 +73,20 @@ default final virtual fn ModifiersConflict2() {} // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .WrongOrder = %WrongOrder // CHECK:STDOUT: .DuplicateVirtual = %DuplicateVirtual // CHECK:STDOUT: .TwoAccess = %TwoAccess // CHECK:STDOUT: .ModifiersConflict = %ModifiersConflict // CHECK:STDOUT: .InvalidModifier = %InvalidModifier // CHECK:STDOUT: .ModifiersConflict2 = %ModifiersConflict2 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %WrongOrder: = fn_decl @WrongOrder {} [template] -// CHECK:STDOUT: %DuplicateVirtual: = fn_decl @DuplicateVirtual {} [template] -// CHECK:STDOUT: %TwoAccess: = fn_decl @TwoAccess {} [template] -// CHECK:STDOUT: %ModifiersConflict: = fn_decl @ModifiersConflict {} [template] -// CHECK:STDOUT: %InvalidModifier: = fn_decl @InvalidModifier {} [template] -// CHECK:STDOUT: %ModifiersConflict2: = fn_decl @ModifiersConflict2 {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %WrongOrder: = fn_decl @WrongOrder [template] {} +// CHECK:STDOUT: %DuplicateVirtual: = fn_decl @DuplicateVirtual [template] {} +// CHECK:STDOUT: %TwoAccess: = fn_decl @TwoAccess [template] {} +// CHECK:STDOUT: %ModifiersConflict: = fn_decl @ModifiersConflict [template] {} +// CHECK:STDOUT: %InvalidModifier: = fn_decl @InvalidModifier [template] {} +// CHECK:STDOUT: %ModifiersConflict2: = fn_decl @ModifiersConflict2 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @WrongOrder(); diff --git a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon index 1dd9809d5ce1..e5c86ec5c135 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -12,17 +12,17 @@ fn F(n: i32, a: [i32; n]*); // CHECK:STDOUT: --- fail_param_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %n.loc10_6.1: i32 = param n // CHECK:STDOUT: @F.%n: i32 = bind_name n, %n.loc10_6.1 // CHECK:STDOUT: %n.ref: i32 = name_ref n, @F.%n // CHECK:STDOUT: %.loc10: type = ptr_type [template = ] // CHECK:STDOUT: %a.loc10_14.1: = param a // CHECK:STDOUT: @F.%a: = bind_name a, %a.loc10_14.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%n: i32, %a: ); diff --git a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon index 752c097dcbef..3f1047c30110 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -15,15 +15,15 @@ fn F(n: i32, n: i32); // CHECK:STDOUT: --- fail_param_redecl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %n.loc13_6.1: i32 = param n // CHECK:STDOUT: @F.%n.loc13_6: i32 = bind_name n, %n.loc13_6.1 // CHECK:STDOUT: %n.loc13_14.1: i32 = param n // CHECK:STDOUT: @F.%n.loc13_14: i32 = bind_name n, %n.loc13_14.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%n.loc13_6: i32, %n.loc13_14: i32); diff --git a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon index 39ea1cc96509..68bd6715c9a7 100644 --- a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon @@ -12,10 +12,10 @@ private fn F(); // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 61447bafdd8a..dc38e96cc4df 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -31,25 +31,25 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %b.loc5_6.1: i32 = param b // CHECK:STDOUT: @B.%b: i32 = bind_name b, %b.loc5_6.1 // CHECK:STDOUT: %return.var.loc5: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C: = fn_decl @C { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C: = fn_decl @C [template] { // CHECK:STDOUT: %.loc6_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc6_14.2: type = converted %.loc6_14.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %c.loc6_6.1: (i32,) = param c // CHECK:STDOUT: @C.%c: (i32,) = bind_name c, %c.loc6_6.1 // CHECK:STDOUT: %.loc6_28: type = struct_type {.c: i32} [template = constants.%.3] // CHECK:STDOUT: %return.var.loc6: ref {.c: i32} = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); @@ -69,14 +69,14 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %import_ref.1 // CHECK:STDOUT: .B = %import_ref.2 // CHECK:STDOUT: .C = %import_ref.3 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used [template = imports.%A] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+5, used [template = imports.%B] // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+17, used [template = imports.%C] diff --git a/toolchain/check/testdata/function/declaration/param_same_name.carbon b/toolchain/check/testdata/function/declaration/param_same_name.carbon index e5f620b15242..cd7a81a01efa 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -11,18 +11,18 @@ fn G(a: i32); // CHECK:STDOUT: --- param_same_name.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc7_6.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %a.loc9_6.1: i32 = param a // CHECK:STDOUT: @G.%a: i32 = bind_name a, %a.loc9_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: i32); diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index d634610e0686..8ec293c75519 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -15,12 +15,12 @@ fn G() { F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); diff --git a/toolchain/check/testdata/function/definition/fail_todo_import_forward_decl.carbon b/toolchain/check/testdata/function/definition/fail_todo_import_forward_decl.carbon index a96c594780fa..fdc75659bc93 100644 --- a/toolchain/check/testdata/function/definition/fail_todo_import_forward_decl.carbon +++ b/toolchain/check/testdata/function/definition/fail_todo_import_forward_decl.carbon @@ -29,10 +29,10 @@ fn Foo() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(); @@ -40,11 +40,11 @@ fn Foo() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%Foo] -// CHECK:STDOUT: %.loc14: = fn_decl @.1 {} [template] +// CHECK:STDOUT: %.loc14: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(); diff --git a/toolchain/check/testdata/function/definition/forward_decl.carbon b/toolchain/check/testdata/function/definition/forward_decl.carbon index 17d6c9a8f037..4cf961af1ac4 100644 --- a/toolchain/check/testdata/function/definition/forward_decl.carbon +++ b/toolchain/check/testdata/function/definition/forward_decl.carbon @@ -11,11 +11,11 @@ fn Foo() {} // CHECK:STDOUT: --- forward_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo.loc7: = fn_decl @Foo {} [template] -// CHECK:STDOUT: %Foo.loc9: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo.loc7: = fn_decl @Foo [template] {} +// CHECK:STDOUT: %Foo.loc9: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index 5b37d7bee0c0..cb0c7606750f 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -32,25 +32,25 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %b.loc5_6.1: i32 = param b // CHECK:STDOUT: @B.%b: i32 = bind_name b, %b.loc5_6.1 // CHECK:STDOUT: %return.var.loc5: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C: = fn_decl @C { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C: = fn_decl @C [template] { // CHECK:STDOUT: %.loc6_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc6_14.2: type = converted %.loc6_14.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %c.loc6_6.1: (i32,) = param c // CHECK:STDOUT: @C.%c: (i32,) = bind_name c, %c.loc6_6.1 // CHECK:STDOUT: %.loc6_28: type = struct_type {.c: i32} [template = constants.%.3] // CHECK:STDOUT: %return.var.loc6: ref {.c: i32} = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -86,14 +86,14 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %import_ref.1 // CHECK:STDOUT: .B = %import_ref.2 // CHECK:STDOUT: .C = %import_ref.3 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used [template = imports.%A] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+6, used [template = imports.%B] // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+20, used [template = imports.%C] diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index 2c3ad9eca66d..73c9ef5637a7 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -11,14 +11,14 @@ fn Baz() {} // CHECK:STDOUT: --- order.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo // CHECK:STDOUT: .Bar = %Bar // CHECK:STDOUT: .Baz = %Baz -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] -// CHECK:STDOUT: %Bar: = fn_decl @Bar {} [template] -// CHECK:STDOUT: %Baz: = fn_decl @Baz {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} +// CHECK:STDOUT: %Bar: = fn_decl @Bar [template] {} +// CHECK:STDOUT: %Baz: = fn_decl @Baz [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 0e024a74735d..d9fff746ee9f 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -9,13 +9,13 @@ fn Foo(a: i32) {} // CHECK:STDOUT: --- params_one.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index a47077e8f4c7..23dfbcd3f54e 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -9,13 +9,13 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: --- params_one_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32) { diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index ee4c629b9989..0f5b0f6eb9d1 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -9,15 +9,15 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: --- params_two.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 // CHECK:STDOUT: %b.loc7_16.1: i32 = param b // CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc7_16.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 6e6920b765d6..be3b3e796cbb 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -9,15 +9,15 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: --- params_two_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 // CHECK:STDOUT: %b.loc7_16.1: i32 = param b // CHECK:STDOUT: @Foo.%b: i32 = bind_name b, %b.loc7_16.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(%a: i32, %b: i32) { diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index 8c89c8ddc1d6..468306f0a8c2 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -9,10 +9,10 @@ fn Foo() {} // CHECK:STDOUT: --- params_zero.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { diff --git a/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon b/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon index 856c3d1b4456..ba53c43fa8ec 100644 --- a/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon +++ b/toolchain/check/testdata/function/generic/fail_todo_param_in_type.carbon @@ -12,10 +12,10 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: --- fail_todo_param_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %N.loc10_6.1: i32 = param N // CHECK:STDOUT: @F.%N: i32 = bind_symbolic_name N, %N.loc10_6.1 [symbolic] // CHECK:STDOUT: %N.ref: i32 = name_ref N, @F.%N [symbolic = @F.%N] @@ -23,7 +23,7 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: %.loc10_26: type = ptr_type [template = ] // CHECK:STDOUT: %a.loc10_15.1: = param a // CHECK:STDOUT: @F.%a: = bind_name a, %a.loc10_15.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%N: i32, %a: ); diff --git a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon index 846e24f6d9be..61feb8299792 100644 --- a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon +++ b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon @@ -19,15 +19,15 @@ fn F(T:! type, U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] // CHECK:STDOUT: %U.loc7_16.1: type = param U // CHECK:STDOUT: @F.%U: type = bind_symbolic_name U, %U.loc7_16.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%T: type, %U: type) { diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index 68e0a6bc2ccc..850761067f84 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -16,13 +16,13 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%T: type) { diff --git a/toolchain/check/testdata/function/generic/type_param_scope.carbon b/toolchain/check/testdata/function/generic/type_param_scope.carbon index 2475c4f8359c..5d1e5782fee1 100644 --- a/toolchain/check/testdata/function/generic/type_param_scope.carbon +++ b/toolchain/check/testdata/function/generic/type_param_scope.carbon @@ -12,10 +12,10 @@ fn F(T:! type, n: T) -> T { // CHECK:STDOUT: --- type_param_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] // CHECK:STDOUT: %T.ref.loc7_19: type = name_ref T, @F.%T [symbolic = @F.%T] @@ -23,7 +23,7 @@ fn F(T:! type, n: T) -> T { // CHECK:STDOUT: @F.%n: T = bind_name n, %n.loc7_16.1 // CHECK:STDOUT: %T.ref.loc7_25: type = name_ref T, @F.%T [symbolic = @F.%T] // CHECK:STDOUT: %return.var: ref T = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%T: type, %n: T) -> T { diff --git a/toolchain/check/testdata/global/class_obj.carbon b/toolchain/check/testdata/global/class_obj.carbon index ce0c036d6bf8..7a64d37460d0 100644 --- a/toolchain/check/testdata/global/class_obj.carbon +++ b/toolchain/check/testdata/global/class_obj.carbon @@ -18,11 +18,11 @@ var a: A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl = class_decl @A {} [template = constants.%A] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl = class_decl @A [template = constants.%A] {} // CHECK:STDOUT: %A.ref: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %a.var: ref A = var a // CHECK:STDOUT: %a: ref A = bind_name a, %a.var diff --git a/toolchain/check/testdata/global/class_with_fun.carbon b/toolchain/check/testdata/global/class_with_fun.carbon index 574aec794f87..981ae0f2c7be 100644 --- a/toolchain/check/testdata/global/class_with_fun.carbon +++ b/toolchain/check/testdata/global/class_with_fun.carbon @@ -22,16 +22,16 @@ var a: A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.decl // CHECK:STDOUT: .ret_a = %ret_a // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.decl = class_decl @A {} [template = constants.%A] -// CHECK:STDOUT: %ret_a: = fn_decl @ret_a { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.decl = class_decl @A [template = constants.%A] {} +// CHECK:STDOUT: %ret_a: = fn_decl @ret_a [template] { // CHECK:STDOUT: %A.ref.loc8: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: @ret_a.%return: ref A = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %A.ref.loc12: type = name_ref A, %A.decl [template = constants.%A] // CHECK:STDOUT: %a.var: ref A = var a // CHECK:STDOUT: %a: ref A = bind_name a, %a.var diff --git a/toolchain/check/testdata/global/decl.carbon b/toolchain/check/testdata/global/decl.carbon index 56d257b2c0d5..6ce083240b58 100644 --- a/toolchain/check/testdata/global/decl.carbon +++ b/toolchain/check/testdata/global/decl.carbon @@ -8,9 +8,9 @@ var a: i32; // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/simple_init.carbon b/toolchain/check/testdata/global/simple_init.carbon index 209d061e9a96..0acb56a57ced 100644 --- a/toolchain/check/testdata/global/simple_init.carbon +++ b/toolchain/check/testdata/global/simple_init.carbon @@ -12,9 +12,9 @@ var a: i32 = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/global/simple_with_fun.carbon b/toolchain/check/testdata/global/simple_with_fun.carbon index d10c79329ada..01ba0bea6b1a 100644 --- a/toolchain/check/testdata/global/simple_with_fun.carbon +++ b/toolchain/check/testdata/global/simple_with_fun.carbon @@ -17,13 +17,13 @@ var a: i32 = test_a(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .test_a = %test_a // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %test_a: = fn_decl @test_a { +// CHECK:STDOUT: } +// CHECK:STDOUT: %test_a: = fn_decl @test_a [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 5adcf57f22c6..451b33aa1753 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -24,19 +24,19 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H // CHECK:STDOUT: .If = %If -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] -// CHECK:STDOUT: %If: = fn_decl @If { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} +// CHECK:STDOUT: %If: = fn_decl @If [template] { // CHECK:STDOUT: %b.loc11_7.1: bool = param b // CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc11_7.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index b510c3148456..2d37c2806dbe 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -41,26 +41,26 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .If1 = %If1 // CHECK:STDOUT: .If2 = %If2 // CHECK:STDOUT: .If3 = %If3 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %If1: = fn_decl @If1 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %If1: = fn_decl @If1 [template] { // CHECK:STDOUT: %b.loc7_8.1: bool = param b // CHECK:STDOUT: @If1.%b: bool = bind_name b, %b.loc7_8.1 // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %If2: = fn_decl @If2 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %If2: = fn_decl @If2 [template] { // CHECK:STDOUT: %b.loc17_8.1: bool = param b // CHECK:STDOUT: @If2.%b: bool = bind_name b, %b.loc17_8.1 // CHECK:STDOUT: %return.var.loc17: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %If3: = fn_decl @If3 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %If3: = fn_decl @If3 [template] { // CHECK:STDOUT: %b.loc27_8.1: bool = param b // CHECK:STDOUT: @If3.%b: bool = bind_name b, %b.loc27_8.1 // CHECK:STDOUT: %return.var.loc27: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @If1(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index 77d667b300c2..f40b524fef0f 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -22,14 +22,14 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .VarScope = %VarScope -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %VarScope: = fn_decl @VarScope { +// CHECK:STDOUT: } +// CHECK:STDOUT: %VarScope: = fn_decl @VarScope [template] { // CHECK:STDOUT: %b.loc7_13.1: bool = param b // CHECK:STDOUT: @VarScope.%b: bool = bind_name b, %b.loc7_13.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @VarScope(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 14dc4cb5e8a2..3e9dd753865f 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -21,17 +21,17 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .If = %If -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %If: = fn_decl @If { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %If: = fn_decl @If [template] { // CHECK:STDOUT: %b.loc10_7.1: bool = param b // CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc10_7.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index 7c32c5f78f5b..da8efe48195d 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -21,14 +21,14 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .If = %If -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %If: = fn_decl @If { +// CHECK:STDOUT: } +// CHECK:STDOUT: %If: = fn_decl @If [template] { // CHECK:STDOUT: %b.loc7_7.1: bool = param b // CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc7_7.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @If(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 4b65c1e83fdb..997bbe295533 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -22,10 +22,10 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %b.loc7_6.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc7_6.1 // CHECK:STDOUT: %n.loc7_15.1: i32 = param n @@ -33,7 +33,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: %m.loc7_23.1: i32 = param m // CHECK:STDOUT: @F.%m: i32 = bind_name m, %m.loc7_23.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%b: bool, %n: i32, %m: i32) -> i32 { diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 3909fc463068..c8bbb4d44529 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -25,24 +25,24 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc10: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc14: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index 48b3c0ee092c..f0139e9af3fc 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -19,22 +19,22 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %return.var.loc8: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %b.loc10_6.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc10_6.1 // CHECK:STDOUT: %return.var.loc10: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { 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 fd6df2c65dbd..7c4ed6ed04ea 100644 --- a/toolchain/check/testdata/if_expr/fail_not_in_function.carbon +++ b/toolchain/check/testdata/if_expr/fail_not_in_function.carbon @@ -45,7 +45,7 @@ class C { // CHECK:STDOUT: file { // CHECK:STDOUT: %.loc17: i32 = block_arg // CHECK:STDOUT: %x: i32 = bind_name x, %.loc17 -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 1d45ac078c32..084d58d479a6 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -18,10 +18,10 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %a.loc7_6.1: bool = param a // CHECK:STDOUT: @F.%a: bool = bind_name a, %a.loc7_6.1 // CHECK:STDOUT: %b.loc7_15.1: bool = param b @@ -29,7 +29,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: %c.loc7_24.1: bool = param c // CHECK:STDOUT: @F.%c: bool = bind_name c, %c.loc7_24.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: bool, %b: bool, %c: bool) -> i32 { diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 030383e9081a..05b5c0eeb666 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -23,19 +23,19 @@ fn F(cond: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc7: type = struct_type {.a: i32, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %s.loc7_6.1: {.a: i32, .b: i32} = param s // CHECK:STDOUT: @G.%s: {.a: i32, .b: i32} = bind_name s, %s.loc7_6.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %cond.loc9_6.1: bool = param cond // CHECK:STDOUT: @F.%cond: bool = bind_name cond, %cond.loc9_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G(%s: {.a: i32, .b: i32}); diff --git a/toolchain/check/testdata/impl/basic.carbon b/toolchain/check/testdata/impl/basic.carbon index c159c568bc71..37e6af500327 100644 --- a/toolchain/check/testdata/impl/basic.carbon +++ b/toolchain/check/testdata/impl/basic.carbon @@ -21,17 +21,17 @@ impl i32 as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Simple = %Simple.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Simple.decl = interface_decl @Simple {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Simple.decl = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Simple { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc8: in Simple> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -40,7 +40,7 @@ impl i32 as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as Simple { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/declaration.carbon b/toolchain/check/testdata/impl/declaration.carbon index 337cf4d1f2f0..c1bd1781d872 100644 --- a/toolchain/check/testdata/impl/declaration.carbon +++ b/toolchain/check/testdata/impl/declaration.carbon @@ -15,10 +15,10 @@ impl i32 as I; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/empty.carbon b/toolchain/check/testdata/impl/empty.carbon index 40f49821d8e0..e762d00cb262 100644 --- a/toolchain/check/testdata/impl/empty.carbon +++ b/toolchain/check/testdata/impl/empty.carbon @@ -17,10 +17,10 @@ impl i32 as Empty { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon index 1ae5531fbd61..6562dede6bd6 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -34,23 +34,23 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .GenericInterface = %GenericInterface.decl // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %GenericInterface.decl = interface_decl @GenericInterface { +// CHECK:STDOUT: } +// CHECK:STDOUT: %GenericInterface.decl = interface_decl @GenericInterface [template = constants.%.1] { // CHECK:STDOUT: %T.loc10_28.1: type = param T // CHECK:STDOUT: %T.loc10_28.2: type = bind_symbolic_name T, %T.loc10_28.1 [symbolic] -// CHECK:STDOUT: } [template = constants.%.1] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @GenericInterface { -// CHECK:STDOUT: %F: = fn_decl @F.1 { +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] { // CHECK:STDOUT: %T.ref: type = name_ref T, file.%T.loc10_28.2 [symbolic = file.%T.loc10_28.2] // CHECK:STDOUT: %x.loc11_8.1: T = param x // CHECK:STDOUT: %x.loc11_8.2: T = bind_name x, %x.loc11_8.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc11: in GenericInterface> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -59,11 +59,11 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as { -// CHECK:STDOUT: %F: = fn_decl @F.2 { +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] { // CHECK:STDOUT: %T.ref: type = name_ref T, @C.%T.loc21_23.2 [symbolic = @C.%T.loc21_23.2] // CHECK:STDOUT: %x.loc22_10.1: T = param x // CHECK:STDOUT: %x.loc22_10.2: T = bind_name x, %x.loc22_10.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon index 66c46c3cdd5a..84f0be951ef0 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon @@ -18,10 +18,10 @@ extend impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon index 7c3dba630b14..aaa7a474f2c1 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -44,16 +44,16 @@ class E { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .D = %D.decl // CHECK:STDOUT: .E = %E.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %D.decl = class_decl @D {} [template = constants.%D] -// CHECK:STDOUT: %E.decl = class_decl @E {} [template = constants.%E] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %D.decl = class_decl @D [template = constants.%D] {} +// CHECK:STDOUT: %E.decl = class_decl @E [template = constants.%E] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I { diff --git a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon index 996a795edae8..4ae7b0119516 100644 --- a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon @@ -19,10 +19,10 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as i32; diff --git a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon index cf79580060df..20cfdf4a239d 100644 --- a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon @@ -25,14 +25,14 @@ interface I { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I { -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .C = %C.decl diff --git a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon index 0a4d019286bb..9ee46eb18fad 100644 --- a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon @@ -25,12 +25,12 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I; diff --git a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon index cdf1c14d4de2..ccfb50c5515b 100644 --- a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon +++ b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon @@ -24,17 +24,17 @@ impl as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Simple = %Simple.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Simple.decl = interface_decl @Simple {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Simple.decl = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %Simple.ref: type = name_ref Simple, %Simple.decl [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Simple { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc8: in Simple> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -43,7 +43,7 @@ impl as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: as Simple { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon index 8b595c387de8..797a490d592f 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon @@ -16,7 +16,7 @@ impl i32 as false {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc10: bool = bool_literal false [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_impl_bad_type.carbon b/toolchain/check/testdata/impl/fail_impl_bad_type.carbon index cd8e60f6840a..23ad44cc49b0 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_type.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_type.carbon @@ -19,10 +19,10 @@ impl true as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %.loc12: bool = bool_literal true [template = constants.%.2] // CHECK:STDOUT: %I.ref: type = name_ref I, %I.decl [template = constants.%.1] diff --git a/toolchain/check/testdata/impl/fail_redefinition.carbon b/toolchain/check/testdata/impl/fail_redefinition.carbon index d0f6e88b2bc0..059782d507f4 100644 --- a/toolchain/check/testdata/impl/fail_redefinition.carbon +++ b/toolchain/check/testdata/impl/fail_redefinition.carbon @@ -23,10 +23,10 @@ impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %I.ref.loc9: type = name_ref I, %I.decl [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon b/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon index 32063524b9af..0a3bfc856c66 100644 --- a/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon +++ b/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon @@ -40,22 +40,22 @@ fn G(c: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .HasF = %HasF.decl // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %HasF.decl = interface_decl @HasF {} [template = constants.%.1] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %HasF.decl = interface_decl @HasF [template = constants.%.1] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: %c.loc17_6.1: C = param c // CHECK:STDOUT: @G.%c: C = bind_name c, %c.loc17_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @HasF { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc8: in HasF> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -64,7 +64,7 @@ fn G(c: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as HasF { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index 021ac1d95752..6a1fcac8eff0 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -25,16 +25,16 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Simple = %Simple.decl // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Simple.decl = interface_decl @Simple {} [template = constants.%.1] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Simple.decl = interface_decl @Simple [template = constants.%.1] {} +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Simple { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc8: in Simple> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -43,7 +43,7 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as Simple { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/impl_forall.carbon b/toolchain/check/testdata/impl/impl_forall.carbon index 6201410ba97b..0952cf1cbe37 100644 --- a/toolchain/check/testdata/impl/impl_forall.carbon +++ b/toolchain/check/testdata/impl/impl_forall.carbon @@ -21,10 +21,10 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Simple = %Simple.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Simple.decl = interface_decl @Simple {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Simple.decl = interface_decl @Simple [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %T.loc11_14.1: type = param T // CHECK:STDOUT: %T.loc11_14.2: type = bind_symbolic_name T, %T.loc11_14.1 [symbolic] @@ -34,7 +34,7 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Simple { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc8: in Simple> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -43,7 +43,7 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: T as Simple { -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %F diff --git a/toolchain/check/testdata/impl/redeclaration.carbon b/toolchain/check/testdata/impl/redeclaration.carbon index be603e3255b3..34d0944a0b6c 100644 --- a/toolchain/check/testdata/impl/redeclaration.carbon +++ b/toolchain/check/testdata/impl/redeclaration.carbon @@ -23,15 +23,15 @@ impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl // CHECK:STDOUT: .X = %X.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %I.ref.loc9: type = name_ref I, %I.decl [template = constants.%.1] // CHECK:STDOUT: } -// CHECK:STDOUT: %X.decl = class_decl @X {} [template = constants.%X] +// CHECK:STDOUT: %X.decl = class_decl @X [template = constants.%X] {} // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %I.ref.loc15: type = name_ref I, %I.decl [template = constants.%.1] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index 572e756cc624..2372addffd86 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -26,12 +26,12 @@ var d: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 2 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 2] = var a diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 1e24702b9e17..232ff504a200 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -43,28 +43,28 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .ValueBinding = %ValueBinding -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref [i32; 3] = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc9_15: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc9_16: type = array_type %.loc9_15, i32 [template = constants.%.2] // CHECK:STDOUT: %b.loc9_6.1: [i32; 3] = param b // CHECK:STDOUT: @G.%b: [i32; 3] = bind_name b, %b.loc9_6.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ValueBinding: = fn_decl @ValueBinding { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ValueBinding: = fn_decl @ValueBinding [template] { // CHECK:STDOUT: %.loc17_26: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc17_27: type = array_type %.loc17_26, i32 [template = constants.%.2] // CHECK:STDOUT: %b.loc17_17.1: [i32; 3] = param b // CHECK:STDOUT: @ValueBinding.%b: [i32; 3] = bind_name b, %b.loc17_17.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: [i32; 3]; diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index d81f431636df..d31a7395d4aa 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -24,10 +24,10 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a 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 ec6aaa3d5208..5db754a6eb96 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -24,10 +24,10 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a 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 18aa2705ee33..fcf6604c7fe6 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 @@ -23,10 +23,10 @@ var b: i32 = a[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon index 219396e24d12..2ea2debbbffd 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -21,12 +21,12 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 2840bd4b1a94..b89cd062a080 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -41,21 +41,21 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref [i32; 3] = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc9_15: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc9_16: type = array_type %.loc9_15, i32 [template = constants.%.2] // CHECK:STDOUT: %b.loc9_6.1: [i32; 3] = param b // CHECK:STDOUT: @G.%b: [i32; 3] = bind_name b, %b.loc9_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: [i32; 3]; diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index 24625f129725..1179ca12615d 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -42,18 +42,18 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .N = %.loc11 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc11: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc11: = namespace [template] {} // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %b.var: ref i32 = var b // CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %c.var: ref i32 = var c diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index 5b9a7e24e1f7..99aafdd6c9e7 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -18,10 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon index dac650d34634..82ece99458b5 100644 --- a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon @@ -24,11 +24,11 @@ var c: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index e4f51a712db0..a59172fdc74c 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -19,10 +19,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon b/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon index 9f7a09eeb32b..ac2124596f55 100644 --- a/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon +++ b/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon @@ -25,10 +25,10 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_index_error.carbon b/toolchain/check/testdata/index/fail_tuple_index_error.carbon index 34e3a04630aa..a4feb97aa914 100644 --- a/toolchain/check/testdata/index/fail_tuple_index_error.carbon +++ b/toolchain/check/testdata/index/fail_tuple_index_error.carbon @@ -22,10 +22,10 @@ var b: i32 = a[oops]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_large_index.carbon b/toolchain/check/testdata/index/fail_tuple_large_index.carbon index 7faa0b3c383e..ae669312a830 100644 --- a/toolchain/check/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/check/testdata/index/fail_tuple_large_index.carbon @@ -22,11 +22,11 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32,) = var a 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 d410afd288b5..a32bb7ac5abe 100644 --- a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon @@ -23,10 +23,10 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a 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 f517bd977bd5..eb425f95e938 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 @@ -23,10 +23,10 @@ var b: i32 = a[2]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/index_not_literal.carbon b/toolchain/check/testdata/index/index_not_literal.carbon index eee6a8423ee3..15300c9ff41b 100644 --- a/toolchain/check/testdata/index/index_not_literal.carbon +++ b/toolchain/check/testdata/index/index_not_literal.carbon @@ -22,10 +22,10 @@ var b: i32 = a[{.index = 1}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/tuple_element_access.carbon b/toolchain/check/testdata/index/tuple_element_access.carbon index 433647bcb814..3a9096788fa1 100644 --- a/toolchain/check/testdata/index/tuple_element_access.carbon +++ b/toolchain/check/testdata/index/tuple_element_access.carbon @@ -19,11 +19,11 @@ var c: i32 = b[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32,) = var a diff --git a/toolchain/check/testdata/index/tuple_return_value_access.carbon b/toolchain/check/testdata/index/tuple_return_value_access.carbon index dc44b5cb1c08..e7ace64e4e27 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -20,18 +20,18 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_16.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_16.2: type = converted %.loc7_16.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %return.var.loc7: ref (i32,) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Run: = fn_decl @Run { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Run: = fn_decl @Run [template] { // CHECK:STDOUT: %return.var.loc9: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> (i32,) { diff --git a/toolchain/check/testdata/interface/as_type.carbon b/toolchain/check/testdata/interface/as_type.carbon index 195c145547a7..d28d364024c8 100644 --- a/toolchain/check/testdata/interface/as_type.carbon +++ b/toolchain/check/testdata/interface/as_type.carbon @@ -16,16 +16,16 @@ fn F(e: Empty) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] // CHECK:STDOUT: %e.loc9_6.1: Empty = param e // CHECK:STDOUT: @F.%e: Empty = bind_name e, %e.loc9_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty { diff --git a/toolchain/check/testdata/interface/basic.carbon b/toolchain/check/testdata/interface/basic.carbon index 029aae5472be..64013b25bea0 100644 --- a/toolchain/check/testdata/interface/basic.carbon +++ b/toolchain/check/testdata/interface/basic.carbon @@ -23,13 +23,13 @@ interface ForwardDeclared { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .ForwardDeclared = %ForwardDeclared.decl.loc10 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] -// CHECK:STDOUT: %ForwardDeclared.decl.loc10 = interface_decl @ForwardDeclared {} [template = constants.%.2] -// CHECK:STDOUT: %ForwardDeclared.decl.loc12 = interface_decl @ForwardDeclared {} [template = constants.%.2] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc10 = interface_decl @ForwardDeclared [template = constants.%.2] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc12 = interface_decl @ForwardDeclared [template = constants.%.2] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty { @@ -38,7 +38,7 @@ interface ForwardDeclared { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %.loc13: in ForwardDeclared> = assoc_entity element0, %F [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon b/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon index b5a5a7ac809b..2c7e6384c787 100644 --- a/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon +++ b/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon @@ -34,13 +34,13 @@ interface Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl // CHECK:STDOUT: .Outer = %Outer.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] -// CHECK:STDOUT: %Outer.decl = interface_decl @Outer {} [template = constants.%.2] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} +// CHECK:STDOUT: %Outer.decl = interface_decl @Outer [template = constants.%.2] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { @@ -50,8 +50,8 @@ interface Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Outer { -// CHECK:STDOUT: %Inner.decl = interface_decl @Inner {} [template = constants.%.3] -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: %Inner.decl = interface_decl @Inner [template = constants.%.3] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Inner = %Inner.decl @@ -59,7 +59,7 @@ interface Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Inner { -// CHECK:STDOUT: %.loc20: = fn_decl @.1 {} [template] +// CHECK:STDOUT: %.loc20: = fn_decl @.1 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = @Outer.%F diff --git a/toolchain/check/testdata/interface/fail_as_type_of_type.carbon b/toolchain/check/testdata/interface/fail_as_type_of_type.carbon index 59533e42643a..21837cb043e2 100644 --- a/toolchain/check/testdata/interface/fail_as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/fail_as_type_of_type.carbon @@ -22,16 +22,16 @@ fn F(T:! Empty) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] // CHECK:STDOUT: %T.loc9_6.1: Empty = param T // CHECK:STDOUT: @F.%T: Empty = bind_symbolic_name T, %T.loc9_6.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Empty { diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index 0492256f4578..6b5437e5d42d 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -46,21 +46,21 @@ interface Class { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl.loc7 // CHECK:STDOUT: .Function = %Function // CHECK:STDOUT: .Class = %Class.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl.loc7 = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %Interface.decl.loc15 = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %Function: = fn_decl @Function {} [template] -// CHECK:STDOUT: %.decl.loc27 = interface_decl @.1 {} [template = constants.%.2] -// CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] -// CHECK:STDOUT: %.decl.loc37 = interface_decl @.2 {} [template = constants.%.3] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl.loc7 = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %Interface.decl.loc15 = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %Function: = fn_decl @Function [template] {} +// CHECK:STDOUT: %.decl.loc27 = interface_decl @.1 [template = constants.%.2] {} +// CHECK:STDOUT: %Class.decl = class_decl @Class [template = constants.%Class] {} +// CHECK:STDOUT: %.decl.loc37 = interface_decl @.2 [template = constants.%.3] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = diff --git a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon index 69c90d1be952..bbd34b9a4123 100644 --- a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon +++ b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon @@ -51,27 +51,27 @@ interface BeingDefined { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Undefined = %Undefined.decl // CHECK:STDOUT: .Test = %Test // CHECK:STDOUT: .BeingDefined = %BeingDefined.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Undefined.decl = interface_decl @Undefined {} [template = constants.%.1] -// CHECK:STDOUT: %.loc15: = fn_decl @.1 {} [template] -// CHECK:STDOUT: %Test: = fn_decl @Test {} [template] -// CHECK:STDOUT: %BeingDefined.decl = interface_decl @BeingDefined {} [template = constants.%.2] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Undefined.decl = interface_decl @Undefined [template = constants.%.1] {} +// CHECK:STDOUT: %.loc15: = fn_decl @.1 [template] {} +// CHECK:STDOUT: %Test: = fn_decl @Test [template] {} +// CHECK:STDOUT: %BeingDefined.decl = interface_decl @BeingDefined [template = constants.%.2] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Undefined; // CHECK:STDOUT: // CHECK:STDOUT: interface @BeingDefined { -// CHECK:STDOUT: %H: = fn_decl @H { +// CHECK:STDOUT: %H: = fn_decl @H [template] { // CHECK:STDOUT: %BeingDefined.ref: type = name_ref BeingDefined, file.%BeingDefined.decl [template = constants.%.2] // CHECK:STDOUT: %T.ref: = name_ref T, [template = ] // CHECK:STDOUT: %return.var: ref = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc37: in BeingDefined> = assoc_entity element0, %H [template = constants.%.4] -// CHECK:STDOUT: %.loc41: = fn_decl @.2 {} [template] +// CHECK:STDOUT: %.loc41: = fn_decl @.2 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .H = %.loc37 diff --git a/toolchain/check/testdata/interface/fail_member_lookup.carbon b/toolchain/check/testdata/interface/fail_member_lookup.carbon index de337b4849ba..8f102d548f54 100644 --- a/toolchain/check/testdata/interface/fail_member_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_member_lookup.carbon @@ -22,16 +22,16 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %F: = fn_decl @F.2 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { -// CHECK:STDOUT: %F: = fn_decl @F.1 {} [template] +// CHECK:STDOUT: %F: = fn_decl @F.1 [template] {} // CHECK:STDOUT: %.loc7: in Interface> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index 605728685b11..0f5c4a215dd5 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -36,16 +36,16 @@ protected interface Protected; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Abstract = %Abstract.decl // CHECK:STDOUT: .Default = %Default.decl // CHECK:STDOUT: .Virtual = %Virtual.decl // CHECK:STDOUT: .Protected = %Protected.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Abstract.decl = interface_decl @Abstract {} [template = constants.%.1] -// CHECK:STDOUT: %Default.decl = interface_decl @Default {} [template = constants.%.2] -// CHECK:STDOUT: %Virtual.decl = interface_decl @Virtual {} [template = constants.%.3] -// CHECK:STDOUT: %Protected.decl = interface_decl @Protected {} [template = constants.%.4] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Abstract.decl = interface_decl @Abstract [template = constants.%.1] {} +// CHECK:STDOUT: %Default.decl = interface_decl @Default [template = constants.%.2] {} +// CHECK:STDOUT: %Virtual.decl = interface_decl @Virtual [template = constants.%.3] {} +// CHECK:STDOUT: %Protected.decl = interface_decl @Protected [template = constants.%.4] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Abstract { diff --git a/toolchain/check/testdata/interface/fail_redeclare_member.carbon b/toolchain/check/testdata/interface/fail_redeclare_member.carbon index 439d3d0b5d9f..3ac2680c286b 100644 --- a/toolchain/check/testdata/interface/fail_redeclare_member.carbon +++ b/toolchain/check/testdata/interface/fail_redeclare_member.carbon @@ -24,16 +24,16 @@ interface Interface { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl = interface_decl @Interface [template = constants.%.1] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %.loc8: in Interface> = assoc_entity element0, %F [template = constants.%.3] -// CHECK:STDOUT: %.loc15: = fn_decl @.1 {} [template] +// CHECK:STDOUT: %.loc15: = fn_decl @.1 [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 diff --git a/toolchain/check/testdata/interface/fail_todo_define_out_of_line.carbon b/toolchain/check/testdata/interface/fail_todo_define_out_of_line.carbon index 7014a136a0dd..d008d710d068 100644 --- a/toolchain/check/testdata/interface/fail_todo_define_out_of_line.carbon +++ b/toolchain/check/testdata/interface/fail_todo_define_out_of_line.carbon @@ -28,15 +28,15 @@ fn Interface.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %.loc20: = fn_decl @.1 {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %.loc20: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %.loc11: in Interface> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon b/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon index 18f40e047135..baf99f522725 100644 --- a/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon @@ -23,20 +23,20 @@ fn CallStatic(T:! Interface) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Interface = %Interface.decl // CHECK:STDOUT: .CallStatic = %CallStatic -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] -// CHECK:STDOUT: %CallStatic: = fn_decl @CallStatic { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Interface.decl = interface_decl @Interface [template = constants.%.1] {} +// CHECK:STDOUT: %CallStatic: = fn_decl @CallStatic [template] { // CHECK:STDOUT: %Interface.ref: type = name_ref Interface, %Interface.decl [template = constants.%.1] // CHECK:STDOUT: %T.loc9_15.1: Interface = param T // CHECK:STDOUT: @CallStatic.%T: Interface = bind_symbolic_name T, %T.loc9_15.1 [symbolic] -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Interface { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %.loc7: in Interface> = assoc_entity element0, %F [template = constants.%.3] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/fail_todo_generic.carbon b/toolchain/check/testdata/interface/fail_todo_generic.carbon index 0f9722d509f3..21dc53d0b669 100644 --- a/toolchain/check/testdata/interface/fail_todo_generic.carbon +++ b/toolchain/check/testdata/interface/fail_todo_generic.carbon @@ -19,10 +19,10 @@ interface I[](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .I = %I.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] +// CHECK:STDOUT: } +// CHECK:STDOUT: %I.decl = interface_decl @I [template = constants.%.1] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @I; diff --git a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon index 55ad062983d0..fe3ec7b1a39f 100644 --- a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon @@ -32,18 +32,18 @@ private interface Private { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Modifiers = %Modifiers.decl // CHECK:STDOUT: .Private = %Private.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Modifiers.decl = interface_decl @Modifiers {} [template = constants.%.1] -// CHECK:STDOUT: %Private.decl = interface_decl @Private {} [template = constants.%.5] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Modifiers.decl = interface_decl @Modifiers [template = constants.%.1] {} +// CHECK:STDOUT: %Private.decl = interface_decl @Private [template = constants.%.5] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @Modifiers { -// CHECK:STDOUT: %Final: = fn_decl @Final {} [template] +// CHECK:STDOUT: %Final: = fn_decl @Final [template] {} // CHECK:STDOUT: %.loc11: in Modifiers> = assoc_entity element0, %Final [template = constants.%.3] -// CHECK:STDOUT: %Default: = fn_decl @Default {} [template] +// CHECK:STDOUT: %Default: = fn_decl @Default [template] {} // CHECK:STDOUT: %.loc15: in Modifiers> = assoc_entity element1, %Default [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: diff --git a/toolchain/check/testdata/interface/import.carbon b/toolchain/check/testdata/interface/import.carbon index 3aa6364a3bcb..bf67bc9576cd 100644 --- a/toolchain/check/testdata/interface/import.carbon +++ b/toolchain/check/testdata/interface/import.carbon @@ -43,14 +43,14 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %Empty.decl // CHECK:STDOUT: .ForwardDeclared = %ForwardDeclared.decl.loc7 // CHECK:STDOUT: .f_ref = %f_ref -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] -// CHECK:STDOUT: %ForwardDeclared.decl.loc7 = interface_decl @ForwardDeclared {} [template = constants.%.2] -// CHECK:STDOUT: %ForwardDeclared.decl.loc9 = interface_decl @ForwardDeclared {} [template = constants.%.2] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc7 = interface_decl @ForwardDeclared [template = constants.%.2] {} +// CHECK:STDOUT: %ForwardDeclared.decl.loc9 = interface_decl @ForwardDeclared [template = constants.%.2] {} // CHECK:STDOUT: %ForwardDeclared.ref: type = name_ref ForwardDeclared, %ForwardDeclared.decl.loc7 [template = constants.%.2] // CHECK:STDOUT: %.loc13: type = struct_type {.f: ForwardDeclared} [template = constants.%.5] // CHECK:STDOUT: %f_ref.var: ref {.f: ForwardDeclared} = var f_ref @@ -63,7 +63,7 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared { -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: %.loc10: in ForwardDeclared> = assoc_entity element0, %F [template = constants.%.4] // CHECK:STDOUT: // CHECK:STDOUT: !members: @@ -85,29 +85,29 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Empty = %import_ref.1 // CHECK:STDOUT: .ForwardDeclared = %import_ref.2 // CHECK:STDOUT: .f_ref = %import_ref.3 // CHECK:STDOUT: .UseEmpty = %UseEmpty // CHECK:STDOUT: .UseForwardDeclared = %UseForwardDeclared // CHECK:STDOUT: .f = %f.loc9 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: type = import_ref ir1, inst+1, used [template = constants.%.1] // CHECK:STDOUT: %import_ref.2: type = import_ref ir1, inst+3, used [template = constants.%.3] // CHECK:STDOUT: %import_ref.3: ref {.f: ForwardDeclared} = import_ref ir1, inst+19, used -// CHECK:STDOUT: %UseEmpty: = fn_decl @UseEmpty { -// CHECK:STDOUT: %Empty.decl = interface_decl @Empty {} [template = constants.%.1] +// CHECK:STDOUT: %UseEmpty: = fn_decl @UseEmpty [template] { +// CHECK:STDOUT: %Empty.decl = interface_decl @Empty [template = constants.%.1] {} // CHECK:STDOUT: %Empty.ref: type = name_ref Empty, %import_ref.1 [template = constants.%.1] // CHECK:STDOUT: %e.loc6_13.1: Empty = param e // CHECK:STDOUT: @UseEmpty.%e: Empty = bind_name e, %e.loc6_13.1 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %UseForwardDeclared: = fn_decl @UseForwardDeclared { -// CHECK:STDOUT: %ForwardDeclared.decl = interface_decl @ForwardDeclared {} [template = constants.%.3] +// CHECK:STDOUT: } +// CHECK:STDOUT: %UseForwardDeclared: = fn_decl @UseForwardDeclared [template] { +// CHECK:STDOUT: %ForwardDeclared.decl = interface_decl @ForwardDeclared [template = constants.%.3] {} // CHECK:STDOUT: %ForwardDeclared.ref.loc7: type = name_ref ForwardDeclared, %import_ref.2 [template = constants.%.3] // CHECK:STDOUT: %f.loc7_23.1: ForwardDeclared = param f // CHECK:STDOUT: @UseForwardDeclared.%f: ForwardDeclared = bind_name f, %f.loc7_23.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %ForwardDeclared.ref.loc9: type = name_ref ForwardDeclared, %import_ref.2 [template = constants.%.3] // CHECK:STDOUT: %.loc9: type = ptr_type ForwardDeclared [template = constants.%.4] // CHECK:STDOUT: %f.var: ref ForwardDeclared* = var f diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index 4cc96586b732..719d8a93dbdc 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -15,10 +15,10 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 6e4373a2c7e5..d76ee608e1d3 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -24,12 +24,12 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index daad2afd4e3e..6c85cb1ebde7 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -23,10 +23,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 60244bb7ec08..1f96d0789ef8 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -24,14 +24,14 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %a.loc8_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc8_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: i32) -> i32 { diff --git a/toolchain/check/testdata/let/fail_generic_import.carbon b/toolchain/check/testdata/let/fail_generic_import.carbon index 763132bde534..89961a6fd577 100644 --- a/toolchain/check/testdata/let/fail_generic_import.carbon +++ b/toolchain/check/testdata/let/fail_generic_import.carbon @@ -23,7 +23,7 @@ let a: T = 0; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %T: type = bind_symbolic_name T, i32 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -34,9 +34,9 @@ let a: T = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .T = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: type = import_ref ir1, inst+1, used [symbolic] // CHECK:STDOUT: %T.ref: type = name_ref T, %import_ref [symbolic = %import_ref] // CHECK:STDOUT: %.loc8: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index e1eb884b03b1..567ab9dc4139 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -75,7 +75,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc10: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %b: i32 = bind_name b, %.loc10 // CHECK:STDOUT: %.loc15: i32 = int_literal 1 [template = constants.%.1] diff --git a/toolchain/check/testdata/let/fail_todo_modifiers.carbon b/toolchain/check/testdata/let/fail_todo_modifiers.carbon index 3440c8e0f572..284bc41de180 100644 --- a/toolchain/check/testdata/let/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_todo_modifiers.carbon @@ -16,7 +16,7 @@ private let a: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc10: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %a: i32 = bind_name a, %.loc10 // 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 d26abca521b2..bab22ffa354c 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -14,10 +14,10 @@ fn F() { // CHECK:STDOUT: --- fail_use_in_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index f41d516af19c..a5774e5511d5 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -17,10 +17,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index d29127a63fce..e506f5d0aea2 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -20,7 +20,7 @@ var b: T = *a; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %T: type = bind_symbolic_name T, i32 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -31,11 +31,11 @@ var b: T = *a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .T = %import_ref // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: type = import_ref ir1, inst+1, used [symbolic] // CHECK:STDOUT: %T.ref.loc4: type = name_ref T, %import_ref [symbolic = %import_ref] // CHECK:STDOUT: %.loc4: type = ptr_type T [symbolic = constants.%.1] diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index ca8e740eee17..05665750caab 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -15,14 +15,14 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %n: i32 = bind_name n, %.loc7 -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/let/import.carbon b/toolchain/check/testdata/let/import.carbon index 52a7aaaa5467..1af3f96af7df 100644 --- a/toolchain/check/testdata/let/import.carbon +++ b/toolchain/check/testdata/let/import.carbon @@ -23,7 +23,7 @@ let b:! bool = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %.loc4: bool = bool_literal true [template = constants.%.1] // CHECK:STDOUT: %a: bool = bind_symbolic_name a, %.loc4 [symbolic] // CHECK:STDOUT: } @@ -31,9 +31,9 @@ let b:! bool = a; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: bool = import_ref ir1, inst+1, used [symbolic] // CHECK:STDOUT: %a.ref: bool = name_ref a, %import_ref [symbolic = %import_ref] // CHECK:STDOUT: %b: bool = bind_symbolic_name b, %a.ref [symbolic] diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index e95dbe12afa2..22df03cbf321 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -12,14 +12,14 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: --- local.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc7_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a: i32) -> i32 { diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index 7ad6be2963d9..4c281f4beb59 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -17,14 +17,14 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a.loc7: i32 = bind_name a, %a.loc7_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%a.loc7: i32) -> i32 { diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index 61a78f3b0e06..681b5c03c9fc 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -21,10 +21,10 @@ var a: i32 = NS.A(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon @@ -34,17 +34,17 @@ var a: i32 = NS.A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.2 // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: %.2: = namespace %import_ref, [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/alias.carbon b/toolchain/check/testdata/namespace/alias.carbon index 7f04d2065aa5..42de948ff1d6 100644 --- a/toolchain/check/testdata/namespace/alias.carbon +++ b/toolchain/check/testdata/namespace/alias.carbon @@ -23,30 +23,30 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7 // CHECK:STDOUT: .ns = %ns // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .C = %C // CHECK:STDOUT: .D = %D -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %NS.ref.loc9: = name_ref NS, %.loc7 [template = %.loc7] // CHECK:STDOUT: %ns: = bind_alias ns, %.loc7 [template = %.loc7] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var.loc11: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %return.var.loc13: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %NS.ref.loc15: = name_ref NS, %.loc7 [template = %.loc7] // CHECK:STDOUT: %A.ref: = name_ref A, %A [template = %A] // CHECK:STDOUT: %C: = bind_alias C, %A [template = %A] -// CHECK:STDOUT: %D: = fn_decl @D { +// CHECK:STDOUT: %D: = fn_decl @D [template] { // CHECK:STDOUT: %return.var.loc17: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> i32 { diff --git a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon index 993005fc229c..f51f6579937f 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon @@ -43,24 +43,24 @@ fn NS(); // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc8_13.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.loc8_13.1: = namespace %import_ref, {} [template] -// CHECK:STDOUT: %.loc8_13.2: = namespace {} [template] -// CHECK:STDOUT: %.loc16: = fn_decl @.1 {} [template] -// CHECK:STDOUT: %.loc20: = namespace {} [template] -// CHECK:STDOUT: %.loc28: = fn_decl @.2 {} [template] +// CHECK:STDOUT: %.loc8_13.1: = namespace %import_ref, [template] {} +// CHECK:STDOUT: %.loc8_13.2: = namespace [template] {} +// CHECK:STDOUT: %.loc16: = fn_decl @.1 [template] {} +// CHECK:STDOUT: %.loc20: = namespace [template] {} +// CHECK:STDOUT: %.loc28: = fn_decl @.2 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @.1(); diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon index 5cdd685bc697..c1cc1fc83990 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon @@ -29,24 +29,24 @@ fn NS.Foo(); // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: %.2: = namespace %import_ref, [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc12: = fn_decl @.1 {} [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc12: = fn_decl @.1 [template] {} +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @.1(); diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon index ba4f22e7501f..b8e9c388750b 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon @@ -35,10 +35,10 @@ fn NS.Foo(); // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %NS -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %NS: = fn_decl @NS {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %NS: = fn_decl @NS [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @NS(); @@ -46,12 +46,12 @@ fn NS.Foo(); // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%NS] -// CHECK:STDOUT: %.loc12: = namespace {} [template] -// CHECK:STDOUT: %.loc20: = fn_decl @.1 {} [template] +// CHECK:STDOUT: %.loc12: = namespace [template] {} +// CHECK:STDOUT: %.loc20: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @NS(); diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon index 7622228b0e37..9049a2fdc5cd 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon @@ -35,13 +35,13 @@ fn NS.Bar() {} // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { @@ -52,10 +52,10 @@ fn NS.Bar() {} // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %NS -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %NS: = fn_decl @NS {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %NS: = fn_decl @NS [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @NS() { @@ -66,17 +66,17 @@ fn NS.Bar() {} // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: %.2: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .Foo = %import_ref.2 // CHECK:STDOUT: .Bar = %Bar -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2 = import_ref ir1, inst+2, unused // CHECK:STDOUT: %import_ref.3 = import_ref ir2, inst+1, unused -// CHECK:STDOUT: %Bar: = fn_decl @Bar {} [template] +// CHECK:STDOUT: %Bar: = fn_decl @Bar [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Bar() { diff --git a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon index 196f287709eb..5db58e885a15 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon @@ -35,10 +35,10 @@ fn NS.Bar() {} // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %NS -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %NS: = fn_decl @NS {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %NS: = fn_decl @NS [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @NS() { @@ -49,13 +49,13 @@ fn NS.Bar() {} // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc10 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc10: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc10: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo() { @@ -66,17 +66,17 @@ fn NS.Bar() {} // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+1, unused // CHECK:STDOUT: %import_ref.2: = import_ref ir2, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref.2, { +// CHECK:STDOUT: %.2: = namespace %import_ref.2, [template] { // CHECK:STDOUT: .Foo = %import_ref.3 // CHECK:STDOUT: .Bar = %Bar -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.3 = import_ref ir2, inst+2, unused -// CHECK:STDOUT: %Bar: = fn_decl @Bar {} [template] +// CHECK:STDOUT: %Bar: = fn_decl @Bar [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Bar() { diff --git a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon index 25f6b6df84c6..81ad1a0cb0d7 100644 --- a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon +++ b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon @@ -24,16 +24,16 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7 // CHECK:STDOUT: .ns = %ns -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] {} // CHECK:STDOUT: %NS.ref: = name_ref NS, %.loc7 [template = %.loc7] // CHECK:STDOUT: %ns: = bind_alias ns, %.loc7 [template = %.loc7] -// CHECK:STDOUT: %.loc18: = fn_decl @.1 { +// CHECK:STDOUT: %.loc18: = fn_decl @.1 [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @.1() -> i32 { diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index e034e4f42542..4d8c825666ea 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -21,14 +21,14 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_duplicate.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .Baz = %Baz.loc9 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Baz.loc9: = fn_decl @Baz {} [template] -// CHECK:STDOUT: %Baz.loc18: = fn_decl @Baz {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Baz.loc9: = fn_decl @Baz [template] {} +// CHECK:STDOUT: %Baz.loc18: = fn_decl @Baz [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Baz() { diff --git a/toolchain/check/testdata/namespace/fail_modifiers.carbon b/toolchain/check/testdata/namespace/fail_modifiers.carbon index 725faae5f28c..e01d9969ad49 100644 --- a/toolchain/check/testdata/namespace/fail_modifiers.carbon +++ b/toolchain/check/testdata/namespace/fail_modifiers.carbon @@ -38,11 +38,11 @@ impl namespace Bar; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %.loc31 // CHECK:STDOUT: .Bar = %.loc36 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc31: = namespace {} [template] -// CHECK:STDOUT: %.loc36: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc31: = namespace [template] {} +// CHECK:STDOUT: %.loc36: = namespace [template] {} // 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 d16605fe02e3..d4998905bef2 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -13,8 +13,8 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_unresolved_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] -// CHECK:STDOUT: %.loc10: = fn_decl @.1 {} [template] +// CHECK:STDOUT: package: = namespace [template] {} +// CHECK:STDOUT: %.loc10: = fn_decl @.1 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @.1() { diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 44b43387ece3..8f3e2897b1c4 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -24,17 +24,17 @@ fn Bar() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %.loc7 // CHECK:STDOUT: .Baz = %Baz.loc10 // CHECK:STDOUT: .Bar = %Bar -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .Baz = %Baz.loc13 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Baz.loc10: = fn_decl @Baz.1 {} [template] -// CHECK:STDOUT: %Baz.loc13: = fn_decl @Baz.2 {} [template] -// CHECK:STDOUT: %Bar: = fn_decl @Bar {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Baz.loc10: = fn_decl @Baz.1 [template] {} +// CHECK:STDOUT: %Baz.loc13: = fn_decl @Baz.2 [template] {} +// CHECK:STDOUT: %Bar: = fn_decl @Bar [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Baz.1() { diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index 2ddcc4958f8a..3ce963f388c5 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -27,18 +27,18 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] { // CHECK:STDOUT: .ChildNS = %.loc5 // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc5: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc5: = namespace [template] { // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] -// CHECK:STDOUT: %B: = fn_decl @B {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} +// CHECK:STDOUT: %B: = fn_decl @B [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); @@ -52,22 +52,22 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.2 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .package_a = %package_a // CHECK:STDOUT: .package_b = %package_b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: %.2: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .ChildNS = %.3 // CHECK:STDOUT: .A = %import_ref.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: %.3: = namespace %import_ref.2, [template] { // CHECK:STDOUT: .B = %import_ref.4 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+3, used [template = imports.%A] // CHECK:STDOUT: %import_ref.4: = import_ref ir1, inst+4, used [template = imports.%B] // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index 78345712475b..04546d6ba01c 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -41,61 +41,61 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: %.2: = namespace %import_ref, [template] { // CHECK:STDOUT: .B = %.loc5 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc5: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc5: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: %.2: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .B = %.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+3, used -// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: %.3: = namespace %import_ref.2, [template] { // CHECK:STDOUT: .C = %.loc5 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc5: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc5: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- d.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.2 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: %.2: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .B = %.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+4, used -// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: %.3: = namespace %import_ref.2, [template] { // CHECK:STDOUT: .C = %.4 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+5, used -// CHECK:STDOUT: %.4: = namespace %import_ref.3, { +// CHECK:STDOUT: %.4: = namespace %import_ref.3, [template] { // CHECK:STDOUT: .D = %D -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %D: = fn_decl @D {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %D: = fn_decl @D [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @D() { @@ -110,22 +110,22 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.2 // CHECK:STDOUT: .e = %e -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: %.2: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .B = %.3 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+4, used -// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: %.3: = namespace %import_ref.2, [template] { // CHECK:STDOUT: .C = %.4 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+6, used -// CHECK:STDOUT: %.4: = namespace %import_ref.3, { +// CHECK:STDOUT: %.4: = namespace %import_ref.3, [template] { // CHECK:STDOUT: .D = %import_ref.4 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.4: = import_ref ir1, inst+7, used [template = imports.%D] // CHECK:STDOUT: %.loc5_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc5_9.2: type = converted %.loc5_9.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/namespace/merging.carbon b/toolchain/check/testdata/namespace/merging.carbon index 483e8e43f193..feaedb128b28 100644 --- a/toolchain/check/testdata/namespace/merging.carbon +++ b/toolchain/check/testdata/namespace/merging.carbon @@ -45,13 +45,13 @@ fn Run() { // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { @@ -62,16 +62,16 @@ fn Run() { // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] { // CHECK:STDOUT: .B1 = %B1 // CHECK:STDOUT: .B2 = %B2 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B1: = fn_decl @B1 {} [template] -// CHECK:STDOUT: %.loc8: = namespace {} [template] -// CHECK:STDOUT: %B2: = fn_decl @B2 {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B1: = fn_decl @B1 [template] {} +// CHECK:STDOUT: %.loc8: = namespace [template] {} +// CHECK:STDOUT: %B2: = fn_decl @B2 [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B1() { @@ -91,23 +91,23 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7_13.1 // CHECK:STDOUT: .Run = %Run -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.loc7_13.1: = namespace %import_ref.1, { +// CHECK:STDOUT: %.loc7_13.1: = namespace %import_ref.1, [template] { // CHECK:STDOUT: .A = %import_ref.2 // CHECK:STDOUT: .B1 = %import_ref.3 // CHECK:STDOUT: .B2 = %import_ref.4 // CHECK:STDOUT: .C = %C -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+2, used [template = imports.%A] // CHECK:STDOUT: %import_ref.3: = import_ref ir2, inst+2, used [template = imports.%B1] // CHECK:STDOUT: %import_ref.4: = import_ref ir2, inst+5, used [template = imports.%B2] -// CHECK:STDOUT: %.loc7_13.2: = namespace {} [template] -// CHECK:STDOUT: %C: = fn_decl @C {} [template] -// CHECK:STDOUT: %Run: = fn_decl @Run {} [template] +// CHECK:STDOUT: %.loc7_13.2: = namespace [template] {} +// CHECK:STDOUT: %C: = fn_decl @C [template] {} +// CHECK:STDOUT: %Run: = fn_decl @Run [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @C() { diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index ab0883ecc2f9..88e4cbb51dde 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -21,18 +21,18 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .Bar = %.loc8 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc8: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc8: = namespace [template] { // CHECK:STDOUT: .Wiz = %Wiz // CHECK:STDOUT: .Baz = %Baz -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Wiz: = fn_decl @Wiz {} [template] -// CHECK:STDOUT: %Baz: = fn_decl @Baz {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Wiz: = fn_decl @Wiz [template] {} +// CHECK:STDOUT: %Baz: = fn_decl @Baz [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Wiz() { diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 21a85f254919..127299148910 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -32,22 +32,22 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A.loc7 // CHECK:STDOUT: .N = %.loc9 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.loc7: = fn_decl @A.1 {} [template] -// CHECK:STDOUT: %.loc9: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.loc7: = fn_decl @A.1 [template] {} +// CHECK:STDOUT: %.loc9: = namespace [template] { // CHECK:STDOUT: .A = %A.loc10 // CHECK:STDOUT: .M = %.loc12 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A.loc10: = fn_decl @A.2 {} [template] -// CHECK:STDOUT: %.loc12: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A.loc10: = fn_decl @A.2 [template] {} +// CHECK:STDOUT: %.loc12: = namespace [template] { // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A.1(); diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index b77a6667da6a..e47203bf87bb 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -33,26 +33,26 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .OuterN = %.loc7 // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .CallA = %CallA -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] { // CHECK:STDOUT: .InnerN = %.loc8 // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .CallAB = %CallAB -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc8: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc8: = namespace [template] { // CHECK:STDOUT: .C = %C // CHECK:STDOUT: .CallABC = %CallABC -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] -// CHECK:STDOUT: %B: = fn_decl @B {} [template] -// CHECK:STDOUT: %C: = fn_decl @C {} [template] -// CHECK:STDOUT: %CallA: = fn_decl @CallA {} [template] -// CHECK:STDOUT: %CallAB: = fn_decl @CallAB {} [template] -// CHECK:STDOUT: %CallABC: = fn_decl @CallABC {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} +// CHECK:STDOUT: %B: = fn_decl @B [template] {} +// CHECK:STDOUT: %C: = fn_decl @C [template] {} +// CHECK:STDOUT: %CallA: = fn_decl @CallA [template] {} +// CHECK:STDOUT: %CallAB: = fn_decl @CallAB [template] {} +// CHECK:STDOUT: %CallABC: = fn_decl @CallABC [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index 6f4ddda21ad3..bfc95129f2d7 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -19,20 +19,20 @@ fn And() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .And = %And -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc7: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc8: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %And: = fn_decl @And { +// CHECK:STDOUT: } +// CHECK:STDOUT: %And: = fn_decl @And [template] { // CHECK:STDOUT: %return.var.loc10: ref bool = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index 797eda245aca..a9a01d94fd7f 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -46,10 +46,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon index 087a3acc8033..6b75d770febf 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon @@ -22,10 +22,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { 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 b7dd2ccb4788..5d6f1b45f459 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon @@ -67,14 +67,14 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32; diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index eb0041ad4f99..eebaff149dde 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -18,10 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index ff697f39bd2a..9c97c6d4bb6e 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -20,10 +20,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index 4d45b596c8be..4f50284dd91f 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -18,20 +18,20 @@ fn Or() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .Or = %Or -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc7: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc8: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Or: = fn_decl @Or { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Or: = fn_decl @Or [template] { // CHECK:STDOUT: %return.var.loc10: ref bool = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> bool { diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index 91da04d70f3f..f921e6ebb038 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -19,14 +19,14 @@ let not_false: bool = not false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Not = %Not -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Not: = fn_decl @Not { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Not: = fn_decl @Not [template] { // CHECK:STDOUT: %b.loc7_8.1: bool = param b // CHECK:STDOUT: @Not.%b: bool = bind_name b, %b.loc7_8.1 // CHECK:STDOUT: %return.var: ref bool = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc11_26: bool = bool_literal true [template = constants.%.1] // CHECK:STDOUT: %.loc11_22: bool = not %.loc11_26 [template = constants.%.2] // CHECK:STDOUT: %not_true: bool = bind_name not_true, %.loc11_22 diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index 534410fd8170..f6627c070d0c 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -14,10 +14,10 @@ fn Main() { // CHECK:STDOUT: --- fail_not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 4b6fb5da1c28..dbf90bdf6486 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -50,13 +50,13 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { @@ -89,13 +89,13 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { @@ -129,19 +129,19 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc4 // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc4: = namespace [template] { // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Self = constants.%C diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 33365cb8a73f..b9d9efcaea8f 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -37,25 +37,25 @@ import library "lib"; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- different_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -63,12 +63,12 @@ import library "lib"; // CHECK:STDOUT: --- main_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // 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 da85d1424eea..5865c0f4a7a3 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -28,24 +28,24 @@ library "Bar" impl; // CHECK:STDOUT: --- no_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: has_error -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: has_error -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: has_error -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 35e727f6ef7e..51e847398b8a 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -32,10 +32,10 @@ import library "var"; // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Foo(); @@ -43,9 +43,9 @@ import library "var"; // CHECK:STDOUT: --- var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %Foo -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %Foo.var: ref i32 = var Foo // CHECK:STDOUT: %Foo: ref i32 = bind_name Foo, %Foo.var // CHECK:STDOUT: } @@ -53,9 +53,9 @@ import library "var"; // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Foo = %import_ref.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+1, unused // CHECK:STDOUT: %import_ref.2 = import_ref ir2, inst+2, unused // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_cycle.carbon b/toolchain/check/testdata/packages/fail_cycle.carbon index 7924774e30f0..5c88168ae483 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -50,7 +50,7 @@ import B; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } @@ -58,7 +58,7 @@ import B; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } @@ -66,7 +66,7 @@ import B; // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } @@ -74,15 +74,15 @@ import B; // CHECK:STDOUT: --- c.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: has_error -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- cycle_child.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_duplicate_api.carbon b/toolchain/check/testdata/packages/fail_duplicate_api.carbon index 55f8d8b821c3..fe8f6086fbe4 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -45,48 +45,48 @@ package Package library "lib" api; // CHECK:STDOUT: --- main1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_extension.carbon b/toolchain/check/testdata/packages/fail_extension.carbon index 1e76279bc0a8..3be788b3dba0 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -73,60 +73,60 @@ package SwappedExt impl; // CHECK:STDOUT: --- main.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_redundant_with_swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // 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 4d86f07ae886..0fc95e82d57d 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -41,24 +41,24 @@ import library default; // CHECK:STDOUT: --- default_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- default.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // 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 4fe8a757d133..80e7fb7ffb06 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -85,55 +85,55 @@ import ImportNotFound; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %ImportNotFound: = bind_name ImportNotFound, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_import_repeat.carbon b/toolchain/check/testdata/packages/fail_import_repeat.carbon index 18edca476ee4..96a22924205f 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -61,25 +61,25 @@ import library default; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %import: = import ir2, ir3 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -87,6 +87,6 @@ import library default; // CHECK:STDOUT: --- default_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_type_error.carbon b/toolchain/check/testdata/packages/fail_import_type_error.carbon index 67f27ae9b865..aaf237c0eee5 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -39,12 +39,12 @@ var d: i32 = d_ref; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %a_ref // CHECK:STDOUT: .b_ref = %b_ref // CHECK:STDOUT: .c_ref = %c_ref // CHECK:STDOUT: .d_ref = %d_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.ref.loc7: = name_ref x, [template = ] // CHECK:STDOUT: %a_ref.var: ref = var a_ref // CHECK:STDOUT: %a_ref: ref = bind_name a_ref, %a_ref.var @@ -65,7 +65,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %import_ref.1 // CHECK:STDOUT: .b_ref = %import_ref.2 // CHECK:STDOUT: .c_ref = %import_ref.3 @@ -74,7 +74,7 @@ var d: i32 = d_ref; // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: ref = import_ref ir1, inst+3, used // CHECK:STDOUT: %import_ref.2: ref = import_ref ir1, inst+8, used // CHECK:STDOUT: %import_ref.3: ref = import_ref ir1, inst+12, used diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index b15273bacba4..e403b3d8a0b6 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -20,10 +20,10 @@ var a: () = A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a // CHECK:STDOUT: has_error -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %a.var: ref () = var a diff --git a/toolchain/check/testdata/packages/fail_package_main.carbon b/toolchain/check/testdata/packages/fail_package_main.carbon index 3fa4b4e55ad7..dc451ba83dd0 100644 --- a/toolchain/check/testdata/packages/fail_package_main.carbon +++ b/toolchain/check/testdata/packages/fail_package_main.carbon @@ -36,24 +36,24 @@ package Main library "lib" api; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- raw_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/implicit_imports.carbon b/toolchain/check/testdata/packages/implicit_imports.carbon index 8edbf837c2a1..4b77a9a86c7d 100644 --- a/toolchain/check/testdata/packages/implicit_imports.carbon +++ b/toolchain/check/testdata/packages/implicit_imports.carbon @@ -46,60 +46,60 @@ library "lib" impl; // CHECK:STDOUT: --- api_only.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_only_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_extra.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index 4c1021b38de6..ebbe06815b64 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -37,10 +37,10 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); @@ -52,11 +52,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %import_ref // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .package_a = %package_a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%A] // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.1 [template = constants.%.1] @@ -85,10 +85,10 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %B -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @B(); @@ -100,11 +100,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .B = %import_ref // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .package_b = %package_b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%B] // CHECK:STDOUT: %.loc6_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc6_9.2: type = converted %.loc6_9.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/packages/unused_lazy_import.carbon b/toolchain/check/testdata/packages/unused_lazy_import.carbon index 553d10be817a..5e04ec69c7cb 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -17,10 +17,10 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A(); @@ -28,9 +28,9 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %import_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref = import_ref ir1, inst+1, unused // 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 663646895d9e..829927772c41 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -17,12 +17,12 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index 11c625755e6d..4a244700392b 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -33,10 +33,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 7c6d6c4e8dc6..01b662742484 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -19,12 +19,12 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> i32 { diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index 4d32fbea8c7e..d84a26f621f0 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -21,10 +21,10 @@ fn Test() { // CHECK:STDOUT: --- fail_address_of_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Test = %Test -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Test: = fn_decl @Test {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Test: = fn_decl @Test [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Test() { diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index abad2dfc0827..3fcfcf1a3da6 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -108,7 +108,7 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H // CHECK:STDOUT: .AddressOfLiteral = %AddressOfLiteral @@ -117,23 +117,23 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: .AddressOfType = %AddressOfType // CHECK:STDOUT: .AddressOfTupleElementValue = %AddressOfTupleElementValue // CHECK:STDOUT: .AddressOfParam = %AddressOfParam -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %H: = fn_decl @H { +// CHECK:STDOUT: } +// CHECK:STDOUT: %H: = fn_decl @H [template] { // CHECK:STDOUT: %.loc9: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %return.var.loc9: ref {.a: i32} = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %AddressOfLiteral: = fn_decl @AddressOfLiteral {} [template] -// CHECK:STDOUT: %AddressOfOperator: = fn_decl @AddressOfOperator {} [template] -// CHECK:STDOUT: %AddressOfCall: = fn_decl @AddressOfCall {} [template] -// CHECK:STDOUT: %AddressOfType: = fn_decl @AddressOfType {} [template] -// CHECK:STDOUT: %AddressOfTupleElementValue: = fn_decl @AddressOfTupleElementValue {} [template] -// CHECK:STDOUT: %AddressOfParam: = fn_decl @AddressOfParam { +// CHECK:STDOUT: } +// CHECK:STDOUT: %AddressOfLiteral: = fn_decl @AddressOfLiteral [template] {} +// CHECK:STDOUT: %AddressOfOperator: = fn_decl @AddressOfOperator [template] {} +// CHECK:STDOUT: %AddressOfCall: = fn_decl @AddressOfCall [template] {} +// CHECK:STDOUT: %AddressOfType: = fn_decl @AddressOfType [template] {} +// CHECK:STDOUT: %AddressOfTupleElementValue: = fn_decl @AddressOfTupleElementValue [template] {} +// CHECK:STDOUT: %AddressOfParam: = fn_decl @AddressOfParam [template] { // CHECK:STDOUT: %param.loc78_19.1: i32 = param param // CHECK:STDOUT: @AddressOfParam.%param: i32 = bind_name param, %param.loc78_19.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32; diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 68c03fa98f3e..1c11e1c73f98 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -12,7 +12,7 @@ let n: i32 = *undeclared; // CHECK:STDOUT: --- fail_deref_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: %undeclared.ref: = name_ref undeclared, [template = ] // CHECK:STDOUT: %.loc10: ref = deref // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/pointer/fail_deref_function.carbon b/toolchain/check/testdata/pointer/fail_deref_function.carbon index f44df9cfc36b..67dedc284bdd 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -14,10 +14,10 @@ fn A() { // CHECK:STDOUT: --- fail_deref_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index a3bf87892be1..bb7f5222307f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -16,12 +16,12 @@ fn F() { // CHECK:STDOUT: --- fail_deref_namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.loc7 // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index f2fa7e1b393f..c5a008656da3 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -29,13 +29,13 @@ fn Deref(n: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Deref = %Deref -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Deref: = fn_decl @Deref { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Deref: = fn_decl @Deref [template] { // CHECK:STDOUT: %n.loc7_10.1: i32 = param n // CHECK:STDOUT: @Deref.%n: i32 = bind_name n, %n.loc7_10.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Deref(%n: i32) { diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index a3c8e15cd6f8..7695b85f0c9f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -15,9 +15,9 @@ var p: *i32; // CHECK:STDOUT: --- fail_deref_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .p = %p -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc13: ref = deref i32 // CHECK:STDOUT: %p.var: ref = var p // CHECK:STDOUT: %p: ref = bind_name p, %p.var diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index 549a1cd5583f..ae14163bcf2c 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -22,10 +22,10 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .ConstMismatch = %ConstMismatch -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch [template] { // CHECK:STDOUT: %.loc7_28.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_28.2: type = converted %.loc7_28.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_21: type = const_type {} [template = constants.%.2] @@ -37,7 +37,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: %.loc7_44: type = ptr_type {} [template = constants.%.4] // CHECK:STDOUT: %.loc7_35: type = const_type {}* [template = constants.%.5] // CHECK:STDOUT: %return.var: ref const ({}*) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ConstMismatch(%p: const {}*) -> const ({}*) { diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index c1b0ee6d1bf3..57d3fe4b52c7 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -25,10 +25,10 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_orig = %a_orig // CHECK:STDOUT: .a_ref = %a_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a_orig.var: ref i32 = var a_orig // CHECK:STDOUT: %a_orig: ref i32 = bind_name a_orig, %a_orig.var // CHECK:STDOUT: %.loc5: type = ptr_type i32 [template = constants.%.2] @@ -53,11 +53,11 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_orig = %import_ref.1 // CHECK:STDOUT: .a_ref = %import_ref.2 // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+2, unused // CHECK:STDOUT: %import_ref.2: ref i32* = import_ref ir1, inst+9, used // CHECK:STDOUT: %.loc4: type = ptr_type i32 [template = constants.%.1] diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index e8a9f57eee4d..b8301877fd32 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -20,10 +20,10 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc8_23: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc8_32: type = ptr_type const i32 [template = constants.%.2] // CHECK:STDOUT: %.loc8_16: type = const_type const i32* [template = constants.%.3] @@ -33,7 +33,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: @F.%p: const (const (const i32*)*) = bind_name p, %p.loc8_6.1 // CHECK:STDOUT: %.loc8_41: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref const i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%p: const (const (const i32*)*)) -> const i32 { diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 64fca1f02fa4..f96a9e2398ea 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -21,18 +21,18 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Ptr = %Ptr // CHECK:STDOUT: .ConstPtr = %ConstPtr -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Ptr: = fn_decl @Ptr { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Ptr: = fn_decl @Ptr [template] { // CHECK:STDOUT: %.loc7_14: type = ptr_type i32 [template = constants.%.1] // CHECK:STDOUT: %p.loc7_8.1: i32* = param p // CHECK:STDOUT: @Ptr.%p: i32* = bind_name p, %p.loc7_8.1 // CHECK:STDOUT: %.loc7_23: type = ptr_type i32 [template = constants.%.1] // CHECK:STDOUT: %return.var.loc7: ref i32* = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ConstPtr: = fn_decl @ConstPtr { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ConstPtr: = fn_decl @ConstPtr [template] { // CHECK:STDOUT: %.loc11_16: type = const_type i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_25: type = ptr_type const i32 [template = constants.%.3] // CHECK:STDOUT: %p.loc11_13.1: const i32* = param p @@ -40,7 +40,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: %.loc11_32: type = const_type i32 [template = constants.%.2] // CHECK:STDOUT: %.loc11_42: type = ptr_type const i32 [template = constants.%.3] // CHECK:STDOUT: %return.var.loc11: ref const i32* = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Ptr(%p: i32*) -> i32* { diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index 54d4dd1f0d7c..a02b26b810e6 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -16,10 +16,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index f5dfdc2118f3..246c21ae4f96 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -27,14 +27,14 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %b.loc7_6.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc7_6.1 // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%b: bool) -> i32 { diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index 366f95ba5cc1..7e047d6e2ea7 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -19,20 +19,20 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .ReturnType = %ReturnType // CHECK:STDOUT: .Six = %Six -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType { +// CHECK:STDOUT: } +// CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType [template] { // CHECK:STDOUT: %return.var.loc9: ref type = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Six: = fn_decl @Six { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Six: = fn_decl @Six [template] { // CHECK:STDOUT: %ReturnType.ref: = name_ref ReturnType, %ReturnType [template = %ReturnType] // CHECK:STDOUT: %.loc13_23.1: init type = call %ReturnType.ref() // CHECK:STDOUT: %.loc13_24: type = value_of_initializer %.loc13_23.1 // CHECK:STDOUT: %.loc13_23.2: type = converted %.loc13_23.1, %.loc13_24 // CHECK:STDOUT: %return.var.loc13: ref = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @ReturnType() -> type { diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index b2f8673ea2d6..2c98c6166620 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -12,13 +12,13 @@ fn Six() -> x; // CHECK:STDOUT: --- fail_error_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Six = %Six -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Six: = fn_decl @Six { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Six: = fn_decl @Six [template] { // CHECK:STDOUT: %x.ref: = name_ref x, [template = ] // CHECK:STDOUT: %return.var: ref = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Six() -> ; diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index f89bd6571ba0..340dc2738ef5 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -13,12 +13,12 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_missing_return.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { 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 630f7434795e..e0fbcd5fa437 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -17,14 +17,14 @@ fn F() -> () { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_12.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_12.2: type = converted %.loc7_12.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref () = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> () { 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 43ec81e541ef..e4e5980bde46 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 @@ -14,12 +14,12 @@ fn Procedure() -> i32 { // CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Procedure = %Procedure -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Procedure: = fn_decl @Procedure { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Procedure: = fn_decl @Procedure [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Procedure() -> i32 { 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 8dffa1eb5da3..f783ed307300 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -41,19 +41,19 @@ fn G() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: @G.%return: ref C = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { 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 5d8af23bfcab..9fa782f86546 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 @@ -22,10 +22,10 @@ fn Procedure() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Procedure = %Procedure -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Procedure: = fn_decl @Procedure {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Procedure: = fn_decl @Procedure [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Procedure() { diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index cc4d45af7aab..2113e2ca80c2 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -43,16 +43,16 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .SameScope = %SameScope // CHECK:STDOUT: .DifferentScopes = %DifferentScopes -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %SameScope: = fn_decl @SameScope { +// CHECK:STDOUT: } +// CHECK:STDOUT: %SameScope: = fn_decl @SameScope [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %DifferentScopes: = fn_decl @DifferentScopes { +// CHECK:STDOUT: } +// CHECK:STDOUT: %DifferentScopes: = fn_decl @DifferentScopes [template] { // CHECK:STDOUT: %return.var.loc21: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @SameScope() -> i32 { diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index b68f20ed0da0..bb5a72ce074c 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -22,12 +22,12 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Mismatch = %Mismatch -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Mismatch() -> i32 { diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 566f8646f3df..693f6268224c 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -18,12 +18,12 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index 8fb3439109c6..d8c44439ac86 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -21,10 +21,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 7b5975bee9e1..9a9ad1a14f4a 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -17,12 +17,12 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_value_missing.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index c120bbba5962..5be468a309fc 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -17,17 +17,17 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .Six = %Six -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var -// CHECK:STDOUT: %Six: = fn_decl @Six { +// CHECK:STDOUT: %Six: = fn_decl @Six [template] { // CHECK:STDOUT: %x.ref: ref type = name_ref x, %x // CHECK:STDOUT: %.loc11: type = bind_value %x.ref // CHECK:STDOUT: %return.var: ref = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Six() -> { 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 6fb6576817ce..4d97aa856f91 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -10,10 +10,10 @@ fn F() { // CHECK:STDOUT: --- missing_return_no_return_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index 71d84bcaef59..a23783f5c881 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -11,10 +11,10 @@ fn Main() { // CHECK:STDOUT: --- no_value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 4d032d7bb8eb..b1dbe844b7a3 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -33,19 +33,19 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .C = %C.decl // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C.decl = class_decl @C [template = constants.%C] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %C.ref: type = name_ref C, %C.decl [template = constants.%C] // CHECK:STDOUT: @F.%return: ref C = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc17: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @C { diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 0817a0ff0351..46096dfc5a48 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -32,18 +32,18 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .UnrelatedScopes = %UnrelatedScopes // CHECK:STDOUT: .EnclosingButAfter = %EnclosingButAfter -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes { +// CHECK:STDOUT: } +// CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %EnclosingButAfter: = fn_decl @EnclosingButAfter { +// CHECK:STDOUT: } +// CHECK:STDOUT: %EnclosingButAfter: = fn_decl @EnclosingButAfter [template] { // CHECK:STDOUT: %b.loc17_22.1: bool = param b // CHECK:STDOUT: @EnclosingButAfter.%b: bool = bind_name b, %b.loc17_22.1 // CHECK:STDOUT: %return.var.loc17: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @UnrelatedScopes() -> i32 { diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index e0ea5cffcce3..531164886898 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -17,13 +17,13 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %.loc7: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %return.var: ref {.a: i32} = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> {.a: i32} { diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index 0c8ab9afa140..d0863a7e516f 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -21,14 +21,14 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %.loc8_23.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc8_23.2: type = converted %.loc8_23.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @Main.%return: ref (i32, i32) = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> %return: (i32, i32) { diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index 10e7d252f04e..1d64413c46df 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -15,12 +15,12 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] { // CHECK:STDOUT: %return.var: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() -> i32 { diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 40d5b1aec911..9c7847ca396b 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -16,10 +16,10 @@ var y: {} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 084dcf0bfc61..d41eab9e5888 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -13,10 +13,10 @@ fn F() { a.b; } // CHECK:STDOUT: --- fail_access_into_invalid.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() { diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 00d577a4caee..bf178ac99f7b 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -17,9 +17,9 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index 2e8049a1d5be..b7fc6a22c0c7 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -20,9 +20,9 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = struct_type {.a: {}} [template = constants.%.2] diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index 5db122012f3b..ab17cb209a7f 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -19,9 +19,9 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index 24417d5e9e1d..abbcf35b7be9 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -57,14 +57,14 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var: ref = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc21_35: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc21_36: {.a: i32} = struct_literal (%.loc21_35) // CHECK:STDOUT: %v: = bind_name v, diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index efc25d22e71f..defe9116c894 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -23,10 +23,10 @@ var y: {.b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index f4fa8824e0a8..6d661cae08ba 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -18,9 +18,9 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 7e83e07e791a..691cf494fe0a 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -19,10 +19,10 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: type = struct_type {.a: f64} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: f64} = var x // CHECK:STDOUT: %x: ref {.a: f64} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_of_function.carbon b/toolchain/check/testdata/struct/fail_member_of_function.carbon index 5683fb8a220b..3200041eaa7a 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -14,10 +14,10 @@ fn A() { // CHECK:STDOUT: --- fail_member_of_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() { diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index bdaa20e9575d..457d8f72361e 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -25,12 +25,12 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Incomplete = %Incomplete.decl // CHECK:STDOUT: .s = %s // CHECK:STDOUT: .p = %p -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15: type = struct_type {.a: Incomplete} [template = constants.%.1] // CHECK:STDOUT: %s.var: ref = var s diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index 63bec50df1d6..126d0b5ae290 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -19,10 +19,10 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 303ea5681b87..c59baa7c6e45 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -19,9 +19,9 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 1924427ab1ac..aeef2ab83f1e 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -16,9 +16,9 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index 6e3245db25a4..df2dcb652121 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -17,9 +17,9 @@ var x: {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: {.a: i32} = struct_literal (%.loc10_14) // CHECK:STDOUT: %x.var: ref = var x diff --git a/toolchain/check/testdata/struct/import.carbon b/toolchain/check/testdata/struct/import.carbon index ee0bc4d1510b..46a3a78da3d5 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -38,10 +38,10 @@ var b: {.a: {.b: i32, .c: (i32,)}, .d: i32} = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %a_ref // CHECK:STDOUT: .b_ref = %b_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc4: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %a_ref.var: ref {.a: i32} = var a_ref // CHECK:STDOUT: %a_ref: ref {.a: i32} = bind_name a_ref, %a_ref.var @@ -97,12 +97,12 @@ var b: {.a: {.b: i32, .c: (i32,)}, .d: i32} = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %import_ref.1 // CHECK:STDOUT: .b_ref = %import_ref.2 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: ref {.a: i32} = import_ref ir1, inst+6, used // CHECK:STDOUT: %import_ref.2: ref {.a: {.b: i32, .c: (i32,)}, .d: i32} = import_ref ir1, inst+37, used // CHECK:STDOUT: %.loc4: type = struct_type {.a: i32} [template = constants.%.1] diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index f20933ba7800..319ac42f5865 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -23,17 +23,17 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %.loc7: type = struct_type {.x: i32, .y: i32, .z: i32} [template = constants.%.1] // CHECK:STDOUT: @G.%return: ref {.x: i32, .y: i32, .z: i32} = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc9: ref i32 = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> %return: {.x: i32, .y: i32, .z: i32}; diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index 349d7fb93115..1f6e62a36dad 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -19,11 +19,11 @@ var z: i32 = y; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y // CHECK:STDOUT: .z = %z -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: type = struct_type {.a: f64, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: f64, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: f64, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index 9e387a516949..2f9244412c7f 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -22,16 +22,16 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_25.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_25.2: type = converted %.loc7_25.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref (i32, i32, i32) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index 3afe61945ca6..f21ee9e73eda 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -16,10 +16,10 @@ var y: {.a: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index 958e7c4943a6..56b20e2b2f4f 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -23,21 +23,21 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .MakeI32 = %MakeI32 // CHECK:STDOUT: .MakeF64 = %MakeF64 // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 [template] { // CHECK:STDOUT: %return.var.loc7: ref i32 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %MakeF64: = fn_decl @MakeF64 { +// CHECK:STDOUT: } +// CHECK:STDOUT: %MakeF64: = fn_decl @MakeF64 [template] { // CHECK:STDOUT: %return.var.loc8: ref f64 = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc10: type = struct_type {.a: i32, .b: f64} [template = constants.%.1] // CHECK:STDOUT: @F.%return: ref {.a: i32, .b: f64} = var -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @MakeI32() -> i32; diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index de324e6e6c2c..a81ee89f6ba7 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -21,10 +21,10 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_27.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_27.2: type = converted %.loc7_27.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc7_28: type = struct_type {.a: i32, .b: (i32,)} [template = constants.%.3] diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index ee2c6159e7e5..ae62f59c1c52 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -21,10 +21,10 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: i32, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %.loc7_35: i32 = int_literal 1 [template = constants.%.3] // CHECK:STDOUT: %.loc7_43: i32 = int_literal 2 [template = constants.%.4] diff --git a/toolchain/check/testdata/tuples/empty.carbon b/toolchain/check/testdata/tuples/empty.carbon index 669a0ea70b07..03a7e688a9c1 100644 --- a/toolchain/check/testdata/tuples/empty.carbon +++ b/toolchain/check/testdata/tuples/empty.carbon @@ -15,10 +15,10 @@ var y: () = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_empty.carbon index 618e93cee74b..3013bc77c75a 100644 --- a/toolchain/check/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_empty.carbon @@ -18,9 +18,9 @@ var x: (i32,) = (); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_13.2: type = converted %.loc10_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_nested.carbon b/toolchain/check/testdata/tuples/fail_assign_nested.carbon index 8092f4bcb487..a222e723d983 100644 --- a/toolchain/check/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_nested.carbon @@ -30,9 +30,9 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_18.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_30.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_31.1: ((type, type), (type, type)) = tuple_literal (%.loc10_18.1, %.loc10_30.1) diff --git a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon index 3885af95841a..9ce510968535 100644 --- a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon @@ -17,9 +17,9 @@ var x: () = (66); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon index c746df114cd1..bc577cf7289e 100644 --- a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon @@ -21,9 +21,9 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon index 96ff853ab66b..20bb189d5e02 100644 --- a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon @@ -27,12 +27,12 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Incomplete = %Incomplete.decl // CHECK:STDOUT: .t = %t // CHECK:STDOUT: .p = %p -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete {} [template = constants.%Incomplete] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete [template = constants.%Incomplete] {} // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15_24.1: (type, type) = tuple_literal (i32, %Incomplete.ref.loc15) // CHECK:STDOUT: %.loc15_24.2: type = converted %.loc15_24.1, constants.%.2 [template = constants.%.2] diff --git a/toolchain/check/testdata/tuples/fail_too_few_element.carbon b/toolchain/check/testdata/tuples/fail_too_few_element.carbon index d4159efa1264..a7f348a96b22 100644 --- a/toolchain/check/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuples/fail_too_few_element.carbon @@ -20,9 +20,9 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_type_assign.carbon b/toolchain/check/testdata/tuples/fail_type_assign.carbon index ea0c72c958c6..a1316acb5c69 100644 --- a/toolchain/check/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuples/fail_type_assign.carbon @@ -17,9 +17,9 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_value_as_type.carbon b/toolchain/check/testdata/tuples/fail_value_as_type.carbon index 3b68cd17c4fe..3aa1212cbf4c 100644 --- a/toolchain/check/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuples/fail_value_as_type.carbon @@ -17,9 +17,9 @@ var x: (1, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_12: (i32,) = tuple_literal (%.loc10_9) // CHECK:STDOUT: %x.var: ref = var x diff --git a/toolchain/check/testdata/tuples/import.carbon b/toolchain/check/testdata/tuples/import.carbon index cd9519ed98fc..e89eaa96bcd0 100644 --- a/toolchain/check/testdata/tuples/import.carbon +++ b/toolchain/check/testdata/tuples/import.carbon @@ -44,10 +44,10 @@ var b: (((i32,), i32), (i32, i32)) = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %a_ref // CHECK:STDOUT: .b_ref = %b_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc4_17.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc4_17.2: type = converted %.loc4_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a_ref.var: ref (i32,) = var a_ref @@ -119,12 +119,12 @@ var b: (((i32,), i32), (i32, i32)) = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %import_ref.1 // CHECK:STDOUT: .b_ref = %import_ref.2 // CHECK:STDOUT: .a = %a // CHECK:STDOUT: .b = %b -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref.1: ref (i32,) = import_ref ir1, inst+6, used // CHECK:STDOUT: %import_ref.2: ref (((i32,), i32), (i32, i32)) = import_ref ir1, inst+34, used // CHECK:STDOUT: %.loc4_13.1: (type,) = tuple_literal (i32) diff --git a/toolchain/check/testdata/tuples/nested_tuple.carbon b/toolchain/check/testdata/tuples/nested_tuple.carbon index e8b07d7cd6f1..843d75af3ba1 100644 --- a/toolchain/check/testdata/tuples/nested_tuple.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple.carbon @@ -24,9 +24,9 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_18.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.1: ((type, type), type) = tuple_literal (%.loc7_18.1, i32) // CHECK:STDOUT: %.loc7_18.2: type = converted %.loc7_18.1, constants.%.3 [template = constants.%.3] diff --git a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon index 34fb6d32d51e..c036978f8e47 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -33,18 +33,18 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %.loc7_25.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_25.2: type = converted %.loc7_25.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: @F.%return: ref (i32, i32, i32) = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @F() -> %return: (i32, i32, i32); diff --git a/toolchain/check/testdata/tuples/one_element.carbon b/toolchain/check/testdata/tuples/one_element.carbon index e4ac37ed2cde..fb1106bf2ff2 100644 --- a/toolchain/check/testdata/tuples/one_element.carbon +++ b/toolchain/check/testdata/tuples/one_element.carbon @@ -17,10 +17,10 @@ var y: (i32,) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/two_elements.carbon b/toolchain/check/testdata/tuples/two_elements.carbon index 332695699ee3..f2e4b4a787a7 100644 --- a/toolchain/check/testdata/tuples/two_elements.carbon +++ b/toolchain/check/testdata/tuples/two_elements.carbon @@ -22,10 +22,10 @@ var y: (i32, i32) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc7_22: i32 = int_literal 4 [template = constants.%.4] diff --git a/toolchain/check/testdata/var/decl.carbon b/toolchain/check/testdata/var/decl.carbon index 5611cab906f5..2d34ba139477 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -11,10 +11,10 @@ fn Main() { // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index 9a033a54433a..07bf3a500b91 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -15,10 +15,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 71fdbd0a0c93..a374cc7ada38 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -23,10 +23,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_generic.carbon b/toolchain/check/testdata/var/fail_generic.carbon index bf026e81f13f..a3af4605eb07 100644 --- a/toolchain/check/testdata/var/fail_generic.carbon +++ b/toolchain/check/testdata/var/fail_generic.carbon @@ -18,10 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index c7eb7b5f21dc..0a015e9b49ff 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -18,10 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 217fd7251ffe..384b58b69db7 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -14,10 +14,10 @@ fn Main() { // CHECK:STDOUT: --- fail_init_with_self.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index 9a1a114aa946..0d29fcfa6fc2 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -16,11 +16,11 @@ var y: i32 = x; // CHECK:STDOUT: --- fail_lookup_outside_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: %y.var: ref i32 = var y // CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/fail_modifiers.carbon b/toolchain/check/testdata/var/fail_modifiers.carbon index 499067682ee5..a4986030c744 100644 --- a/toolchain/check/testdata/var/fail_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_modifiers.carbon @@ -39,12 +39,12 @@ abstract var e: i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .b = %b // CHECK:STDOUT: .c = %c // CHECK:STDOUT: .d = %d // CHECK:STDOUT: .e = %e -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %b.var: ref i32 = var b // CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %c.var: ref i32 = var c diff --git a/toolchain/check/testdata/var/fail_namespace_conflict.carbon b/toolchain/check/testdata/var/fail_namespace_conflict.carbon index da5642d1181a..b9e39fe0e680 100644 --- a/toolchain/check/testdata/var/fail_namespace_conflict.carbon +++ b/toolchain/check/testdata/var/fail_namespace_conflict.carbon @@ -29,10 +29,10 @@ var A: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %.loc7 -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] {} // CHECK:STDOUT: %A.var.loc15: ref i32 = var A // CHECK:STDOUT: %A.loc15: ref i32 = bind_name A, %A.var.loc15 // CHECK:STDOUT: %A.var.loc23: ref i32 = var A diff --git a/toolchain/check/testdata/var/fail_not_copyable.carbon b/toolchain/check/testdata/var/fail_not_copyable.carbon index 782b1eae88bc..088cfc0d64c6 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -34,16 +34,16 @@ fn F(x: X) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .X = %X.decl // CHECK:STDOUT: .F = %F -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %X.decl = class_decl @X {} [template = constants.%X] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %X.decl = class_decl @X [template = constants.%X] {} +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %X.ref: type = name_ref X, %X.decl [template = constants.%X] // CHECK:STDOUT: %x.loc10_6.1: X = param x // CHECK:STDOUT: @F.%x: X = bind_name x, %x.loc10_6.1 -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: class @X { diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 63a4f22df42c..e4fd5c7135e8 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -18,10 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/fail_todo_modifiers.carbon b/toolchain/check/testdata/var/fail_todo_modifiers.carbon index 87cc7d9d0996..cd5b14975f89 100644 --- a/toolchain/check/testdata/var/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_todo_modifiers.carbon @@ -12,9 +12,9 @@ private var a: i32; // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index 2f86df47cad6..6a82c05a5147 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -9,9 +9,9 @@ var x: i32; // CHECK:STDOUT: --- global_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // 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 7c184a6e13e3..6b2e706754c9 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -13,9 +13,9 @@ var x: i32 = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index 5e8c585458e3..47f6c0189b5a 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -14,10 +14,10 @@ var y: i32 = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .y = %y -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // 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 diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index 0f015f52eea3..dc49668bfac9 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -17,13 +17,13 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .x = %x // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/import.carbon b/toolchain/check/testdata/var/import.carbon index b12d72bc8650..6698acca6e5c 100644 --- a/toolchain/check/testdata/var/import.carbon +++ b/toolchain/check/testdata/var/import.carbon @@ -23,9 +23,9 @@ var a: i32 = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %a_ref -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %a_ref.var: ref i32 = var a_ref // CHECK:STDOUT: %a_ref: ref i32 = bind_name a_ref, %a_ref.var // CHECK:STDOUT: } @@ -40,10 +40,10 @@ var a: i32 = a_ref; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .a_ref = %import_ref // CHECK:STDOUT: .a = %a -// CHECK:STDOUT: } [template] +// CHECK:STDOUT: } // CHECK:STDOUT: %import_ref: ref i32 = import_ref ir1, inst+2, used // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index bc425ef56587..3097ff50d2a0 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -16,10 +16,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 13a1712cc250..862e60c5a391 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -28,12 +28,12 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .NS = %.loc7 // CHECK:STDOUT: .Main = %Main -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] -// CHECK:STDOUT: %Main: = fn_decl @Main {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %.loc7: = namespace [template] {} +// CHECK:STDOUT: %Main: = fn_decl @Main [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Main() { diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index f095eaf111d0..3e9586ecf37e 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -29,7 +29,7 @@ fn While() { // CHECK:STDOUT: --- break_continue.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .A = %A // CHECK:STDOUT: .B = %B // CHECK:STDOUT: .C = %C @@ -39,32 +39,32 @@ fn While() { // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H // CHECK:STDOUT: .While = %While -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %A: = fn_decl @A { +// CHECK:STDOUT: } +// CHECK:STDOUT: %A: = fn_decl @A [template] { // CHECK:STDOUT: %return.var.loc7: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %B: = fn_decl @B { +// CHECK:STDOUT: } +// CHECK:STDOUT: %B: = fn_decl @B [template] { // CHECK:STDOUT: %return.var.loc8: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %C: = fn_decl @C { +// CHECK:STDOUT: } +// CHECK:STDOUT: %C: = fn_decl @C [template] { // CHECK:STDOUT: %return.var.loc9: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %D: = fn_decl @D { +// CHECK:STDOUT: } +// CHECK:STDOUT: %D: = fn_decl @D [template] { // CHECK:STDOUT: %return.var.loc10: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %E: = fn_decl @E { +// CHECK:STDOUT: } +// CHECK:STDOUT: %E: = fn_decl @E [template] { // CHECK:STDOUT: %return.var.loc11: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F { +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] { // CHECK:STDOUT: %return.var.loc12: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %G: = fn_decl @G { +// CHECK:STDOUT: } +// CHECK:STDOUT: %G: = fn_decl @G [template] { // CHECK:STDOUT: %return.var.loc13: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %H: = fn_decl @H { +// CHECK:STDOUT: } +// CHECK:STDOUT: %H: = fn_decl @H [template] { // CHECK:STDOUT: %return.var.loc14: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %While: = fn_decl @While {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %While: = fn_decl @While [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @A() -> bool; diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index e01eaeaea87e..a6e7fe507048 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -19,10 +19,10 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .While = %While -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %While: = fn_decl @While {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %While: = fn_decl @While [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @While() { diff --git a/toolchain/check/testdata/while/fail_break_continue.carbon b/toolchain/check/testdata/while/fail_break_continue.carbon index 436851ab2d63..712a41ae11cb 100644 --- a/toolchain/check/testdata/while/fail_break_continue.carbon +++ b/toolchain/check/testdata/while/fail_break_continue.carbon @@ -34,10 +34,10 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .While = %While -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %While: = fn_decl @While {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %While: = fn_decl @While [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @While() { diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index b2e9ad8c19b8..abaaaca3c028 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -26,20 +26,20 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cond = %Cond // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H // CHECK:STDOUT: .While = %While -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Cond: = fn_decl @Cond { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Cond: = fn_decl @Cond [template] { // CHECK:STDOUT: %return.var: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] -// CHECK:STDOUT: %While: = fn_decl @While {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} +// CHECK:STDOUT: %While: = fn_decl @While [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Cond() -> bool; diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 4103fdf7a988..01ac8b140858 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -25,20 +25,20 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: package: = namespace [template] { // CHECK:STDOUT: .Cond = %Cond // CHECK:STDOUT: .F = %F // CHECK:STDOUT: .G = %G // CHECK:STDOUT: .H = %H // CHECK:STDOUT: .While = %While -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %Cond: = fn_decl @Cond { +// CHECK:STDOUT: } +// CHECK:STDOUT: %Cond: = fn_decl @Cond [template] { // CHECK:STDOUT: %return.var: ref bool = var -// CHECK:STDOUT: } [template] -// CHECK:STDOUT: %F: = fn_decl @F {} [template] -// CHECK:STDOUT: %G: = fn_decl @G {} [template] -// CHECK:STDOUT: %H: = fn_decl @H {} [template] -// CHECK:STDOUT: %While: = fn_decl @While {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: %F: = fn_decl @F [template] {} +// CHECK:STDOUT: %G: = fn_decl @G [template] {} +// CHECK:STDOUT: %H: = fn_decl @H [template] {} +// CHECK:STDOUT: %While: = fn_decl @While [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @Cond() -> bool; diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index cdb2bdfdc4a6..ea9749385423 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace [template] {} // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index 0352e768d82f..349ab7cd6fca 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -566,6 +566,8 @@ class InstNamer { // Formatter for printing textual Semantics IR. class Formatter { public: + enum class AddSpace : bool { Before, After }; + explicit Formatter(const Lex::TokenizedBuffer& tokenized_buffer, const Parse::Tree& parse_tree, const File& sem_ir, llvm::raw_ostream& out) @@ -620,6 +622,10 @@ class Formatter { // Begins a braced block. Writes an open brace, and prepares to insert a // newline after it if the braced block is non-empty. auto OpenBrace() -> void { + // Put the constant value of an instruction before any braced block, rather + // than at the end. + FormatPendingConstantValue(AddSpace::After); + out_ << '{'; indent_ += 2; after_open_brace_ = true; @@ -897,21 +903,11 @@ class Formatter { Indent(); FormatInstructionLHS(inst_id, inst); out_ << InstT::Kind.ir_name(); + pending_constant_value_ = sem_ir_.constant_values().Get(inst_id); + pending_constant_value_is_self_ = + pending_constant_value_.inst_id() == inst_id; FormatInstructionRHS(inst); - if (auto const_id = sem_ir_.constant_values().Get(inst_id); - !const_id.is_valid() || const_id.is_constant()) { - out_ << " ["; - if (const_id.is_valid()) { - out_ << (const_id.is_symbolic() ? "symbolic" : "template"); - if (const_id.inst_id() != inst_id) { - out_ << " = "; - FormatInstName(const_id.inst_id()); - } - } else { - out_ << const_id; - } - out_ << "]"; - } + FormatPendingConstantValue(AddSpace::Before); out_ << "\n"; } @@ -924,6 +920,35 @@ class Formatter { out_ << "\n"; } + // If there is a pending constant value attached to the current instruction, + // print it now and clear it out. The constant value gets printed before the + // first braced block argument, or at the end of the instruction if there are + // no such arguments. + auto FormatPendingConstantValue(AddSpace space_where) -> void { + if (pending_constant_value_ == ConstantId::NotConstant) { + return; + } + + if (space_where == AddSpace::Before) { + out_ << ' '; + } + out_ << '['; + if (pending_constant_value_.is_valid()) { + out_ << (pending_constant_value_.is_symbolic() ? "symbolic" : "template"); + if (!pending_constant_value_is_self_) { + out_ << " = "; + FormatInstName(pending_constant_value_.inst_id()); + } + } else { + out_ << pending_constant_value_; + } + out_ << ']'; + if (space_where == AddSpace::After) { + out_ << ' '; + } + pending_constant_value_ = ConstantId::NotConstant; + } + auto FormatInstructionLHS(InstId inst_id, Inst inst) -> void { switch (inst.kind().value_kind()) { case InstValueKind::Typed: @@ -1258,10 +1283,32 @@ class Formatter { const File& sem_ir_; llvm::raw_ostream& out_; InstNamer inst_namer_; + + // The current scope that we are formatting within. References to names in + // this scope will not have a `@scope.` prefix added. InstNamer::ScopeId scope_ = InstNamer::ScopeId::None; + + // Whether we are formatting in a terminator sequence, that is, a sequence of + // branches at the end of a block. The entirety of a terminator sequence is + // formatted on a single line, despite being multiple instructions. bool in_terminator_sequence_ = false; + + // The indent depth to use for new instructions. int indent_ = 0; + + // Whether we are currently formatting immediately after an open brace. If so, + // a newline will be inserted before the next line indent. bool after_open_brace_ = false; + + // The constant value of the current instruction, if it has one that has not + // yet been printed. The value `NotConstant` is used as a sentinel to indicate + // there is nothing to print. + ConstantId pending_constant_value_ = ConstantId::NotConstant; + + // Whether `pending_constant_value_`'s instruction is the same as the + // instruction currently being printed. If true, only the phase of the + // constant is printed, and the value is omitted. + bool pending_constant_value_is_self_ = false; }; auto FormatFile(const Lex::TokenizedBuffer& tokenized_buffer,