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
+6 -3
View File
@@ -16,7 +16,10 @@ fn F(e: Empty) {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Empty = %Empty.decl, .F = %F} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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:
+8 -5
View File
@@ -23,7 +23,10 @@ interface ForwardDeclared {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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:
@@ -34,7 +34,10 @@ interface Outer {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl, .Outer = %Outer.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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: <function> = 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:
@@ -22,7 +22,10 @@ fn F(T:! Empty) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Empty = %Empty.decl, .F = %F} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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:
+9 -5
View File
@@ -46,7 +46,11 @@ interface Class { }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = fn_decl @Function {} [template]
@@ -60,16 +64,16 @@ interface Class { }
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .F = <error>
// 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:
@@ -51,7 +51,11 @@ interface BeingDefined {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Undefined = %Undefined.decl, .Test = %Test, .BeingDefined = %BeingDefined.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = fn_decl @.1 {} [template]
// CHECK:STDOUT: %Test: <function> = 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:
@@ -22,7 +22,10 @@ fn F() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl, .F = %F} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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:
+10 -5
View File
@@ -36,7 +36,12 @@ protected interface Protected;
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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:
@@ -24,7 +24,9 @@ interface Interface {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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:
@@ -28,7 +28,9 @@ fn Interface.F() {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .Interface = %Interface.decl
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %Interface.decl = interface_decl @Interface {} [template = constants.%.1]
// CHECK:STDOUT: %.loc20: <function> = 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:
@@ -23,7 +23,10 @@ fn CallStatic(T:! Interface) {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Interface = %Interface.decl, .CallStatic = %CallStatic} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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:
@@ -19,7 +19,9 @@ interface I[]();
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.I = %I.decl} [template]
// CHECK:STDOUT: package: <namespace> = namespace {
// CHECK:STDOUT: .I = %I.decl
// CHECK:STDOUT: } [template]
// CHECK:STDOUT: %I.decl = interface_decl @I {} [template = constants.%.1]
// CHECK:STDOUT: }
// CHECK:STDOUT:
@@ -32,7 +32,10 @@ private interface Private {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Modifiers = %Modifiers.decl, .Private = %Private.decl} [template]
// CHECK:STDOUT: package: <namespace> = 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:
+21 -10
View File
@@ -43,7 +43,11 @@ var f: ForwardDeclared* = &f_ref.f;
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc7, .f_ref = %f_ref} [template]
// CHECK:STDOUT: package: <namespace> = 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: <function> = 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> = 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> = 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: