Make namespace formatting more consistent with other declaration block instructions. (#3732)

List names vertically rather than horizontally.
This commit is contained in:
Richard Smith
2024-02-28 22:20:37 +00:00
committed by GitHub
parent 5f4e6c768a
commit 5543602a50
379 changed files with 2051 additions and 622 deletions
+3 -1
View File
@@ -17,7 +17,9 @@ fn F() -> i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .F = %F
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %F: <function> = fn_decl @F {
// CHECK:STDOUT: %return.var: ref i32 = var <return slot>
// CHECK:STDOUT: } [template]
+3 -1
View File
@@ -33,7 +33,9 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .F = %F
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %F: <function> = fn_decl @F {} [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
+3 -1
View File
@@ -19,7 +19,9 @@ fn F() -> i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .F = %F
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %F: <function> = fn_decl @F {
// CHECK:STDOUT: %return.var: ref i32 = var <return slot>
// CHECK:STDOUT: } [template]
@@ -21,7 +21,9 @@ fn Test() {
// CHECK:STDOUT: --- fail_address_of_error.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Test = %Test} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .Test = %Test
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %Test: <function> = fn_decl @Test {} [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -108,7 +108,16 @@ fn AddressOfParam(param: i32) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = fn_decl @G {
// CHECK:STDOUT: %return.var.loc7: ref i32 = var <return slot>
// CHECK:STDOUT: } [template]
+2 -1
View File
@@ -12,7 +12,8 @@ let n: i32 = *undeclared;
// CHECK:STDOUT: --- fail_deref_error.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %undeclared.ref: <error> = name_ref undeclared, <error> [template = <error>]
// CHECK:STDOUT: %.loc10: ref <error> = deref <error>
// CHECK:STDOUT: %n: i32 = bind_name n, <error>
@@ -14,7 +14,9 @@ fn A() {
// CHECK:STDOUT: --- fail_deref_function.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.A = %A} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .A = %A
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %A: <function> = fn_decl @A {} [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -16,8 +16,12 @@ fn F() {
// CHECK:STDOUT: --- fail_deref_namespace.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.A = %.loc7, .F = %F} [template]
// CHECK:STDOUT: %.loc7: <namespace> = namespace {} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .A = %.loc7
// CHECK:STDOUT: .F = %F
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %.loc7: <namespace> = namespace {
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %F: <function> = fn_decl @F {} [template]
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -29,7 +29,9 @@ fn Deref(n: i32) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Deref = %Deref} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .Deref = %Deref
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %Deref: <function> = fn_decl @Deref {
// CHECK:STDOUT: %n.loc7_10.1: i32 = param n
// CHECK:STDOUT: @Deref.%n: i32 = bind_name n, %n.loc7_10.1
+3 -1
View File
@@ -15,7 +15,9 @@ var p: *i32;
// CHECK:STDOUT: --- fail_deref_type.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.p = %p} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .p = %p
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %.loc13: ref <error> = deref i32
// CHECK:STDOUT: %p.var: ref <error> = var p
// CHECK:STDOUT: %p: ref <error> = bind_name p, %p.var
+3 -1
View File
@@ -22,7 +22,9 @@ fn ConstMismatch(p: const {}*) -> const ({}*) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.ConstMismatch = %ConstMismatch} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .ConstMismatch = %ConstMismatch
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %ConstMismatch: <function> = 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]
+9 -2
View File
@@ -25,7 +25,10 @@ var a: i32* = a_ref;
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a_orig = %a_orig, .a_ref = %a_ref} [template]
// CHECK:STDOUT: package: <namespace> = 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> = namespace {.a_orig = %import_ref.1, .a_ref = %import_ref.2, .a = %a} [template]
// CHECK:STDOUT: package: <namespace> = 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]
+3 -1
View File
@@ -20,7 +20,9 @@ fn F(p: const (const (const i32*)*)) -> const i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .F = %F
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %F: <function> = 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]
+4 -1
View File
@@ -21,7 +21,10 @@ fn ConstPtr(p: const i32*) -> (const i32)* {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Ptr = %Ptr, .ConstPtr = %ConstPtr} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .Ptr = %Ptr
// CHECK:STDOUT: .ConstPtr = %ConstPtr
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %Ptr: <function> = fn_decl @Ptr {
// CHECK:STDOUT: %.loc7_14: type = ptr_type i32 [template = constants.%.1]
// CHECK:STDOUT: %p.loc7_8.1: i32* = param p