diff --git a/toolchain/check/testdata/alias/alias_of_alias.carbon b/toolchain/check/testdata/alias/alias_of_alias.carbon index a0ff1bdd2412..caf41960d298 100644 --- a/toolchain/check/testdata/alias/alias_of_alias.carbon +++ b/toolchain/check/testdata/alias/alias_of_alias.carbon @@ -16,7 +16,11 @@ let d: c = false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 4221c3ecf1da..dd86f1890160 100644 --- a/toolchain/check/testdata/alias/builtins.carbon +++ b/toolchain/check/testdata/alias/builtins.carbon @@ -18,7 +18,10 @@ let b_test: b = false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 a24e315660ab..b21499d254cf 100644 --- a/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon +++ b/toolchain/check/testdata/alias/fail_aliased_name_in_diag.carbon @@ -17,7 +17,9 @@ let c: b = 2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 203f9da1fa4a..0f0fd96ff4ea 100644 --- a/toolchain/check/testdata/alias/fail_bool_value.carbon +++ b/toolchain/check/testdata/alias/fail_bool_value.carbon @@ -17,7 +17,9 @@ let a_test: bool = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 de6ad969775a..7ffb19c7c695 100644 --- a/toolchain/check/testdata/alias/fail_local_in_namespace.carbon +++ b/toolchain/check/testdata/alias/fail_local_in_namespace.carbon @@ -27,8 +27,12 @@ fn F() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7, .F = %F} [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc7 +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/alias/fail_modifiers.carbon b/toolchain/check/testdata/alias/fail_modifiers.carbon index 945bd06fda70..8ab287c08ba7 100644 --- a/toolchain/check/testdata/alias/fail_modifiers.carbon +++ b/toolchain/check/testdata/alias/fail_modifiers.carbon @@ -35,7 +35,10 @@ impl alias B = i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // 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 dfd1fa9e1eda..0d79aa13c369 100644 --- a/toolchain/check/testdata/alias/fail_name_conflict.carbon +++ b/toolchain/check/testdata/alias/fail_name_conflict.carbon @@ -30,7 +30,10 @@ alias b = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a.loc7, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a.loc7 +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 7bd83700ff2d..c31d7ab9a070 100644 --- a/toolchain/check/testdata/alias/fail_not_constant.carbon +++ b/toolchain/check/testdata/alias/fail_not_constant.carbon @@ -21,7 +21,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/alias/fail_todo_private.carbon b/toolchain/check/testdata/alias/fail_todo_private.carbon index 635e9d197cd4..5e9060d36bdc 100644 --- a/toolchain/check/testdata/alias/fail_todo_private.carbon +++ b/toolchain/check/testdata/alias/fail_todo_private.carbon @@ -12,7 +12,9 @@ private alias A = i32; // CHECK:STDOUT: --- fail_todo_private.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // 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 88d9dc29ef82..2ff87e7fa8fe 100644 --- a/toolchain/check/testdata/alias/import.carbon +++ b/toolchain/check/testdata/alias/import.carbon @@ -27,7 +27,10 @@ var c: i32 = b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 @@ -44,7 +47,11 @@ var c: i32 = b; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %import_ref.1, .b = %import_ref.2, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %import_ref.1 +// CHECK:STDOUT: .b = %import_ref.2 +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 590a7a20c53d..0f82ea7a6ab8 100644 --- a/toolchain/check/testdata/alias/import_order.carbon +++ b/toolchain/check/testdata/alias/import_order.carbon @@ -29,7 +29,12 @@ var i32_val: i32 = a_val; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c, .d = %d} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: .d = %d +// CHECK:STDOUT: } [template] // 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] @@ -46,7 +51,17 @@ var i32_val: i32 = a_val; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %import_ref.1, .b = %import_ref.2, .c = %import_ref.3, .d = %import_ref.4, .d_val = %d_val, .c_val = %c_val, .b_val = %b_val, .a_val = %a_val, .i32_val = %i32_val} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %import_ref.1 +// CHECK:STDOUT: .b = %import_ref.2 +// CHECK:STDOUT: .c = %import_ref.3 +// CHECK:STDOUT: .d = %import_ref.4 +// CHECK:STDOUT: .d_val = %d_val +// CHECK:STDOUT: .c_val = %c_val +// CHECK:STDOUT: .b_val = %b_val +// CHECK:STDOUT: .a_val = %a_val +// CHECK:STDOUT: .i32_val = %i32_val +// CHECK:STDOUT: } [template] // 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 e215f99c25cc..59151a810029 100644 --- a/toolchain/check/testdata/alias/in_namespace.carbon +++ b/toolchain/check/testdata/alias/in_namespace.carbon @@ -20,8 +20,13 @@ fn F() -> NS.a { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7, .F = %F} [template] -// CHECK:STDOUT: %.loc7: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc7 +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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] diff --git a/toolchain/check/testdata/alias/local.carbon b/toolchain/check/testdata/alias/local.carbon index 76acf233dca5..dc3b089be9b4 100644 --- a/toolchain/check/testdata/alias/local.carbon +++ b/toolchain/check/testdata/alias/local.carbon @@ -17,7 +17,9 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index cd3ecf6c71c8..e5bdf227e3a0 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -25,7 +25,10 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // 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] diff --git a/toolchain/check/testdata/array/array_vs_tuple.carbon b/toolchain/check/testdata/array/array_vs_tuple.carbon index b8d7301bc5b0..1d5948b15aa3 100644 --- a/toolchain/check/testdata/array/array_vs_tuple.carbon +++ b/toolchain/check/testdata/array/array_vs_tuple.carbon @@ -29,7 +29,9 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index ed8136237bc7..c4e2e8060fb7 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -24,7 +24,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_16.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_16.2: type = converted %.loc7_16.1, constants.%.2 [template = constants.%.2] diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index a0fdd5e4b00c..a95d9612aca9 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -25,7 +25,10 @@ var b: [i32; 3] = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 eea326f267a3..5a3527ff7e6d 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -38,7 +38,11 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 3ac6e650c9f3..5af8cbd4eb9b 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -25,7 +25,10 @@ var b: [1; 39999999999999999993]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 c509f4d5d86a..09a90602602e 100644 --- a/toolchain/check/testdata/array/fail_incomplete_element.carbon +++ b/toolchain/check/testdata/array/fail_incomplete_element.carbon @@ -27,7 +27,11 @@ var p: Incomplete* = &a[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .a = %a, .p = %p} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15_21: i32 = int_literal 1 [template = constants.%.1] diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index 0451ab00170c..8714fa6a767a 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -16,7 +16,9 @@ var a: [1; 1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 f299a7f52034..4c8bdaaa47cb 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -21,7 +21,9 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 fe1ba0f1c892..d2c43d4205b0 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,7 +28,10 @@ var b: i32 = a[{.index = 3}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 436f166b703e..e2e6c90bd6c5 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -49,7 +49,14 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %.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 531ae493cc2a..4b34469b399c 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -28,7 +28,10 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/array/index_not_literal.carbon b/toolchain/check/testdata/array/index_not_literal.carbon index 61754ad32909..a0e5b79ec11f 100644 --- a/toolchain/check/testdata/array/index_not_literal.carbon +++ b/toolchain/check/testdata/array/index_not_literal.carbon @@ -25,7 +25,10 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 98f038b86923..ff1a31717e06 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -34,7 +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 {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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..a92b5398f2d0 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -14,7 +14,8 @@ let t: type = (i32, i32) as type; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 b2fef450d3ab..de44756f599a 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -15,7 +15,9 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index f44be549ca81..a75b23c0d5f0 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -19,7 +19,8 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..d291c798138c 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -17,7 +17,8 @@ let n: i32 = 1 as 2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 364fa8f66f92..5781730c7a44 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -35,7 +35,13 @@ fn Initializing() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Value = %Value, .Reference = %Reference, .Make = %Make, .Initializing = %Initializing} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %X.ref.loc13: type = name_ref X, %X.decl [template = constants.%X] diff --git a/toolchain/check/testdata/as/tuple.carbon b/toolchain/check/testdata/as/tuple.carbon index bd52a682a640..c39bf336211a 100644 --- a/toolchain/check/testdata/as/tuple.carbon +++ b/toolchain/check/testdata/as/tuple.carbon @@ -34,7 +34,12 @@ fn Var() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Make = %Make, .Let = %Let, .Var = %Var} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %X.ref: type = name_ref X, %X.decl [template = constants.%X] diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index aba709437390..df66dcbe5701 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -19,7 +19,11 @@ var test_type: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.test_i32 = %test_i32, .test_f64 = %test_f64, .test_type = %test_type} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .test_i32 = %test_i32 +// CHECK:STDOUT: .test_f64 = %test_f64 +// CHECK:STDOUT: .test_type = %test_type +// CHECK:STDOUT: } [template] // 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..84e014846947 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -7,6 +7,7 @@ // CHECK:STDOUT: --- empty.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..0eee19fc5e6c 100644 --- a/toolchain/check/testdata/basics/empty_decl.carbon +++ b/toolchain/check/testdata/basics/empty_decl.carbon @@ -9,6 +9,7 @@ // CHECK:STDOUT: --- empty_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 ff1dad2825ec..0237bb7e254a 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -20,7 +20,9 @@ fn Run() -> String {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Run: = fn_decl @Run { // CHECK:STDOUT: @Run.%return: ref String = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index 6ad3e93268f2..93fa6336c4ee 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -12,7 +12,9 @@ fn Run(n: i32) {} // CHECK:STDOUT: --- fail_bad_run_2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Run: = fn_decl @Run { // CHECK:STDOUT: %n.loc10_8.1: i32 = param n // CHECK:STDOUT: @Run.%n: i32 = bind_name n, %n.loc10_8.1 diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index 18473fb478d6..9933471cf422 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -14,7 +14,9 @@ fn Main() { // CHECK:STDOUT: --- fail_name_lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon index 1699a58f26ca..212513157fc1 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -16,7 +16,9 @@ var x: type = 42; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 bedc2782ee9d..edb2010530e8 100644 --- a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon @@ -13,7 +13,10 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_qualifier_unsupported.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 d7fbc4420328..75c8f879930f 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -17,7 +17,9 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -29,7 +31,9 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %B: = fn_decl @B {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon index 53b89b994bc2..e747f1bd6bc7 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -54,7 +54,9 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -99,7 +101,9 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %B: = fn_decl @B {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 707172ec1e17..3f49290ee908 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -58,7 +58,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 6a5bb5ea2e3b..28b30dd1ad39 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -15,7 +15,10 @@ var b: i32 = ((2)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 bea48514e68e..1daa73df241b 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -138,7 +138,9 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %n.loc11_8.1: i32 = param n // CHECK:STDOUT: @Foo.%n: i32 = bind_name n, %n.loc11_8.1 diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index d13e34e6d7ce..01d2604643ac 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -23,7 +23,11 @@ fn C(r#if: i32) -> i32 { // CHECK:STDOUT: --- raw_identifier.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: .C = %C +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %n.loc11_6.1: i32 = param n // CHECK:STDOUT: @A.%n: i32 = bind_name n, %n.loc11_6.1 diff --git a/toolchain/check/testdata/basics/run.carbon b/toolchain/check/testdata/basics/run.carbon index 37e054280fd5..a5afb61f8ad1 100644 --- a/toolchain/check/testdata/basics/run.carbon +++ b/toolchain/check/testdata/basics/run.carbon @@ -9,7 +9,9 @@ fn Run() {} // CHECK:STDOUT: --- run.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Run: = fn_decl @Run {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index 6a2061b638a4..223fd5123b3f 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -13,7 +13,9 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Run: = fn_decl @Run { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index ab64ec8bd1d8..72641f111fef 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -23,7 +23,9 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %n.loc11_8.1: i32 = param n // CHECK:STDOUT: @Foo.%n: i32 = bind_name n, %n.loc11_8.1 diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index c1e2fb2974d0..47130d8d6ee5 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -47,7 +47,12 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 3afd6fba3b8a..cffddb747604 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -40,7 +40,11 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/class/base_function_unqualified.carbon b/toolchain/check/testdata/class/base_function_unqualified.carbon index 4472d2d5ad8d..f6676dd61640 100644 --- a/toolchain/check/testdata/class/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/base_function_unqualified.carbon @@ -32,7 +32,10 @@ fn Derived.H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index 14c2e5029c51..18cf48176bfb 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -41,7 +41,11 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Base.ref: type = name_ref Base, %Base.decl [template = constants.%Base] diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index e1769787fd53..085476fd8cb4 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -55,7 +55,13 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .D = %D.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index 02b3b2914b04..7c1788a21a40 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -32,7 +32,10 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %n.loc17_12.1: i32 = param n diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index 2b03a922588f..c6267c6548e9 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -69,7 +69,17 @@ fn ConvertInit() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .ConvertCToB = %ConvertCToB, .ConvertBToA = %ConvertBToA, .ConvertCToA = %ConvertCToA, .ConvertValue = %ConvertValue, .ConvertRef = %ConvertRef, .ConvertInit = %ConvertInit} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A.decl +// CHECK:STDOUT: .B = %B.decl +// CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: .ConvertCToB = %ConvertCToB +// CHECK:STDOUT: .ConvertBToA = %ConvertBToA +// CHECK:STDOUT: .ConvertCToA = %ConvertCToA +// 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] diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index 922ceb38fda5..e2c8ee95d8e7 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -49,7 +49,12 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index 22298f2000e7..638902ab4909 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -25,7 +25,9 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index 53acda4b0d37..ec1fe3e73a34 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -49,7 +49,10 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc12_9: type = name_ref Class, %Class.decl [template = 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 34967aa0aee8..31edaee99079 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -160,7 +160,31 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Final = %Final.decl, .DeriveFromError = %DeriveFromError.decl, .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError, .DeriveFromNonType = %DeriveFromNonType.decl, .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType, .DeriveFromi32 = %DeriveFromi32.decl, .ConvertToBadBasei32 = %ConvertToBadBasei32, .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32, .DeriveFromTuple = %DeriveFromTuple.decl, .ConvertToBadBaseTuple = %ConvertToBadBaseTuple, .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple, .DeriveFromStruct = %DeriveFromStruct.decl, .ConvertToBadBaseStruct = %ConvertToBadBaseStruct, .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct, .Incomplete = %Incomplete.decl, .DeriveFromIncomplete = %DeriveFromIncomplete.decl, .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete, .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete, .DeriveFromFinal = %DeriveFromFinal.decl, .ConvertToBadBaseFinal = %ConvertToBadBaseFinal, .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember, .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Base = %Base.decl +// CHECK:STDOUT: .Final = %Final.decl +// CHECK:STDOUT: .DeriveFromError = %DeriveFromError.decl +// CHECK:STDOUT: .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError +// CHECK:STDOUT: .DeriveFromNonType = %DeriveFromNonType.decl +// CHECK:STDOUT: .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType +// CHECK:STDOUT: .DeriveFromi32 = %DeriveFromi32.decl +// CHECK:STDOUT: .ConvertToBadBasei32 = %ConvertToBadBasei32 +// CHECK:STDOUT: .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32 +// CHECK:STDOUT: .DeriveFromTuple = %DeriveFromTuple.decl +// CHECK:STDOUT: .ConvertToBadBaseTuple = %ConvertToBadBaseTuple +// CHECK:STDOUT: .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple +// CHECK:STDOUT: .DeriveFromStruct = %DeriveFromStruct.decl +// CHECK:STDOUT: .ConvertToBadBaseStruct = %ConvertToBadBaseStruct +// CHECK:STDOUT: .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct +// CHECK:STDOUT: .Incomplete = %Incomplete.decl +// CHECK:STDOUT: .DeriveFromIncomplete = %DeriveFromIncomplete.decl +// CHECK:STDOUT: .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete +// CHECK:STDOUT: .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete +// CHECK:STDOUT: .DeriveFromFinal = %DeriveFromFinal.decl +// 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] diff --git a/toolchain/check/testdata/class/fail_base_method_define.carbon b/toolchain/check/testdata/class/fail_base_method_define.carbon index a83351c84c3d..7e4cea051e30 100644 --- a/toolchain/check/testdata/class/fail_base_method_define.carbon +++ b/toolchain/check/testdata/class/fail_base_method_define.carbon @@ -40,7 +40,10 @@ fn D.C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .D = %D.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_base_modifiers.carbon b/toolchain/check/testdata/class/fail_base_modifiers.carbon index 2ca5f4c7a148..e6200fb8f506 100644 --- a/toolchain/check/testdata/class/fail_base_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_base_modifiers.carbon @@ -62,7 +62,13 @@ class C4 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C1 = %C1.decl, .C2 = %C2.decl, .C3 = %C3.decl, .C4 = %C4.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_base_no_extend.carbon b/toolchain/check/testdata/class/fail_base_no_extend.carbon index c76bc7d7446e..34e32e9dc313 100644 --- a/toolchain/check/testdata/class/fail_base_no_extend.carbon +++ b/toolchain/check/testdata/class/fail_base_no_extend.carbon @@ -26,7 +26,10 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index e25f8d7d3d2e..a0306c125187 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -46,7 +46,12 @@ class D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B1 = %B1.decl, .B2 = %B2.decl, .C = %C.decl, .D = %D.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index 8cc113c1b1b8..8950e3b5fd19 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -28,7 +28,10 @@ let b: B = C.base; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %B.ref: type = name_ref B, %B.decl [template = constants.%B] diff --git a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon index e3d7b08816bf..69a0142cde97 100644 --- a/toolchain/check/testdata/class/fail_convert_to_invalid.carbon +++ b/toolchain/check/testdata/class/fail_convert_to_invalid.carbon @@ -24,7 +24,10 @@ fn Make() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl, .Make = %Make} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %C.ref: type = name_ref C, %C.decl [template = constants.%C] diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 49b2ebb2ff72..dfc2fd361b07 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -53,7 +53,14 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A1 = %A1.decl, .A2 = %A2.decl, .B2 = %B2.decl, .ConvertUnrelated = %ConvertUnrelated, .Incomplete = %Incomplete.decl, .ConvertIncomplete = %ConvertIncomplete} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_field_modifiers.carbon b/toolchain/check/testdata/class/fail_field_modifiers.carbon index 8e7969db7b68..63b893b0cd9d 100644 --- a/toolchain/check/testdata/class/fail_field_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_field_modifiers.carbon @@ -38,7 +38,9 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_import_misuses.carbon b/toolchain/check/testdata/class/fail_import_misuses.carbon index c659bec1b73f..e4f9c09d0302 100644 --- a/toolchain/check/testdata/class/fail_import_misuses.carbon +++ b/toolchain/check/testdata/class/fail_import_misuses.carbon @@ -43,7 +43,10 @@ var a: Incomplete; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .Incomplete = %Incomplete.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -65,7 +68,11 @@ var a: Incomplete; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %import_ref.1, .Incomplete = %import_ref.2, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Empty = %import_ref.1 +// CHECK:STDOUT: .Incomplete = %import_ref.2 +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 { diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index c4e481d8f033..ea3c6d614433 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -125,7 +125,19 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .CallClassFunction = %CallClassFunction, .global_var = %global_var, .ConvertFromStruct = %ConvertFromStruct, .MemberAccess = %MemberAccess, .Copy = %Copy, .Let = %Let, .TakeIncomplete = %TakeIncomplete, .ReturnIncomplete = %ReturnIncomplete, .CallTakeIncomplete = %CallTakeIncomplete, .CallReturnIncomplete = %CallReturnIncomplete} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: .CallClassFunction = %CallClassFunction +// CHECK:STDOUT: .global_var = %global_var +// CHECK:STDOUT: .ConvertFromStruct = %ConvertFromStruct +// CHECK:STDOUT: .MemberAccess = %MemberAccess +// CHECK:STDOUT: .Copy = %Copy +// CHECK:STDOUT: .Let = %Let +// CHECK:STDOUT: .TakeIncomplete = %TakeIncomplete +// 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] diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index 2a7167d5debb..6cf5619986da 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -40,7 +40,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 7509408d9e87..c59a8089cf0e 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -37,7 +37,11 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index 94c19c4ebe1e..2a4329361d90 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -49,7 +49,11 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index e9b55baa16fb..dff9f2dc815f 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -26,7 +26,9 @@ fn T.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // 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 diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 1f69d396f5ae..2e506db01fb1 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -50,7 +50,11 @@ fn F(c: Class) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .A = %A, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc12: type = name_ref Class, %Class.decl [template = constants.%Class] // CHECK:STDOUT: %WithSelf.ref: = name_ref WithSelf, @Class.%WithSelf [template = @Class.%WithSelf] diff --git a/toolchain/check/testdata/class/fail_method_modifiers.carbon b/toolchain/check/testdata/class/fail_method_modifiers.carbon index 2adec95f0dd3..abfec85da9a5 100644 --- a/toolchain/check/testdata/class/fail_method_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_method_modifiers.carbon @@ -57,7 +57,11 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_modifiers.carbon b/toolchain/check/testdata/class/fail_modifiers.carbon index 5d1e5f5031f7..57ec4b03fbca 100644 --- a/toolchain/check/testdata/class/fail_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_modifiers.carbon @@ -77,7 +77,14 @@ abstract base class AbstractAndBase {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.DuplicatePrivate = %DuplicatePrivate.decl, .TwoAccess = %TwoAccess.decl, .TwoAbstract = %TwoAbstract.decl, .Virtual = %Virtual.decl, .WrongOrder = %WrongOrder.decl, .AbstractAndBase = %AbstractAndBase.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] 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 3b3557ef115a..1507c0701c51 100644 --- a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon +++ b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon @@ -19,7 +19,9 @@ fn C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon index 0b2f97cb9f80..2ee5020fbb28 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon @@ -88,7 +88,15 @@ base class G; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc16, .C = %C.decl.loc25, .D = %D.decl.loc34, .E = %E.decl.loc43, .F = %F.decl.loc52, .G = %G.decl.loc61} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A.decl.loc7 +// CHECK:STDOUT: .B = %B.decl.loc16 +// CHECK:STDOUT: .C = %C.decl.loc25 +// CHECK:STDOUT: .D = %D.decl.loc34 +// 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] diff --git a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon index 16203e3a6d99..13f5cbb71f00 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon @@ -35,7 +35,11 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .X = %X.decl, .Y = %Y.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_redefinition.carbon b/toolchain/check/testdata/class/fail_redefinition.carbon index 5dd4c8215f20..ebe6670d99c2 100644 --- a/toolchain/check/testdata/class/fail_redefinition.carbon +++ b/toolchain/check/testdata/class/fail_redefinition.carbon @@ -32,7 +32,9 @@ fn Class.H() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_reorder.carbon b/toolchain/check/testdata/class/fail_reorder.carbon index 2b603ed3eb74..e92e588ae057 100644 --- a/toolchain/check/testdata/class/fail_reorder.carbon +++ b/toolchain/check/testdata/class/fail_reorder.carbon @@ -34,7 +34,9 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index 97882299651c..e54b491eb848 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -26,7 +26,10 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index 91e485df2e40..d7fc2f8a9b3f 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -61,7 +61,11 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc25: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/fail_todo_generic.carbon b/toolchain/check/testdata/class/fail_todo_generic.carbon index 7352c08c2c8e..ec157049a17c 100644 --- a/toolchain/check/testdata/class/fail_todo_generic.carbon +++ b/toolchain/check/testdata/class/fail_todo_generic.carbon @@ -19,7 +19,9 @@ class C[](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_todo_generic_method.carbon b/toolchain/check/testdata/class/fail_todo_generic_method.carbon index a86bbc9e803d..3c6fe1530e92 100644 --- a/toolchain/check/testdata/class/fail_todo_generic_method.carbon +++ b/toolchain/check/testdata/class/fail_todo_generic_method.carbon @@ -32,7 +32,9 @@ fn Class(T:! type).F[self: Self](n: T) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Class.decl = class_decl @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] 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 e4e2ebe9a560..b9ba1e867aa7 100644 --- a/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon +++ b/toolchain/check/testdata/class/fail_todo_import_forward_decl.carbon @@ -33,7 +33,9 @@ class ForwardDecl { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ForwardDecl = %ForwardDecl.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .ForwardDecl = %ForwardDecl.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %ForwardDecl.decl = class_decl @ForwardDecl {} [template = constants.%ForwardDecl] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -48,7 +50,9 @@ class ForwardDecl { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ForwardDecl = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .ForwardDecl = %import_ref +// CHECK:STDOUT: } [template] // 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] diff --git a/toolchain/check/testdata/class/fail_todo_modifiers.carbon b/toolchain/check/testdata/class/fail_todo_modifiers.carbon index a4593e7dc66b..7ab96d00bb4b 100644 --- a/toolchain/check/testdata/class/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_todo_modifiers.carbon @@ -70,7 +70,11 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index af9a1da897b8..376761220bf9 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -30,7 +30,10 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index fe13ff349b25..3e6e07af7798 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -26,7 +26,10 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index 0ab6658fdcdc..354942705148 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -29,7 +29,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index db7928b40b15..a3824dad0dd4 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -30,7 +30,10 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Test = %Test} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 5327604a5f2e..2bf3f4bc55ec 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -16,7 +16,10 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc9_9: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/import.carbon b/toolchain/check/testdata/class/import.carbon index 57d23d81ef0e..2a2ca237f9a1 100644 --- a/toolchain/check/testdata/class/import.carbon +++ b/toolchain/check/testdata/class/import.carbon @@ -59,7 +59,12 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .Field = %Field.decl, .ForwardDeclared = %ForwardDeclared.decl.loc11, .Incomplete = %Incomplete.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -127,7 +132,13 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %import_ref.1, .Field = %import_ref.2, .ForwardDeclared = %import_ref.3, .Incomplete = %import_ref.4, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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] diff --git a/toolchain/check/testdata/class/import_base.carbon b/toolchain/check/testdata/class/import_base.carbon index 65f8387afd3c..ed00952efcbd 100644 --- a/toolchain/check/testdata/class/import_base.carbon +++ b/toolchain/check/testdata/class/import_base.carbon @@ -45,7 +45,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Child = %Child.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -106,7 +109,11 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %import_ref.1, .Child = %import_ref.2, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Base = %import_ref.1 +// CHECK:STDOUT: .Child = %import_ref.2 +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // 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] diff --git a/toolchain/check/testdata/class/import_member_cycle.carbon b/toolchain/check/testdata/class/import_member_cycle.carbon index adac1676c429..4ee2c0696778 100644 --- a/toolchain/check/testdata/class/import_member_cycle.carbon +++ b/toolchain/check/testdata/class/import_member_cycle.carbon @@ -32,7 +32,9 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cycle = %Cycle.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Cycle = %Cycle.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Cycle.decl = class_decl @Cycle {} [template = constants.%Cycle] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -54,7 +56,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cycle = %import_ref, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Cycle = %import_ref +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: type = import_ref ir1, inst+1, used [template = constants.%Cycle] // CHECK:STDOUT: %Run: = fn_decl @Run {} [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/import_struct_cyle.carbon b/toolchain/check/testdata/class/import_struct_cyle.carbon index 052b05ab010a..b19ccfc1873f 100644 --- a/toolchain/check/testdata/class/import_struct_cyle.carbon +++ b/toolchain/check/testdata/class/import_struct_cyle.carbon @@ -38,7 +38,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cycle = %Cycle.decl.loc4, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Cycle.ref: type = name_ref Cycle, %Cycle.decl.loc4 [template = constants.%Cycle] // CHECK:STDOUT: %.loc6_18: type = ptr_type Cycle [template = constants.%.1] @@ -70,7 +73,11 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cycle = %import_ref.1, .a = %import_ref.2, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Cycle = %import_ref.1 +// CHECK:STDOUT: .a = %import_ref.2 +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // 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] diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 640a91f2a446..ee8c2b39a5ad 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -30,7 +30,11 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %n.loc12_9.1: i32 = param n diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index f8bfe677797f..60fe865dc520 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -26,7 +26,10 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index c1fe732374c9..709af84ef78d 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -36,7 +36,12 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Inner = %Inner.decl, .MakeInner = %MakeInner, .Outer = %Outer.decl, .MakeOuter = %MakeOuter} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Inner.ref: type = name_ref Inner, %Inner.decl [template = constants.%Inner] diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index b3195a6ced7a..8c15d999d5b7 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -67,7 +67,18 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Call = %Call, .CallAlias = %CallAlias, .CallOnConstBoundMethod = %CallOnConstBoundMethod, .CallWithAddr = %CallWithAddr, .CallFThroughPointer = %CallFThroughPointer, .CallGThroughPointer = %CallGThroughPointer, .Make = %Make, .CallFOnInitializingExpr = %CallFOnInitializingExpr, .CallGOnInitializingExpr = %CallGOnInitializingExpr} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: .Call = %Call +// CHECK:STDOUT: .CallAlias = %CallAlias +// CHECK:STDOUT: .CallOnConstBoundMethod = %CallOnConstBoundMethod +// CHECK:STDOUT: .CallWithAddr = %CallWithAddr +// CHECK:STDOUT: .CallFThroughPointer = %CallFThroughPointer +// CHECK:STDOUT: .CallGThroughPointer = %CallGThroughPointer +// 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: %Class.ref.loc16: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index 57d049198d8c..cebe0e3947ac 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -46,7 +46,10 @@ fn F(a: Outer*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Outer.ref: type = name_ref Outer, %Outer.decl [template = constants.%Outer] diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 0eb428d1e24e..b0cba1494523 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -32,7 +32,11 @@ fn G(o: Outer) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Outer.ref.loc13: type = name_ref Outer, %Outer.decl [template = constants.%Outer] diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index 0b2569752848..c481631909c6 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -32,7 +32,9 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc13: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index e13c14930487..e68c71f6603b 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -20,7 +20,9 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Class = %Class.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Class.decl = class_decl @Class {} [template = constants.%Class] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index f8bb7700b29f..3c0ab05fa351 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -20,7 +20,9 @@ fn Class.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} [template] +// CHECK:STDOUT: package: = namespace { +// 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 {} [template] diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index 20d245e8019f..7a29c252283e 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -22,7 +22,11 @@ abstract class C {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc8, .C = %C.decl.loc9} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index 3b5d5d33f866..4d03be180d0e 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -21,7 +21,9 @@ fn Class.F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index d27425fa38b1..6172c5a70895 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -33,7 +33,11 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index f7b33b4dddd9..fd6b133b3313 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -30,7 +30,9 @@ fn Class.G[addr self: Class*]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref.loc14: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index 5e69c2c7200c..b268f59e3a8b 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -47,7 +47,11 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index c4222d2cf3e0..592f9d4e9052 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -27,7 +27,9 @@ fn Class.F[self: Class]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Class.ref: type = name_ref Class, %Class.decl [template = constants.%Class] diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 1a7296e40c8c..91cd8b0de144 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -23,7 +23,10 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref i32 = var diff --git a/toolchain/check/testdata/const/basic.carbon b/toolchain/check/testdata/const/basic.carbon index 2bffc4e8f273..2151341a9b4d 100644 --- a/toolchain/check/testdata/const/basic.carbon +++ b/toolchain/check/testdata/const/basic.carbon @@ -23,7 +23,10 @@ fn B(p: const (i32*)) -> const (i32*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %.loc7_9: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = ptr_type const i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 27362e4d237c..1dad4d2c17cc 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -21,7 +21,9 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc11_9: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc11_18: type = ptr_type const i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index ce4db2237d78..3bc92083f339 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -25,7 +25,9 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // CHECK:STDOUT: %.loc10_16: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc10_9: type = const_type const i32 [template = constants.%.1] diff --git a/toolchain/check/testdata/const/import.carbon b/toolchain/check/testdata/const/import.carbon index 72bfc0bae087..83db0b54fe46 100644 --- a/toolchain/check/testdata/const/import.carbon +++ b/toolchain/check/testdata/const/import.carbon @@ -30,7 +30,11 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .a_ref = %a_ref, .a_ptr_ref = %a_ptr_ref} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %.loc4: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %return.var: ref const i32 = var @@ -65,7 +69,13 @@ var a_ptr: const i32* = a_ptr_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %import_ref.1, .a_ref = %import_ref.2, .a_ptr_ref = %import_ref.3, .a = %a, .a_ptr = %a_ptr} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 80875d528ba3..92fc3f732806 100644 --- a/toolchain/check/testdata/eval/aggregate.carbon +++ b/toolchain/check/testdata/eval/aggregate.carbon @@ -47,7 +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 {.tuple_copy = %tuple_copy, .struct_copy = %struct_copy, .tuple_index = %tuple_index, .struct_access = %struct_access} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %.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 8991f4a9e0cf..094e379c059a 100644 --- a/toolchain/check/testdata/eval/fail_aggregate.carbon +++ b/toolchain/check/testdata/eval/fail_aggregate.carbon @@ -35,7 +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 {.array_index = %array_index} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .array_index = %array_index +// CHECK:STDOUT: } [template] // 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 3c726ec8d99f..371f5de88fa1 100644 --- a/toolchain/check/testdata/eval/fail_symbolic.carbon +++ b/toolchain/check/testdata/eval/fail_symbolic.carbon @@ -15,7 +15,9 @@ fn G(N:! i32) { // CHECK:STDOUT: --- fail_symbolic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // CHECK:STDOUT: %N.loc8_6.1: i32 = param N // CHECK:STDOUT: @G.%N: i32 = bind_symbolic_name N, %N.loc8_6.1 [symbolic] diff --git a/toolchain/check/testdata/eval/symbolic.carbon b/toolchain/check/testdata/eval/symbolic.carbon index 4164bbe8e9f7..a09a461bf78c 100644 --- a/toolchain/check/testdata/eval/symbolic.carbon +++ b/toolchain/check/testdata/eval/symbolic.carbon @@ -27,7 +27,9 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %T.loc8_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc8_6.1 [symbolic] 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 42eee30691d1..da5d87698bc3 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -26,7 +26,11 @@ fn H() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .H = %H +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // 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] diff --git a/toolchain/check/testdata/function/call/alias.carbon b/toolchain/check/testdata/function/call/alias.carbon index 8647c5282274..2a82969a91d9 100644 --- a/toolchain/check/testdata/function/call/alias.carbon +++ b/toolchain/check/testdata/function/call/alias.carbon @@ -19,7 +19,11 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index 8f9877b89fc3..5069afdbe4f4 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -21,7 +21,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Echo = %Echo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo { // CHECK:STDOUT: %.loc7_13.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index ce9859b72312..3ff4fabcc43b 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -20,7 +20,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Echo = %Echo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo { // CHECK:STDOUT: %.loc7_13.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index be031e0d09d4..c03e1002c232 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -19,7 +19,9 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Run: = fn_decl @Run {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index 88a05d521f5a..df5e58e964a0 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -64,7 +64,12 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Run0 = %Run0, .Run1 = %Run1, .Run2 = %Run2, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %a.loc8_9.1: i32 = param a diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index 479d3e221116..baad9eb61057 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -24,7 +24,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @G.%a: i32 = bind_name a, %a.loc7_6.1 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 2a86763cd9a2..b79add06960d 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -20,7 +20,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %return.var: ref f64 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index fb1ac9bb416d..95b6c608eef3 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -19,7 +19,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Echo = %Echo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo { // CHECK:STDOUT: %a.loc7_9.1: i32 = param a // CHECK:STDOUT: @Echo.%a: i32 = bind_name a, %a.loc7_9.1 diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index a33d7b95931d..c2f420dd76ee 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -25,7 +25,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 2c51f30939fb..29c299c8e6ed 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -18,7 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index ff8e3f1dbc3a..a382ef1d958d 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -19,7 +19,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index 1e3d57c007aa..4fade68f1cd3 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -19,7 +19,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index d7df181c653f..cf8073de01d4 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -20,7 +20,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 8c77ea979dfe..2b980ac7238f 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -17,7 +17,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index a7ef9ac2eb77..1ac9d31f3f60 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -18,7 +18,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon index 5bafdecba52f..ea2a4a39ec20 100644 --- a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon @@ -73,7 +73,14 @@ default final virtual fn ModifiersConflict2() {} // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.WrongOrder = %WrongOrder, .DuplicateVirtual = %DuplicateVirtual, .TwoAccess = %TwoAccess, .ModifiersConflict = %ModifiersConflict, .InvalidModifier = %InvalidModifier, .ModifiersConflict2 = %ModifiersConflict2} [template] +// CHECK:STDOUT: package: = namespace { +// 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] 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 83cf07c96d09..1dd9809d5ce1 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_in_type.carbon @@ -12,7 +12,9 @@ fn F(n: i32, a: [i32; n]*); // CHECK:STDOUT: --- fail_param_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %n.loc10_6.1: i32 = param n // CHECK:STDOUT: @F.%n: i32 = bind_name n, %n.loc10_6.1 diff --git a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon index 843c6ed1db19..752c097dcbef 100644 --- a/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon +++ b/toolchain/check/testdata/function/declaration/fail_param_redecl.carbon @@ -15,7 +15,9 @@ fn F(n: i32, n: i32); // CHECK:STDOUT: --- fail_param_redecl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %n.loc13_6.1: i32 = param n // CHECK:STDOUT: @F.%n.loc13_6: i32 = bind_name n, %n.loc13_6.1 diff --git a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon index ba37aa01753e..39ea1cc96509 100644 --- a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon @@ -12,7 +12,9 @@ private fn F(); // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/import.carbon b/toolchain/check/testdata/function/declaration/import.carbon index 5ecf96858068..61447bafdd8a 100644 --- a/toolchain/check/testdata/function/declaration/import.carbon +++ b/toolchain/check/testdata/function/declaration/import.carbon @@ -31,7 +31,11 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %b.loc5_6.1: i32 = param b @@ -65,7 +69,14 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %import_ref.1, .B = %import_ref.2, .C = %import_ref.3, .a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 4d921113c362..e5f620b15242 100644 --- a/toolchain/check/testdata/function/declaration/param_same_name.carbon +++ b/toolchain/check/testdata/function/declaration/param_same_name.carbon @@ -11,7 +11,10 @@ fn G(a: i32); // CHECK:STDOUT: --- param_same_name.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc7_6.1 diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index 3e793654faea..d634610e0686 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -15,7 +15,10 @@ fn G() { F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } 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 f31b380a288d..a96c594780fa 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,7 +29,9 @@ fn Foo() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -38,7 +40,9 @@ fn Foo() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %import_ref +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%Foo] // CHECK:STDOUT: %.loc14: = fn_decl @.1 {} [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/forward_decl.carbon b/toolchain/check/testdata/function/definition/forward_decl.carbon index 0422d7e11740..17d6c9a8f037 100644 --- a/toolchain/check/testdata/function/definition/forward_decl.carbon +++ b/toolchain/check/testdata/function/definition/forward_decl.carbon @@ -11,7 +11,9 @@ fn Foo() {} // CHECK:STDOUT: --- forward_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo.loc7} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/function/definition/import.carbon b/toolchain/check/testdata/function/definition/import.carbon index b9acba1ba439..5b37d7bee0c0 100644 --- a/toolchain/check/testdata/function/definition/import.carbon +++ b/toolchain/check/testdata/function/definition/import.carbon @@ -32,7 +32,11 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %b.loc5_6.1: i32 = param b @@ -82,7 +86,14 @@ var c: {.c: i32} = C((1,)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %import_ref.1, .B = %import_ref.2, .C = %import_ref.3, .a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 2179ee6a1be0..2c3ad9eca66d 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -11,7 +11,11 @@ fn Baz() {} // CHECK:STDOUT: --- order.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Bar = %Bar, .Baz = %Baz} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index e8ff231aa98a..0e024a74735d 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -9,7 +9,9 @@ fn Foo(a: i32) {} // CHECK:STDOUT: --- params_one.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index d56e1d15a10c..a47077e8f4c7 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -9,7 +9,9 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: --- params_one_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index 3c7ee79506fe..ee4c629b9989 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -9,7 +9,9 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: --- params_two.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index ade4c4fa42dc..6e6920b765d6 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -9,7 +9,9 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: --- params_two_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo { // CHECK:STDOUT: %a.loc7_8.1: i32 = param a // CHECK:STDOUT: @Foo.%a: i32 = bind_name a, %a.loc7_8.1 diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index 66e0045d487b..8c89c8ddc1d6 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -9,7 +9,9 @@ fn Foo() {} // CHECK:STDOUT: --- params_zero.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: 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 1cc87d5b1805..856c3d1b4456 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,7 +12,9 @@ fn F(N:! i32, a: [i32; N]*); // CHECK:STDOUT: --- fail_todo_param_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %N.loc10_6.1: i32 = param N // CHECK:STDOUT: @F.%N: i32 = bind_symbolic_name N, %N.loc10_6.1 [symbolic] 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 7bec7771988b..846e24f6d9be 100644 --- a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon +++ b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon @@ -19,7 +19,9 @@ fn F(T:! type, U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index 9208c6a2d05c..68e0a6bc2ccc 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -16,7 +16,9 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] diff --git a/toolchain/check/testdata/function/generic/type_param_scope.carbon b/toolchain/check/testdata/function/generic/type_param_scope.carbon index f2ebae6559ae..2475c4f8359c 100644 --- a/toolchain/check/testdata/function/generic/type_param_scope.carbon +++ b/toolchain/check/testdata/function/generic/type_param_scope.carbon @@ -12,7 +12,9 @@ fn F(T:! type, n: T) -> T { // CHECK:STDOUT: --- type_param_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %T.loc7_6.1: type = param T // CHECK:STDOUT: @F.%T: type = bind_symbolic_name T, %T.loc7_6.1 [symbolic] diff --git a/toolchain/check/testdata/global/class_obj.carbon b/toolchain/check/testdata/global/class_obj.carbon index 2cfd180edd05..3b99730f67ce 100644 --- a/toolchain/check/testdata/global/class_obj.carbon +++ b/toolchain/check/testdata/global/class_obj.carbon @@ -18,7 +18,10 @@ var a: A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A.decl +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 diff --git a/toolchain/check/testdata/global/class_with_fun.carbon b/toolchain/check/testdata/global/class_with_fun.carbon index f007e20ee6b0..9dac19ee823d 100644 --- a/toolchain/check/testdata/global/class_with_fun.carbon +++ b/toolchain/check/testdata/global/class_with_fun.carbon @@ -22,7 +22,11 @@ var a: A = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.decl, .ret_a = %ret_a, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %A.ref.loc8: type = name_ref A, %A.decl [template = constants.%A] diff --git a/toolchain/check/testdata/global/decl.carbon b/toolchain/check/testdata/global/decl.carbon index 6a36825997ec..56d257b2c0d5 100644 --- a/toolchain/check/testdata/global/decl.carbon +++ b/toolchain/check/testdata/global/decl.carbon @@ -8,7 +8,9 @@ var a: i32; // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 2eeff69111f1..209d061e9a96 100644 --- a/toolchain/check/testdata/global/simple_init.carbon +++ b/toolchain/check/testdata/global/simple_init.carbon @@ -12,7 +12,9 @@ var a: i32 = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 f706b662ee71..d10c79329ada 100644 --- a/toolchain/check/testdata/global/simple_with_fun.carbon +++ b/toolchain/check/testdata/global/simple_with_fun.carbon @@ -17,7 +17,10 @@ var a: i32 = test_a(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.test_a = %test_a, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .test_a = %test_a +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %test_a: = fn_decl @test_a { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index 788776577c5e..5adcf57f22c6 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -24,7 +24,12 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H, .If = %If} [template] +// CHECK:STDOUT: package: = namespace { +// 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] diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index 44fc7772925d..b510c3148456 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -41,7 +41,11 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.If1 = %If1, .If2 = %If2, .If3 = %If3} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .If1 = %If1 +// CHECK:STDOUT: .If2 = %If2 +// CHECK:STDOUT: .If3 = %If3 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %If1: = fn_decl @If1 { // CHECK:STDOUT: %b.loc7_8.1: bool = param b // CHECK:STDOUT: @If1.%b: bool = bind_name b, %b.loc7_8.1 diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index aaec56f8449b..77d667b300c2 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -22,7 +22,9 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.VarScope = %VarScope} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .VarScope = %VarScope +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %VarScope: = fn_decl @VarScope { // CHECK:STDOUT: %b.loc7_13.1: bool = param b // CHECK:STDOUT: @VarScope.%b: bool = bind_name b, %b.loc7_13.1 diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 4a569da9e474..14dc4cb5e8a2 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -21,7 +21,11 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .If = %If} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index fcdcce7b5ace..7c32c5f78f5b 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -21,7 +21,9 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.If = %If} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .If = %If +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %If: = fn_decl @If { // CHECK:STDOUT: %b.loc7_7.1: bool = param b // CHECK:STDOUT: @If.%b: bool = bind_name b, %b.loc7_7.1 diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index add19bbf2f50..4b65c1e83fdb 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -22,7 +22,9 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %b.loc7_6.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc7_6.1 diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 819f3573b39c..3909fc463068 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -25,7 +25,12 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index 2bb1792c6f0a..48b3c0ee092c 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -19,7 +19,11 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index 7f297a64f362..1d45ac078c32 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -18,7 +18,9 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %a.loc7_6.1: bool = param a // CHECK:STDOUT: @F.%a: bool = bind_name a, %a.loc7_6.1 diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 76b42eb19d65..030383e9081a 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -23,7 +23,10 @@ fn F(cond: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // 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 diff --git a/toolchain/check/testdata/impl/basic.carbon b/toolchain/check/testdata/impl/basic.carbon index 7e20d0edad41..dff673dd17f3 100644 --- a/toolchain/check/testdata/impl/basic.carbon +++ b/toolchain/check/testdata/impl/basic.carbon @@ -21,7 +21,9 @@ impl i32 as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Simple = %Simple.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Simple = %Simple.decl +// CHECK:STDOUT: } [template] // 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] @@ -34,8 +36,8 @@ impl i32 as Simple { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as Simple { // CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] diff --git a/toolchain/check/testdata/impl/declaration.carbon b/toolchain/check/testdata/impl/declaration.carbon index b903efea4548..e63b417ecbbb 100644 --- a/toolchain/check/testdata/impl/declaration.carbon +++ b/toolchain/check/testdata/impl/declaration.carbon @@ -15,7 +15,9 @@ impl i32 as I; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // 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] @@ -25,8 +27,8 @@ impl i32 as I; // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as I; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/empty.carbon b/toolchain/check/testdata/impl/empty.carbon index 99151b9da754..26c54637d360 100644 --- a/toolchain/check/testdata/impl/empty.carbon +++ b/toolchain/check/testdata/impl/empty.carbon @@ -17,7 +17,9 @@ impl i32 as Empty { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Empty = %Empty.decl +// CHECK:STDOUT: } [template] // 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] @@ -27,8 +29,8 @@ impl i32 as Empty { // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as Empty { // 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 db9b791a3465..0ef067a64fd1 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_forall.carbon @@ -34,7 +34,10 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.GenericInterface = %GenericInterface.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .GenericInterface = %GenericInterface.decl +// CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %GenericInterface.decl = interface_decl @GenericInterface { // 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] @@ -52,8 +55,8 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc11 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as { // CHECK:STDOUT: %F: = fn_decl @F.2 { diff --git a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon index 1da8745b106e..ffd430f3d1f5 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_scope.carbon @@ -18,7 +18,9 @@ extend impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // 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] @@ -28,8 +30,8 @@ extend impl i32 as I {} // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as I { // 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 27bd775de760..da6cac5e3037 100644 --- a/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon +++ b/toolchain/check/testdata/impl/fail_extend_impl_type_as.carbon @@ -44,7 +44,12 @@ class E { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl, .C = %C.decl, .D = %D.decl, .E = %E.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -54,8 +59,8 @@ class E { // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl.1: i32 as I { // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon index 8d16421b4485..81150507a8ae 100644 --- a/toolchain/check/testdata/impl/fail_extend_non_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_non_interface.carbon @@ -19,7 +19,9 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %C.decl = class_decl @C {} [template = constants.%C] // CHECK:STDOUT: } // CHECK:STDOUT: 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 4ca0b480a772..465dafff0f73 100644 --- a/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_partially_defined_interface.carbon @@ -25,7 +25,9 @@ interface I { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -34,8 +36,8 @@ interface I { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .C = %C.decl -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as I; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon index 9705d69daa47..1e3432db0613 100644 --- a/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon +++ b/toolchain/check/testdata/impl/fail_extend_undefined_interface.carbon @@ -25,7 +25,10 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon index fedabb5e7b8c..939271b5c676 100644 --- a/toolchain/check/testdata/impl/fail_impl_as_scope.carbon +++ b/toolchain/check/testdata/impl/fail_impl_as_scope.carbon @@ -24,7 +24,9 @@ impl as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Simple = %Simple.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Simple = %Simple.decl +// CHECK:STDOUT: } [template] // 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] @@ -37,8 +39,8 @@ impl as Simple { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: as Simple { // CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] diff --git a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon index 589b38e42a41..9f70ab37767e 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_interface.carbon @@ -16,7 +16,8 @@ impl i32 as false {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 d37ad7f481fc..c20e6092067c 100644 --- a/toolchain/check/testdata/impl/fail_impl_bad_type.carbon +++ b/toolchain/check/testdata/impl/fail_impl_bad_type.carbon @@ -19,7 +19,9 @@ impl true as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // 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] @@ -30,8 +32,8 @@ impl true as I {} // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: as I { // CHECK:STDOUT: diff --git a/toolchain/check/testdata/impl/fail_redefinition.carbon b/toolchain/check/testdata/impl/fail_redefinition.carbon index 97c9f844e65d..e5fc15320226 100644 --- a/toolchain/check/testdata/impl/fail_redefinition.carbon +++ b/toolchain/check/testdata/impl/fail_redefinition.carbon @@ -23,7 +23,9 @@ impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // 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] @@ -36,8 +38,8 @@ impl i32 as I {} // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as I { // 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 75fffe61a909..8f89325fbab8 100644 --- a/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon +++ b/toolchain/check/testdata/impl/fail_todo_extend_impl.carbon @@ -40,7 +40,11 @@ fn G(c: C) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.HasF = %HasF.decl, .C = %C.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { @@ -56,8 +60,8 @@ fn G(c: C) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as HasF { // CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] diff --git a/toolchain/check/testdata/impl/impl_as.carbon b/toolchain/check/testdata/impl/impl_as.carbon index 399f68d5dab3..ea25e5c1e633 100644 --- a/toolchain/check/testdata/impl/impl_as.carbon +++ b/toolchain/check/testdata/impl/impl_as.carbon @@ -25,7 +25,10 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Simple = %Simple.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -36,8 +39,8 @@ class C { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: C as Simple { // CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] diff --git a/toolchain/check/testdata/impl/impl_forall.carbon b/toolchain/check/testdata/impl/impl_forall.carbon index c1f9d04c8fd0..d3a4a7c1c7b7 100644 --- a/toolchain/check/testdata/impl/impl_forall.carbon +++ b/toolchain/check/testdata/impl/impl_forall.carbon @@ -21,7 +21,9 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Simple = %Simple.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Simple = %Simple.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Simple.decl = interface_decl @Simple {} [template = constants.%.1] // CHECK:STDOUT: impl_decl @impl { // CHECK:STDOUT: %T.loc11_14.1: type = param T @@ -37,8 +39,8 @@ impl forall [T:! type] T as Simple { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: T as Simple { // CHECK:STDOUT: %F: = fn_decl @F.2 {} [template] diff --git a/toolchain/check/testdata/impl/redeclaration.carbon b/toolchain/check/testdata/impl/redeclaration.carbon index c65483613b8b..511c2703a6d3 100644 --- a/toolchain/check/testdata/impl/redeclaration.carbon +++ b/toolchain/check/testdata/impl/redeclaration.carbon @@ -23,7 +23,10 @@ impl i32 as I {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl, .X = %X.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: impl_decl @impl { // CHECK:STDOUT: %I.ref.loc9: type = name_ref I, %I.decl [template = constants.%.1] @@ -37,8 +40,8 @@ impl i32 as I {} // CHECK:STDOUT: interface @I { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: impl @impl: i32 as I { // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index d12dbe28bf7b..572e756cc624 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -26,7 +26,12 @@ var d: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c, .d = %d} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: .d = %d +// CHECK:STDOUT: } [template] // 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 6e0e474fc7ad..1e24702b9e17 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -43,7 +43,11 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .ValueBinding = %ValueBinding} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .ValueBinding = %ValueBinding +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index d82abac34903..d81f431636df 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -24,7 +24,10 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 7bca474cfe9e..ec6aaa3d5208 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -24,7 +24,10 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 d16b0f9adbdf..18aa2705ee33 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,7 +23,10 @@ var b: i32 = a[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 c4a3de1f1ca9..219396e24d12 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -21,7 +21,10 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index a473e976ee73..2840bd4b1a94 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -41,7 +41,10 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_17: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_18: type = array_type %.loc7_17, i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index e91a51745dad..151c577342b7 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -42,8 +42,16 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.N = %.loc11, .a = %a, .F = %F, .b = %b, .c = %c, .d = %d} [template] -// CHECK:STDOUT: %.loc11: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// 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 { +// CHECK:STDOUT: } [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] diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index c4eba13e4a27..5b9a7e24e1f7 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -18,7 +18,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon index cbee1882ce3f..dac650d34634 100644 --- a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon @@ -24,7 +24,11 @@ var c: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 89c83cfafd00..e4f51a712db0 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -19,7 +19,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: 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 e00d22af5498..9f7a09eeb32b 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,7 +25,10 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 19a7a25368a6..34e3a04630aa 100644 --- a/toolchain/check/testdata/index/fail_tuple_index_error.carbon +++ b/toolchain/check/testdata/index/fail_tuple_index_error.carbon @@ -22,7 +22,10 @@ var b: i32 = a[oops]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 7f1637422593..7faa0b3c383e 100644 --- a/toolchain/check/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/check/testdata/index/fail_tuple_large_index.carbon @@ -22,7 +22,11 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 3b49f44e1d07..d410afd288b5 100644 --- a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon @@ -23,7 +23,10 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 f874fe2fdac7..f517bd977bd5 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,7 +23,10 @@ var b: i32 = a[2]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 7d57a951e4ee..eee6a8423ee3 100644 --- a/toolchain/check/testdata/index/index_not_literal.carbon +++ b/toolchain/check/testdata/index/index_not_literal.carbon @@ -22,7 +22,10 @@ var b: i32 = a[{.index = 1}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 f588396c37b7..433647bcb814 100644 --- a/toolchain/check/testdata/index/tuple_element_access.carbon +++ b/toolchain/check/testdata/index/tuple_element_access.carbon @@ -19,7 +19,11 @@ var c: i32 = b[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: } [template] // 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 a8122c72ef6d..dc44b5cb1c08 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -20,7 +20,10 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_16.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_16.2: type = converted %.loc7_16.1, constants.%.2 [template = constants.%.2] diff --git a/toolchain/check/testdata/interface/as_type.carbon b/toolchain/check/testdata/interface/as_type.carbon index be0963ecb45a..2479dddeb118 100644 --- a/toolchain/check/testdata/interface/as_type.carbon +++ b/toolchain/check/testdata/interface/as_type.carbon @@ -16,7 +16,10 @@ fn F(e: Empty) {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] @@ -28,8 +31,8 @@ fn F(e: Empty) {} // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%e: Empty) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/interface/basic.carbon b/toolchain/check/testdata/interface/basic.carbon index 0fb31db40904..5b61bd7302f6 100644 --- a/toolchain/check/testdata/interface/basic.carbon +++ b/toolchain/check/testdata/interface/basic.carbon @@ -23,7 +23,10 @@ interface ForwardDeclared { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -32,8 +35,8 @@ interface ForwardDeclared { // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared { // CHECK:STDOUT: %F: = fn_decl @F {} [template] @@ -41,8 +44,8 @@ interface ForwardDeclared { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc13 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: 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 ab121978541d..6356a3304900 100644 --- a/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon +++ b/toolchain/check/testdata/interface/fail_add_member_outside_definition.carbon @@ -34,7 +34,10 @@ interface Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl, .Outer = %Outer.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -44,8 +47,8 @@ interface Outer { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = file.%F -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @Outer { // CHECK:STDOUT: %Inner.decl = interface_decl @Inner {} [template = constants.%.3] @@ -53,16 +56,16 @@ interface Outer { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .Inner = %Inner.decl -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @Inner { // CHECK:STDOUT: %.loc20: = fn_decl @.1 {} [template] // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = @Outer.%F -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: fn @F.1() { // CHECK:STDOUT: !entry: 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 75b49daffbe2..c3b27eca0812 100644 --- a/toolchain/check/testdata/interface/fail_as_type_of_type.carbon +++ b/toolchain/check/testdata/interface/fail_as_type_of_type.carbon @@ -22,7 +22,10 @@ fn F(T:! Empty) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Empty.ref: type = name_ref Empty, %Empty.decl [template = constants.%.1] @@ -34,8 +37,8 @@ fn F(T:! Empty) { // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(%T: Empty) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index 20d2936efbf8..51103610978b 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -46,7 +46,11 @@ interface Class { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -60,16 +64,16 @@ interface Class { } // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @.1; // CHECK:STDOUT: // CHECK:STDOUT: interface @.2 { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: class @Class; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon index 43612b90d176..d7ce92bd41b5 100644 --- a/toolchain/check/testdata/interface/fail_lookup_undefined.carbon +++ b/toolchain/check/testdata/interface/fail_lookup_undefined.carbon @@ -51,7 +51,11 @@ interface BeingDefined { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Undefined = %Undefined.decl, .Test = %Test, .BeingDefined = %BeingDefined.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -71,8 +75,8 @@ interface BeingDefined { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .H = %.loc37 -// CHECK:STDOUT: witness = (%H) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%H)} // CHECK:STDOUT: // CHECK:STDOUT: fn @.1(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_member_lookup.carbon b/toolchain/check/testdata/interface/fail_member_lookup.carbon index 84412a1f6bcf..7325d7347a0e 100644 --- a/toolchain/check/testdata/interface/fail_member_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_member_lookup.carbon @@ -22,7 +22,10 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -33,8 +36,8 @@ fn F() { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc7 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F.1(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index cd1b82e1ee58..cd2d4aef40f7 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -36,7 +36,12 @@ protected interface Protected; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -46,16 +51,16 @@ protected interface Protected; // CHECK:STDOUT: interface @Abstract { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @Default; // CHECK:STDOUT: // CHECK:STDOUT: interface @Virtual { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @Protected; // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_redeclare_member.carbon b/toolchain/check/testdata/interface/fail_redeclare_member.carbon index c86c16d0abb8..10694a4074b3 100644 --- a/toolchain/check/testdata/interface/fail_redeclare_member.carbon +++ b/toolchain/check/testdata/interface/fail_redeclare_member.carbon @@ -24,7 +24,9 @@ interface Interface { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Interface = %Interface.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -35,8 +37,8 @@ interface Interface { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc8 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: 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 50c0dc1b3341..dc296f15b510 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,7 +28,9 @@ fn Interface.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -39,8 +41,8 @@ fn Interface.F() {} // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc11 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon b/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon index 007897ec0101..01fbaab56f4a 100644 --- a/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon +++ b/toolchain/check/testdata/interface/fail_todo_facet_lookup.carbon @@ -23,7 +23,10 @@ fn CallStatic(T:! Interface) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl, .CallStatic = %CallStatic} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Interface.ref: type = name_ref Interface, %Interface.decl [template = constants.%.1] @@ -38,8 +41,8 @@ fn CallStatic(T:! Interface) { // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc7 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_todo_generic.carbon b/toolchain/check/testdata/interface/fail_todo_generic.carbon index 35662323f074..0f9722d509f3 100644 --- a/toolchain/check/testdata/interface/fail_todo_generic.carbon +++ b/toolchain/check/testdata/interface/fail_todo_generic.carbon @@ -19,7 +19,9 @@ interface I[](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .I = %I.decl +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon index 88a47525c682..257e415c660f 100644 --- a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon @@ -32,7 +32,10 @@ private interface Private { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Modifiers = %Modifiers.decl, .Private = %Private.decl} [template] +// CHECK:STDOUT: package: = namespace { +// 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: } @@ -46,14 +49,14 @@ private interface Private { // CHECK:STDOUT: !members: // CHECK:STDOUT: .Final = %.loc11 // CHECK:STDOUT: .Default = %.loc15 -// CHECK:STDOUT: witness = (%Final, %Default) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%Final, %Default)} // CHECK:STDOUT: // CHECK:STDOUT: interface @Private { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: fn @Final() { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/interface/import.carbon b/toolchain/check/testdata/interface/import.carbon index 5d6993acf482..7bbdd77e263e 100644 --- a/toolchain/check/testdata/interface/import.carbon +++ b/toolchain/check/testdata/interface/import.carbon @@ -43,7 +43,11 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc7, .f_ref = %f_ref} [template] +// CHECK:STDOUT: package: = namespace { +// 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] @@ -56,8 +60,8 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared { // CHECK:STDOUT: %F: = fn_decl @F {} [template] @@ -65,8 +69,8 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %.loc10 -// CHECK:STDOUT: witness = (%F) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%F)} // CHECK:STDOUT: // CHECK:STDOUT: fn @F(); // CHECK:STDOUT: @@ -82,7 +86,14 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Empty = %import_ref.1, .ForwardDeclared = %import_ref.2, .f_ref = %import_ref.3, .UseEmpty = %UseEmpty, .UseForwardDeclared = %UseForwardDeclared, .f = %f.loc9} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 @@ -107,8 +118,8 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: interface @Empty { // CHECK:STDOUT: // CHECK:STDOUT: !members: -// CHECK:STDOUT: witness = () -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = ()} // CHECK:STDOUT: // CHECK:STDOUT: interface @ForwardDeclared { // CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+8, unused @@ -116,8 +127,8 @@ var f: ForwardDeclared* = &f_ref.f; // CHECK:STDOUT: // CHECK:STDOUT: !members: // CHECK:STDOUT: .F = %import_ref.1 -// CHECK:STDOUT: witness = (%import_ref.2) -// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: witness = (%import_ref.2)} // CHECK:STDOUT: // CHECK:STDOUT: fn @UseEmpty(%e: Empty) { // CHECK:STDOUT: !entry: diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index d10cad2fe92b..4cc96586b732 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -15,7 +15,9 @@ 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 {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index afff4a0162eb..6e4373a2c7e5 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -24,7 +24,9 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index be83fc78e261..daad2afd4e3e 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -23,7 +23,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 2600683d13d8..60244bb7ec08 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -24,7 +24,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %a.loc8_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc8_6.1 diff --git a/toolchain/check/testdata/let/fail_generic_import.carbon b/toolchain/check/testdata/let/fail_generic_import.carbon index cd9231b0be7e..3a81d7d4d598 100644 --- a/toolchain/check/testdata/let/fail_generic_import.carbon +++ b/toolchain/check/testdata/let/fail_generic_import.carbon @@ -23,7 +23,8 @@ let a: T = 0; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %T: type = bind_symbolic_name T, i32 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -34,7 +35,9 @@ let a: T = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.T = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .T = %import_ref +// CHECK:STDOUT: } [template] // 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..70a04e0b7bed 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -75,7 +75,8 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..98f3a9bc80f8 100644 --- a/toolchain/check/testdata/let/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_todo_modifiers.carbon @@ -16,7 +16,8 @@ private let a: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 3baf1aa45336..d26abca521b2 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -14,7 +14,9 @@ fn F() { // CHECK:STDOUT: --- fail_use_in_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index c44f1e2f6490..f41d516af19c 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -17,7 +17,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/generic_import.carbon b/toolchain/check/testdata/let/generic_import.carbon index 5536b03c632b..670561d1e196 100644 --- a/toolchain/check/testdata/let/generic_import.carbon +++ b/toolchain/check/testdata/let/generic_import.carbon @@ -20,7 +20,8 @@ var b: T = *a; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %T: type = bind_symbolic_name T, i32 [symbolic] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -31,7 +32,11 @@ var b: T = *a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.T = %import_ref, .a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .T = %import_ref +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: } [template] // 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 57da4cd89b7a..ca8e740eee17 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -15,7 +15,9 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %n: i32 = bind_name n, %.loc7 // CHECK:STDOUT: %F: = fn_decl @F { diff --git a/toolchain/check/testdata/let/import.carbon b/toolchain/check/testdata/let/import.carbon index 38d3d551b775..36f2a554e37a 100644 --- a/toolchain/check/testdata/let/import.carbon +++ b/toolchain/check/testdata/let/import.carbon @@ -23,7 +23,8 @@ let b:! bool = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc4: bool = bool_literal true [template = constants.%.1] // CHECK:STDOUT: %a: bool = bind_symbolic_name a, %.loc4 [symbolic] // CHECK:STDOUT: } @@ -31,7 +32,9 @@ let b:! bool = a; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %import_ref +// CHECK:STDOUT: } [template] // 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 c94ce7617bdd..e95dbe12afa2 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -12,7 +12,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: --- local.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a: i32 = bind_name a, %a.loc7_6.1 diff --git a/toolchain/check/testdata/let/shadowed_decl.carbon b/toolchain/check/testdata/let/shadowed_decl.carbon index f540bde24e14..7ad6be2963d9 100644 --- a/toolchain/check/testdata/let/shadowed_decl.carbon +++ b/toolchain/check/testdata/let/shadowed_decl.carbon @@ -17,7 +17,9 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %a.loc7_6.1: i32 = param a // CHECK:STDOUT: @F.%a.loc7: i32 = bind_name a, %a.loc7_6.1 diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index bd6ce65e89e7..b8b98011840a 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -21,8 +21,11 @@ var a: i32 = NS.A(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon @@ -32,9 +35,14 @@ var a: i32 = NS.A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.2, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.2 +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace {.A = %A}, %import_ref [template] +// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/namespace/alias.carbon b/toolchain/check/testdata/namespace/alias.carbon index 83f989c69cf2..7f04d2065aa5 100644 --- a/toolchain/check/testdata/namespace/alias.carbon +++ b/toolchain/check/testdata/namespace/alias.carbon @@ -23,8 +23,16 @@ fn D() -> i32 { return C(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7, .ns = %ns, .B = %B, .C = %C, .D = %D} [template] -// CHECK:STDOUT: %.loc7: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// 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: .A = %A +// CHECK:STDOUT: } [template] // 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 { diff --git a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon index 8822c8c70d62..f59d49b2150a 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon @@ -43,19 +43,27 @@ fn NS(); // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc8_13.1} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc8_13.1 +// CHECK:STDOUT: } [template] // 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: %.loc8_13.1: = namespace %import_ref, { +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc8_13.2: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc16: = fn_decl @.1 {} [template] -// CHECK:STDOUT: %.loc20: = namespace {} [template] +// CHECK:STDOUT: %.loc20: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc28: = fn_decl @.2 {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: 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 af725e33f092..afe192846314 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon @@ -29,16 +29,23 @@ fn NS.Foo(); // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.2 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace {.Foo = %Foo}, %import_ref [template] +// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc12: = fn_decl @.1 {} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } 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 e231013dd944..1dfe44f15b6a 100644 --- a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon @@ -35,7 +35,9 @@ fn NS.Foo(); // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %NS +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %NS: = fn_decl @NS {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -44,9 +46,12 @@ fn NS.Foo(); // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %import_ref +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used [template = imports.%NS] -// CHECK:STDOUT: %.loc12: = namespace {} [template] +// CHECK:STDOUT: %.loc12: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc20: = fn_decl @.1 {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: 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 18df61c2d09c..7622228b0e37 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,8 +35,12 @@ fn NS.Bar() {} // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -48,7 +52,9 @@ fn NS.Bar() {} // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %NS +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %NS: = fn_decl @NS {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -60,9 +66,14 @@ fn NS.Bar() {} // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.2 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace {.Foo = %import_ref.2, .Bar = %Bar}, %import_ref.1 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: .Foo = %import_ref.2 +// CHECK:STDOUT: .Bar = %Bar +// CHECK:STDOUT: } [template] // 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] 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 4efef291d0d4..196f287709eb 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,7 +35,9 @@ fn NS.Bar() {} // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %NS +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %NS: = fn_decl @NS {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -47,8 +49,12 @@ fn NS.Bar() {} // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc10} [template] -// CHECK:STDOUT: %.loc10: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc10 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc10: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -60,10 +66,15 @@ fn NS.Bar() {} // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.2 +// CHECK:STDOUT: } [template] // 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 {.Foo = %import_ref.3, .Bar = %Bar}, %import_ref.2 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.2, { +// CHECK:STDOUT: .Foo = %import_ref.3 +// CHECK:STDOUT: .Bar = %Bar +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.3 = import_ref ir2, inst+2, unused // CHECK:STDOUT: %Bar: = fn_decl @Bar {} [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon index 2a4a5240c071..8f6deb955ddb 100644 --- a/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon +++ b/toolchain/check/testdata/namespace/fail_decl_in_alias.carbon @@ -24,8 +24,12 @@ fn ns.A() -> i32 { return 0; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7, .ns = %ns} [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc7 +// CHECK:STDOUT: .ns = %ns +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } [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 { diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index 0733a3aac9b7..e034e4f42542 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -21,8 +21,12 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_duplicate.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} [template] -// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc9} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %.loc7 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// 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: } diff --git a/toolchain/check/testdata/namespace/fail_modifiers.carbon b/toolchain/check/testdata/namespace/fail_modifiers.carbon index a9ddf4b6096a..ada9ccfb23d4 100644 --- a/toolchain/check/testdata/namespace/fail_modifiers.carbon +++ b/toolchain/check/testdata/namespace/fail_modifiers.carbon @@ -38,8 +38,13 @@ impl namespace Bar; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc31, .Bar = %.loc36} [template] -// CHECK:STDOUT: %.loc31: = namespace {} [template] -// CHECK:STDOUT: %.loc36: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %.loc31 +// CHECK:STDOUT: .Bar = %.loc36 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc31: = namespace { +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc36: = namespace { +// CHECK:STDOUT: } [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..e04de68a9a3b 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -13,7 +13,8 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_unresolved_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %.loc10: = fn_decl @.1 {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 9c7b89559965..44b43387ece3 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -24,8 +24,14 @@ fn Bar() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7, .Baz = %Baz.loc10, .Bar = %Bar} [template] -// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc13} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %.loc7 +// CHECK:STDOUT: .Baz = %Baz.loc10 +// CHECK:STDOUT: .Bar = %Bar +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// 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] diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index cec2216b3914..2ddcc4958f8a 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -27,9 +27,16 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {.ChildNS = %.loc5, .A = %A} [template] -// CHECK:STDOUT: %.loc5: = namespace {.B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: .ChildNS = %.loc5 +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc5: = namespace { +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: %B: = fn_decl @B {} [template] // CHECK:STDOUT: } @@ -45,11 +52,22 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.2, .a = %a, .b = %b, .package_a = %package_a, .package_b = %package_b} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace {.ChildNS = %.3, .A = %import_ref.3}, %import_ref.1 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: .ChildNS = %.3 +// CHECK:STDOUT: .A = %import_ref.3 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.3: = namespace {.B = %import_ref.4}, %import_ref.2 [template] +// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: .B = %import_ref.4 +// CHECK:STDOUT: } [template] // 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 594461c2566d..294f56999344 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -41,40 +41,63 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.2 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.2: = namespace {.B = %.loc5}, %import_ref [template] -// CHECK:STDOUT: %.loc5: = namespace {} [template] +// CHECK:STDOUT: %.2: = namespace %import_ref, { +// CHECK:STDOUT: .B = %.loc5 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc5: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.2 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %import_ref.1 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: .B = %.3 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+3, used -// CHECK:STDOUT: %.3: = namespace {.C = %.loc5}, %import_ref.2 [template] -// CHECK:STDOUT: %.loc5: = namespace {} [template] +// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: .C = %.loc5 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc5: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- d.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.2 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %import_ref.1 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: .B = %.3 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+4, used -// CHECK:STDOUT: %.3: = namespace {.C = %.4}, %import_ref.2 [template] +// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: .C = %.4 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+5, used -// CHECK:STDOUT: %.4: = namespace {.D = %D}, %import_ref.3 [template] +// CHECK:STDOUT: %.4: = namespace %import_ref.3, { +// CHECK:STDOUT: .D = %D +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %D: = fn_decl @D {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -90,13 +113,22 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.2, .e = %e} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.2 +// CHECK:STDOUT: .e = %e +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+2, used -// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %import_ref.1 [template] +// CHECK:STDOUT: %.2: = namespace %import_ref.1, { +// CHECK:STDOUT: .B = %.3 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.2: = import_ref ir1, inst+4, used -// CHECK:STDOUT: %.3: = namespace {.C = %.4}, %import_ref.2 [template] +// CHECK:STDOUT: %.3: = namespace %import_ref.2, { +// CHECK:STDOUT: .C = %.4 +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.3: = import_ref ir1, inst+6, used -// CHECK:STDOUT: %.4: = namespace {.D = %import_ref.4}, %import_ref.3 [template] +// CHECK:STDOUT: %.4: = namespace %import_ref.3, { +// CHECK:STDOUT: .D = %import_ref.4 +// CHECK:STDOUT: } [template] // 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 a9f697005419..6547a801516d 100644 --- a/toolchain/check/testdata/namespace/merging.carbon +++ b/toolchain/check/testdata/namespace/merging.carbon @@ -45,8 +45,12 @@ fn Run() { // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -58,10 +62,16 @@ fn Run() { // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace {.B1 = %B1, .B2 = %B2} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// 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: %.loc8: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %B2: = fn_decl @B2 {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -82,13 +92,22 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7_13.1, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc7_13.1 +// CHECK:STDOUT: .Run = %Run +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import_ref.1: = import_ref ir1, inst+1, used -// CHECK:STDOUT: %.loc7_13.1: = namespace {.A = %import_ref.2, .B1 = %import_ref.3, .B2 = %import_ref.4, .C = %C}, %import_ref.1 [template] +// CHECK:STDOUT: %.loc7_13.1: = namespace %import_ref.1, { +// 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: %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: %.loc7_13.2: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %C: = fn_decl @C {} [template] // CHECK:STDOUT: %Run: = fn_decl @Run {} [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index e0b3448a80ce..ab0883ecc2f9 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -21,9 +21,16 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} [template] -// CHECK:STDOUT: %.loc7: = namespace {.Bar = %.loc8} [template] -// CHECK:STDOUT: %.loc8: = namespace {.Wiz = %Wiz, .Baz = %Baz} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %.loc7 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: .Bar = %.loc8 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc8: = namespace { +// 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: } diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index e02dbaf8c4d9..21a85f254919 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -32,11 +32,19 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A.loc7, .N = %.loc9} [template] +// CHECK:STDOUT: package: = namespace { +// 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 {.A = %A.loc10, .M = %.loc12} [template] +// CHECK:STDOUT: %.loc9: = namespace { +// 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 {.B = %B} [template] +// CHECK:STDOUT: %.loc12: = namespace { +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %B: = fn_decl @B { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index 4cdad6aa02ff..b77a6667da6a 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -33,9 +33,20 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.OuterN = %.loc7, .A = %A, .CallA = %CallA} [template] -// CHECK:STDOUT: %.loc7: = namespace {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} [template] -// CHECK:STDOUT: %.loc8: = namespace {.C = %C, .CallABC = %CallABC} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .OuterN = %.loc7 +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .CallA = %CallA +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: .InnerN = %.loc8 +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: .CallAB = %CallAB +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc8: = namespace { +// 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] diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index ef6195fdcadd..6f4ddda21ad3 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -19,7 +19,11 @@ fn And() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .And = %And} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .And = %And +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var.loc7: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index 730860f602b6..797eda245aca 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -46,7 +46,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon index 14771db1dd33..087a3acc8033 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon @@ -22,7 +22,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon index 3d949227e2cf..b7dd2ccb4788 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon @@ -67,7 +67,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index 10053b1022f3..eb0041ad4f99 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -18,7 +18,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index 65497443c2dc..ff697f39bd2a 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -20,7 +20,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index bb8de9ab5a78..4d45b596c8be 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -18,7 +18,11 @@ fn Or() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .Or = %Or} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .Or = %Or +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var.loc7: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index 4f5b67f6ca47..91da04d70f3f 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -19,7 +19,9 @@ let not_false: bool = not false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Not = %Not} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Not = %Not +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Not: = fn_decl @Not { // CHECK:STDOUT: %b.loc7_8.1: bool = param b // CHECK:STDOUT: @Not.%b: bool = bind_name b, %b.loc7_8.1 diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index f790b2761315..534410fd8170 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -14,7 +14,9 @@ fn Main() { // CHECK:STDOUT: --- fail_not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 98a2236b3a62..1b2b6e6080d0 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -50,7 +50,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // 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] @@ -86,7 +89,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // 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] @@ -123,8 +129,13 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc4, .Main = %Main} [template] -// CHECK:STDOUT: %.loc4: = namespace {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc4 +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc4: = namespace { +// 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: } diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 33365cb8a73f..1fa89ee70515 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -37,25 +37,29 @@ import library "lib"; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- different_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -63,12 +67,14 @@ import library "lib"; // CHECK:STDOUT: --- main_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 b3a47b90b084..da85d1424eea 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -28,18 +28,24 @@ library "Bar" impl; // CHECK:STDOUT: --- no_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: has_error +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: has_error +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: has_error +// CHECK:STDOUT: } [template] // 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 ec8b00ee5341..35e727f6ef7e 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -32,7 +32,9 @@ import library "var"; // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -41,7 +43,9 @@ import library "var"; // CHECK:STDOUT: --- var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %Foo +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Foo.var: ref i32 = var Foo // CHECK:STDOUT: %Foo: ref i32 = bind_name Foo, %Foo.var // CHECK:STDOUT: } @@ -49,7 +53,9 @@ import library "var"; // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Foo = %import_ref.1} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Foo = %import_ref.1 +// CHECK:STDOUT: } [template] // 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 ce163c86551e..2db68a7147a7 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -50,7 +50,8 @@ import B; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } @@ -58,7 +59,8 @@ import B; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } @@ -66,7 +68,8 @@ import B; // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } @@ -74,13 +77,16 @@ import B; // CHECK:STDOUT: --- c.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {has_error} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: has_error +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- cycle_child.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..30828e6c0a08 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -45,48 +45,56 @@ package Package library "lib" api; // CHECK:STDOUT: --- main1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..89644b152f2d 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -73,60 +73,70 @@ package SwappedExt impl; // CHECK:STDOUT: --- main.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..dc41ee62694a 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -41,24 +41,28 @@ import library default; // CHECK:STDOUT: --- default_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- default.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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..f65161081081 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -85,55 +85,64 @@ import ImportNotFound; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..5c2d89a8d546 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -61,25 +61,29 @@ import library default; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %import: = import ir2, ir3 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -87,6 +91,7 @@ import library default; // CHECK:STDOUT: --- default_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 1aa750df3da9..67f27ae9b865 100644 --- a/toolchain/check/testdata/packages/fail_import_type_error.carbon +++ b/toolchain/check/testdata/packages/fail_import_type_error.carbon @@ -39,7 +39,12 @@ var d: i32 = d_ref; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref, .b_ref = %b_ref, .c_ref = %c_ref, .d_ref = %d_ref} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 @@ -60,7 +65,16 @@ var d: i32 = d_ref; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %import_ref.1, .b_ref = %import_ref.2, .c_ref = %import_ref.3, .d_ref = %import_ref.4, .a = %a, .b = %b, .c = %c, .d = %d} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_ref = %import_ref.1 +// CHECK:STDOUT: .b_ref = %import_ref.2 +// CHECK:STDOUT: .c_ref = %import_ref.3 +// CHECK:STDOUT: .d_ref = %import_ref.4 +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: .d = %d +// CHECK:STDOUT: } [template] // 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 8fd0bb08bf73..b15273bacba4 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -20,7 +20,10 @@ var a: () = A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a, has_error} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: has_error +// CHECK:STDOUT: } [template] // 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..45c90420582d 100644 --- a/toolchain/check/testdata/packages/fail_package_main.carbon +++ b/toolchain/check/testdata/packages/fail_package_main.carbon @@ -36,24 +36,28 @@ package Main library "lib" api; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- raw_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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..32c3527e704b 100644 --- a/toolchain/check/testdata/packages/implicit_imports.carbon +++ b/toolchain/check/testdata/packages/implicit_imports.carbon @@ -46,60 +46,70 @@ library "lib" impl; // CHECK:STDOUT: --- api_only.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index 4998acb87dd4..4c1021b38de6 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -37,7 +37,9 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -50,7 +52,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %import_ref, .a = %a, .package_a = %package_a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %import_ref +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: .package_a = %package_a +// CHECK:STDOUT: } [template] // 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] @@ -79,7 +85,9 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %B} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %B: = fn_decl @B {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -92,7 +100,11 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.B = %import_ref, .b = %b, .package_b = %package_b} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .B = %import_ref +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .package_b = %package_b +// CHECK:STDOUT: } [template] // 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 7e96717c3cac..553d10be817a 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -17,7 +17,9 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -26,7 +28,9 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %import_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %import_ref +// CHECK:STDOUT: } [template] // 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 4b5a70b576dd..663646895d9e 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -17,7 +17,9 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index f632396737e5..11c625755e6d 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -33,7 +33,9 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 3e6b0680dca5..7c6d6c4e8dc6 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -19,7 +19,9 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index ba2157a1e270..4d32fbea8c7e 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -21,7 +21,9 @@ fn Test() { // CHECK:STDOUT: --- fail_address_of_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Test = %Test} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Test = %Test +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Test: = fn_decl @Test {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 4eb4d8a4a793..abad2dfc0827 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -108,7 +108,16 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .H = %H +// CHECK:STDOUT: .AddressOfLiteral = %AddressOfLiteral +// CHECK:STDOUT: .AddressOfOperator = %AddressOfOperator +// CHECK:STDOUT: .AddressOfCall = %AddressOfCall +// CHECK:STDOUT: .AddressOfType = %AddressOfType +// CHECK:STDOUT: .AddressOfTupleElementValue = %AddressOfTupleElementValue +// CHECK:STDOUT: .AddressOfParam = %AddressOfParam +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 68c03fa98f3e..82cdbbd0c25e 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -12,7 +12,8 @@ let n: i32 = *undeclared; // CHECK:STDOUT: --- fail_deref_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [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 c23d013ecfed..f44df9cfc36b 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -14,7 +14,9 @@ fn A() { // CHECK:STDOUT: --- fail_deref_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index 1aa61ba146b8..34deadf0c212 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -16,8 +16,12 @@ fn F() { // CHECK:STDOUT: --- fail_deref_namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.loc7, .F = %F} [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.loc7 +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index 04da39709b7f..f2fa7e1b393f 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -29,7 +29,9 @@ fn Deref(n: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Deref = %Deref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Deref = %Deref +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Deref: = fn_decl @Deref { // CHECK:STDOUT: %n.loc7_10.1: i32 = param n // CHECK:STDOUT: @Deref.%n: i32 = bind_name n, %n.loc7_10.1 diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index 0579e96bf8c3..a3c8e15cd6f8 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -15,7 +15,9 @@ var p: *i32; // CHECK:STDOUT: --- fail_deref_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.p = %p} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .p = %p +// CHECK:STDOUT: } [template] // 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 7251ee00f65d..549a1cd5583f 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -22,7 +22,9 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ConstMismatch = %ConstMismatch} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .ConstMismatch = %ConstMismatch +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch { // CHECK:STDOUT: %.loc7_28.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_28.2: type = converted %.loc7_28.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/pointer/import.carbon b/toolchain/check/testdata/pointer/import.carbon index 619603355e35..c1b0ee6d1bf3 100644 --- a/toolchain/check/testdata/pointer/import.carbon +++ b/toolchain/check/testdata/pointer/import.carbon @@ -25,7 +25,10 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_orig = %a_orig, .a_ref = %a_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_orig = %a_orig +// CHECK:STDOUT: .a_ref = %a_ref +// CHECK:STDOUT: } [template] // 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] @@ -50,7 +53,11 @@ var a: i32* = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_orig = %import_ref.1, .a_ref = %import_ref.2, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_orig = %import_ref.1 +// CHECK:STDOUT: .a_ref = %import_ref.2 +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 fc299cc9e5fb..e8a9f57eee4d 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -20,7 +20,9 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc8_23: type = const_type i32 [template = constants.%.1] // CHECK:STDOUT: %.loc8_32: type = ptr_type const i32 [template = constants.%.2] diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 68a1d90736aa..64fca1f02fa4 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -21,7 +21,10 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Ptr = %Ptr, .ConstPtr = %ConstPtr} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Ptr = %Ptr +// CHECK:STDOUT: .ConstPtr = %ConstPtr +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Ptr: = fn_decl @Ptr { // CHECK:STDOUT: %.loc7_14: type = ptr_type i32 [template = constants.%.1] // CHECK:STDOUT: %p.loc7_8.1: i32* = param p diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index a98ece7e03c2..54d4dd1f0d7c 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -16,7 +16,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index ed01be3dcfa0..f5dfdc2118f3 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -27,7 +27,9 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %b.loc7_6.1: bool = param b // CHECK:STDOUT: @F.%b: bool = bind_name b, %b.loc7_6.1 diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index f47d7f31abaa..366f95ba5cc1 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -19,7 +19,10 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.ReturnType = %ReturnType, .Six = %Six} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .ReturnType = %ReturnType +// CHECK:STDOUT: .Six = %Six +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType { // CHECK:STDOUT: %return.var.loc9: ref type = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index c836b9128033..b2f8673ea2d6 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -12,7 +12,9 @@ fn Six() -> x; // CHECK:STDOUT: --- fail_error_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Six = %Six} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Six = %Six +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Six: = fn_decl @Six { // CHECK:STDOUT: %x.ref: = name_ref x, [template = ] // CHECK:STDOUT: %return.var: ref = var diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index bb3331e35b11..f89bd6571ba0 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -13,7 +13,9 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_missing_return.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] 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 85ed9f2c5a69..630f7434795e 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -17,7 +17,9 @@ fn F() -> () { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %.loc7_12.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_12.2: type = converted %.loc7_12.1, constants.%.1 [template = constants.%.1] 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 6a28846516a0..43ec81e541ef 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,7 +14,9 @@ fn Procedure() -> i32 { // CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Procedure = %Procedure +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Procedure: = fn_decl @Procedure { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] 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 a15c2471bb67..79eaada532dd 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -41,7 +41,11 @@ fn G() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .C = %C.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .C = %C.decl +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] 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 3016bd4d05e5..5d8af23bfcab 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,7 +22,9 @@ fn Procedure() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Procedure = %Procedure +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Procedure: = fn_decl @Procedure {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index 23c8721c9f22..cc4d45af7aab 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -43,7 +43,10 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.SameScope = %SameScope, .DifferentScopes = %DifferentScopes} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .SameScope = %SameScope +// CHECK:STDOUT: .DifferentScopes = %DifferentScopes +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %SameScope: = fn_decl @SameScope { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index a9512f0edc6b..b68f20ed0da0 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -22,7 +22,9 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Mismatch = %Mismatch} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Mismatch = %Mismatch +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index 958227962186..566f8646f3df 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -18,7 +18,9 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index cbf46da1e39f..8fb3439109c6 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -21,7 +21,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index 20f199f2cdb0..7b5975bee9e1 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -17,7 +17,9 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_value_missing.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index b8300f962478..c120bbba5962 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -17,7 +17,10 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Six = %Six} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .Six = %Six +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: %Six: = fn_decl @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 3ddc9ee7b021..6fb6576817ce 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -10,7 +10,9 @@ fn F() { // CHECK:STDOUT: --- missing_return_no_return_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index 620cbfcaf7fd..71d84bcaef59 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -11,7 +11,9 @@ fn Main() { // CHECK:STDOUT: --- no_value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index 188a161b121c..c479b01c9085 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -33,7 +33,11 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.C = %C.decl, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %C.ref: type = name_ref C, %C.decl [template = constants.%C] diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 0f78d623af12..0817a0ff0351 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -32,7 +32,10 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.UnrelatedScopes = %UnrelatedScopes, .EnclosingButAfter = %EnclosingButAfter} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .UnrelatedScopes = %UnrelatedScopes +// CHECK:STDOUT: .EnclosingButAfter = %EnclosingButAfter +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index a7f728ee6f3c..e0ea5cffcce3 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -17,7 +17,9 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %.loc7: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %return.var: ref {.a: i32} = var diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index 9fbbc3589fbe..0c8ab9afa140 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -21,7 +21,9 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // 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] diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index a5de37fb2082..10e7d252f04e 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -15,7 +15,9 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main { // CHECK:STDOUT: %return.var: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index d808f724fbe1..40d5b1aec911 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -16,7 +16,10 @@ var y: {} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 c2b4f75468f1..084dcf0bfc61 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -13,7 +13,9 @@ fn F() { a.b; } // CHECK:STDOUT: --- fail_access_into_invalid.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index ad684a0f53d2..00d577a4caee 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -17,7 +17,9 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 3dab006b29c4..2e8049a1d5be 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -20,7 +20,9 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 e9ce0a5f8b8a..5db122012f3b 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -19,7 +19,9 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 23925f176467..24417d5e9e1d 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -57,7 +57,11 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // CHECK:STDOUT: %return.var: ref = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 79f329527913..efc25d22e71f 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -23,7 +23,10 @@ var y: {.b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 fb080b552787..f4fa8824e0a8 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -18,7 +18,9 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 7d0626b276b8..7e83e07e791a 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -19,7 +19,10 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 b2392fca130f..5683fb8a220b 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -14,7 +14,9 @@ fn A() { // CHECK:STDOUT: --- fail_member_of_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index efc5069154bd..bdaa20e9575d 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -25,7 +25,11 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .s = %s, .p = %p} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete.decl [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15: type = struct_type {.a: Incomplete} [template = constants.%.1] diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index ed9c20e80d7e..63bec50df1d6 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -19,7 +19,10 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 e3efaef0e739..303ea5681b87 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -19,7 +19,9 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 c24d3e5215b8..1924427ab1ac 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -16,7 +16,9 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 1d3cc52b6aad..6e3245db25a4 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -17,7 +17,9 @@ var x: {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 7946825fcccc..ee0bc4d1510b 100644 --- a/toolchain/check/testdata/struct/import.carbon +++ b/toolchain/check/testdata/struct/import.carbon @@ -38,7 +38,10 @@ var b: {.a: {.b: i32, .c: (i32,)}, .d: i32} = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref, .b_ref = %b_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_ref = %a_ref +// CHECK:STDOUT: .b_ref = %b_ref +// CHECK:STDOUT: } [template] // 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 @@ -94,7 +97,12 @@ var b: {.a: {.b: i32, .c: (i32,)}, .d: i32} = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %import_ref.1, .b_ref = %import_ref.2, .a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 e2782aedec9d..f20933ba7800 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -23,7 +23,10 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %G: = fn_decl @G { // 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 diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index ef6fcf26dec3..349d7fb93115 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -19,7 +19,11 @@ var z: i32 = y; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y, .z = %z} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: .z = %z +// CHECK:STDOUT: } [template] // 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 4012e8da8b1e..9e387a516949 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -22,7 +22,10 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // 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] diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index abad6ded94be..3afe61945ca6 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -16,7 +16,10 @@ var y: {.a: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 aabd10d911ea..958e7c4943a6 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -23,7 +23,11 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .MakeI32 = %MakeI32 +// CHECK:STDOUT: .MakeF64 = %MakeF64 +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 { // CHECK:STDOUT: %return.var.loc7: ref i32 = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 32ab5258aee4..de324e6e6c2c 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -21,7 +21,10 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 4315154dc2ae..ee2c6159e7e5 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -21,7 +21,10 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 49005dd00e70..669a0ea70b07 100644 --- a/toolchain/check/testdata/tuples/empty.carbon +++ b/toolchain/check/testdata/tuples/empty.carbon @@ -15,7 +15,10 @@ var y: () = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 23bd3018c4eb..618e93cee74b 100644 --- a/toolchain/check/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_empty.carbon @@ -18,7 +18,9 @@ var x: (i32,) = (); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 fe2c364c844c..8092f4bcb487 100644 --- a/toolchain/check/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_nested.carbon @@ -30,7 +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 {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 299f52c13ec1..3885af95841a 100644 --- a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon @@ -17,7 +17,9 @@ var x: () = (66); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 5ef8b7f6c459..c746df114cd1 100644 --- a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon @@ -21,7 +21,9 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [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: %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 bb8c608af10e..96ff853ab66b 100644 --- a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon @@ -27,7 +27,11 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .t = %t, .p = %p} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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) diff --git a/toolchain/check/testdata/tuples/fail_too_few_element.carbon b/toolchain/check/testdata/tuples/fail_too_few_element.carbon index 73e78e4d9576..d4159efa1264 100644 --- a/toolchain/check/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuples/fail_too_few_element.carbon @@ -20,7 +20,9 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [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: %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 7149cc2054b2..ea0c72c958c6 100644 --- a/toolchain/check/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuples/fail_type_assign.carbon @@ -17,7 +17,9 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 517b93aa0d38..3b68cd17c4fe 100644 --- a/toolchain/check/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuples/fail_value_as_type.carbon @@ -17,7 +17,9 @@ var x: (1, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 a0271c142918..cd9519ed98fc 100644 --- a/toolchain/check/testdata/tuples/import.carbon +++ b/toolchain/check/testdata/tuples/import.carbon @@ -44,7 +44,10 @@ var b: (((i32,), i32), (i32, i32)) = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref, .b_ref = %b_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_ref = %a_ref +// CHECK:STDOUT: .b_ref = %b_ref +// CHECK:STDOUT: } [template] // 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 @@ -116,7 +119,12 @@ var b: (((i32,), i32), (i32, i32)) = b_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %import_ref.1, .b_ref = %import_ref.2, .a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %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 f524d1fb2468..e8b07d7cd6f1 100644 --- a/toolchain/check/testdata/tuples/nested_tuple.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple.carbon @@ -24,7 +24,9 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 cfc03004944f..34fb6d32d51e 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -33,7 +33,11 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .H = %H +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %F: = fn_decl @F { // 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] diff --git a/toolchain/check/testdata/tuples/one_element.carbon b/toolchain/check/testdata/tuples/one_element.carbon index 1c0c11645506..e4ac37ed2cde 100644 --- a/toolchain/check/testdata/tuples/one_element.carbon +++ b/toolchain/check/testdata/tuples/one_element.carbon @@ -17,7 +17,10 @@ var y: (i32,) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 a96d86a0b3a0..332695699ee3 100644 --- a/toolchain/check/testdata/tuples/two_elements.carbon +++ b/toolchain/check/testdata/tuples/two_elements.carbon @@ -22,7 +22,10 @@ var y: (i32, i32) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 d06183da7ca0..5611cab906f5 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -11,7 +11,9 @@ fn Main() { // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index b8213445965d..9a033a54433a 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -15,7 +15,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 6a68af32d14d..71fdbd0a0c93 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -23,7 +23,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_generic.carbon b/toolchain/check/testdata/var/fail_generic.carbon index c4cce06fb36e..bf026e81f13f 100644 --- a/toolchain/check/testdata/var/fail_generic.carbon +++ b/toolchain/check/testdata/var/fail_generic.carbon @@ -18,7 +18,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index ede540b97f07..c7eb7b5f21dc 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -18,7 +18,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index 853d3e98b337..217fd7251ffe 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -14,7 +14,9 @@ fn Main() { // CHECK:STDOUT: --- fail_init_with_self.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index e48499beff84..9a1a114aa946 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -16,7 +16,10 @@ var y: i32 = x; // CHECK:STDOUT: --- fail_lookup_outside_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 diff --git a/toolchain/check/testdata/var/fail_modifiers.carbon b/toolchain/check/testdata/var/fail_modifiers.carbon index 01ed2034bc26..499067682ee5 100644 --- a/toolchain/check/testdata/var/fail_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_modifiers.carbon @@ -39,7 +39,12 @@ abstract var e: i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.b = %b, .c = %c, .d = %d, .e = %e} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .b = %b +// CHECK:STDOUT: .c = %c +// CHECK:STDOUT: .d = %d +// CHECK:STDOUT: .e = %e +// CHECK:STDOUT: } [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/var/fail_namespace_conflict.carbon b/toolchain/check/testdata/var/fail_namespace_conflict.carbon index cbf210397502..81b87fda4aee 100644 --- a/toolchain/check/testdata/var/fail_namespace_conflict.carbon +++ b/toolchain/check/testdata/var/fail_namespace_conflict.carbon @@ -29,8 +29,11 @@ var A: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %.loc7} [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %.loc7 +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } [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 d635ae7c0c97..e31353222b28 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -34,7 +34,10 @@ fn F(x: X) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.X = %X.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %X.ref: type = name_ref X, %X.decl [template = constants.%X] diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index 55468b42463d..63a4f22df42c 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -18,7 +18,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_todo_modifiers.carbon b/toolchain/check/testdata/var/fail_todo_modifiers.carbon index 372c45767857..87cc7d9d0996 100644 --- a/toolchain/check/testdata/var/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_todo_modifiers.carbon @@ -12,7 +12,9 @@ private var a: i32; // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 174a3bbd2074..2f86df47cad6 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -9,7 +9,9 @@ var x: i32; // CHECK:STDOUT: --- global_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 aadded13c0f9..7c184a6e13e3 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -13,7 +13,9 @@ var x: i32 = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: } [template] // 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 73f43d42954c..5e8c585458e3 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -14,7 +14,10 @@ var y: i32 = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .y = %y +// CHECK:STDOUT: } [template] // 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 68ad784592a7..0f015f52eea3 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -17,7 +17,10 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .x = %x +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // 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] diff --git a/toolchain/check/testdata/var/import.carbon b/toolchain/check/testdata/var/import.carbon index 900677a1f110..b12d72bc8650 100644 --- a/toolchain/check/testdata/var/import.carbon +++ b/toolchain/check/testdata/var/import.carbon @@ -23,7 +23,9 @@ var a: i32 = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_ref = %a_ref +// CHECK:STDOUT: } [template] // 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: } @@ -38,7 +40,10 @@ var a: i32 = a_ref; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.a_ref = %import_ref, .a = %a} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .a_ref = %import_ref +// CHECK:STDOUT: .a = %a +// CHECK:STDOUT: } [template] // 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 6df3b2ed510c..bc425ef56587 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -16,7 +16,9 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 2253163fa88d..a6cf86a6bc8e 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -28,8 +28,12 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.NS = %.loc7, .Main = %Main} [template] -// CHECK:STDOUT: %.loc7: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .NS = %.loc7 +// CHECK:STDOUT: .Main = %Main +// CHECK:STDOUT: } [template] +// CHECK:STDOUT: %.loc7: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %Main: = fn_decl @Main {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index e2303fc698c9..f095eaf111d0 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -29,7 +29,17 @@ fn While() { // CHECK:STDOUT: --- break_continue.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C, .D = %D, .E = %E, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .A = %A +// CHECK:STDOUT: .B = %B +// CHECK:STDOUT: .C = %C +// CHECK:STDOUT: .D = %D +// CHECK:STDOUT: .E = %E +// CHECK:STDOUT: .F = %F +// CHECK:STDOUT: .G = %G +// CHECK:STDOUT: .H = %H +// CHECK:STDOUT: .While = %While +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %A: = fn_decl @A { // CHECK:STDOUT: %return.var.loc7: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index 049cf67c321c..e01eaeaea87e 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -19,7 +19,9 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.While = %While} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .While = %While +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %While: = fn_decl @While {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/fail_break_continue.carbon b/toolchain/check/testdata/while/fail_break_continue.carbon index 63569aaeaccf..436851ab2d63 100644 --- a/toolchain/check/testdata/while/fail_break_continue.carbon +++ b/toolchain/check/testdata/while/fail_break_continue.carbon @@ -34,7 +34,9 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.While = %While} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: .While = %While +// CHECK:STDOUT: } [template] // CHECK:STDOUT: %While: = fn_decl @While {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index 434935958cda..b2e9ad8c19b8 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -26,7 +26,13 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index d5c37c1d2c6d..4103fdf7a988 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -25,7 +25,13 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace { +// 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: %return.var: ref bool = var // CHECK:STDOUT: } [template] diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index cdb2bdfdc4a6..56504e5eb6e5 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -9,6 +9,7 @@ // CHECK:STDOUT: --- // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace {} [template] +// CHECK:STDOUT: package: = namespace { +// CHECK:STDOUT: } [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index a62eab0b9a6f..90817b79de23 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -135,7 +135,7 @@ class InstNamer { } } - // Returns the scope index corresponding to an ID of a function, class, or + // Returns the scope ID corresponding to an ID of a function, class, or // interface. template auto GetScopeFor(IdT id) -> ScopeId { @@ -635,9 +635,9 @@ class Formatter { if (class_info.scope_id.is_valid()) { out_ << " {\n"; FormatCodeBlock(class_info.body_block_id); - out_ << "\n!members:"; - FormatNameScope(class_info.scope_id, "", "\n "); - out_ << "\n}\n"; + out_ << "\n!members:\n"; + FormatNameScope(class_info.scope_id); + out_ << "}\n"; } else { out_ << ";\n"; } @@ -654,11 +654,11 @@ class Formatter { if (interface_info.scope_id.is_valid()) { out_ << " {\n"; FormatCodeBlock(interface_info.body_block_id); - out_ << "\n!members:"; - FormatNameScope(interface_info.scope_id, "", "\n "); + out_ << "\n!members:\n"; + FormatNameScope(interface_info.scope_id); out_ << "\n witness = "; FormatArg(interface_info.associated_entities_id); - out_ << "\n}\n"; + out_ << "}\n"; } else { out_ << ";\n"; } @@ -680,9 +680,9 @@ class Formatter { if (impl_info.scope_id.is_valid()) { out_ << " {\n"; FormatCodeBlock(impl_info.body_block_id); - out_ << "\n!members:"; - FormatNameScope(impl_info.scope_id, "", "\n "); - out_ << "\n}\n"; + out_ << "\n!members:\n"; + FormatNameScope(impl_info.scope_id); + out_ << "}\n"; } else { out_ << ";\n"; } @@ -775,8 +775,7 @@ class Formatter { out_ << "}"; } - auto FormatNameScope(NameScopeId id, llvm::StringRef separator, - llvm::StringRef prefix) -> void { + auto FormatNameScope(NameScopeId id) -> void { const auto& scope = sem_ir_.name_scopes().Get(id); // Name scopes aren't kept in any particular order. Sort the entries before @@ -788,21 +787,24 @@ class Formatter { llvm::sort(entries, [](auto a, auto b) { return a.first.index < b.first.index; }); - llvm::ListSeparator sep(separator); for (auto [inst_id, name_id] : entries) { - out_ << sep << prefix << "."; + Indent(); + out_ << "."; FormatName(name_id); out_ << " = "; FormatInstName(inst_id); + out_ << "\n"; } for (auto extended_scope_id : scope.extended_scopes) { // TODO: Print this scope in a better way. - out_ << sep << prefix << "extend " << extended_scope_id; + Indent(); + out_ << "extend " << extended_scope_id << "\n"; } if (scope.has_error) { - out_ << sep << prefix << "has_error"; + Indent(); + out_ << "has_error\n"; } } @@ -927,7 +929,7 @@ class Formatter { auto FormatInstructionRHS(Namespace inst) -> void { if (inst.import_id.is_valid()) { - FormatArgs(inst.name_scope_id, inst.import_id); + FormatArgs(inst.import_id, inst.name_scope_id); } else { FormatArgs(inst.name_scope_id); } @@ -1106,8 +1108,11 @@ class Formatter { auto FormatArg(ElementIndex index) -> void { out_ << index; } auto FormatArg(NameScopeId id) -> void { - out_ << '{'; - FormatNameScope(id, ", ", ""); + out_ << "{\n"; + indent_ += 2; + FormatNameScope(id); + indent_ -= 2; + Indent(); out_ << '}'; }