Skip to content

Commit 295c8eb

Browse files
jonmeowjonmeow
authored
Change Namespace formatting to use the scope's name. (#3782)
This change only affects the generated IR, but I think it's cleaning up an existing issue with namespace name printing.
1 parent 28d76e6 commit 295c8eb

24 files changed

+136
-129
lines changed

‎toolchain/check/testdata/alias/fail_local_in_namespace.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ fn F() -> bool {
2828
// CHECK:STDOUT:
2929
// CHECK:STDOUT: file {
3030
// CHECK:STDOUT: package: <namespace> = namespace [template] {
31-
// CHECK:STDOUT: .NS = %.loc7
31+
// CHECK:STDOUT: .NS = %NS
3232
// CHECK:STDOUT: .F = %F
3333
// CHECK:STDOUT: }
34-
// CHECK:STDOUT: %.loc7: <namespace> = namespace [template] {}
34+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {}
3535
// CHECK:STDOUT: %F: <function> = fn_decl @F [template] {
3636
// CHECK:STDOUT: %return.var: ref bool = var <return slot>
3737
// CHECK:STDOUT: }
@@ -41,7 +41,7 @@ fn F() -> bool {
4141
// CHECK:STDOUT: !entry:
4242
// CHECK:STDOUT: %.loc16_16: bool = bool_literal false [template = constants.%.1]
4343
// CHECK:STDOUT: %.loc16_9: <error> = bind_alias <invalid>, <error> [template = <error>]
44-
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%.loc7 [template = file.%.loc7]
44+
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%NS [template = file.%NS]
4545
// CHECK:STDOUT: %a.ref: <error> = name_ref a, <error> [template = <error>]
4646
// CHECK:STDOUT: return <error>
4747
// CHECK:STDOUT: }

‎toolchain/check/testdata/alias/in_namespace.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ fn F() -> NS.a {
2121
// CHECK:STDOUT:
2222
// CHECK:STDOUT: file {
2323
// CHECK:STDOUT: package: <namespace> = namespace [template] {
24-
// CHECK:STDOUT: .NS = %.loc7
24+
// CHECK:STDOUT: .NS = %NS
2525
// CHECK:STDOUT: .F = %F
2626
// CHECK:STDOUT: }
27-
// CHECK:STDOUT: %.loc7: <namespace> = namespace [template] {
27+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {
2828
// CHECK:STDOUT: .a = %a
2929
// CHECK:STDOUT: }
3030
// CHECK:STDOUT: %a: type = bind_alias a, bool [template = bool]
31-
// CHECK:STDOUT: %NS.ref.loc10: <namespace> = name_ref NS, %.loc7 [template = %.loc7]
31+
// CHECK:STDOUT: %NS.ref.loc10: <namespace> = name_ref NS, %NS [template = %NS]
3232
// CHECK:STDOUT: %a.ref.loc10: type = name_ref a, %a [template = bool]
3333
// CHECK:STDOUT: %.loc10: bool = bool_literal false [template = constants.%.1]
3434
// CHECK:STDOUT: %b: bool = bind_name b, %.loc10
3535
// CHECK:STDOUT: %F: <function> = fn_decl @F [template] {
36-
// CHECK:STDOUT: %NS.ref.loc12: <namespace> = name_ref NS, %.loc7 [template = %.loc7]
36+
// CHECK:STDOUT: %NS.ref.loc12: <namespace> = name_ref NS, %NS [template = %NS]
3737
// CHECK:STDOUT: %a.ref.loc12: type = name_ref a, %a [template = bool]
3838
// CHECK:STDOUT: %return.var: ref bool = var <return slot>
3939
// CHECK:STDOUT: }

‎toolchain/check/testdata/index/fail_invalid_base.carbon‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ var d: i32 = {.a: i32, .b: i32}[0];
4343
// CHECK:STDOUT:
4444
// CHECK:STDOUT: file {
4545
// CHECK:STDOUT: package: <namespace> = namespace [template] {
46-
// CHECK:STDOUT: .N = %.loc11
46+
// CHECK:STDOUT: .N = %N
4747
// CHECK:STDOUT: .a = %a
4848
// CHECK:STDOUT: .F = %F
4949
// CHECK:STDOUT: .b = %b
5050
// CHECK:STDOUT: .c = %c
5151
// CHECK:STDOUT: .d = %d
5252
// CHECK:STDOUT: }
53-
// CHECK:STDOUT: %.loc11: <namespace> = namespace [template] {}
53+
// CHECK:STDOUT: %N: <namespace> = namespace [template] {}
5454
// CHECK:STDOUT: %a.var: ref i32 = var a
5555
// CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var
5656
// CHECK:STDOUT: %F: <function> = fn_decl @F [template] {}
@@ -66,7 +66,7 @@ var d: i32 = {.a: i32, .b: i32}[0];
6666
// CHECK:STDOUT:
6767
// CHECK:STDOUT: fn @__global_init() {
6868
// CHECK:STDOUT: !entry:
69-
// CHECK:STDOUT: %N.ref: <namespace> = name_ref N, file.%.loc11 [template = file.%.loc11]
69+
// CHECK:STDOUT: %N.ref: <namespace> = name_ref N, file.%N [template = file.%N]
7070
// CHECK:STDOUT: %.loc15: i32 = int_literal 0 [template = constants.%.1]
7171
// CHECK:STDOUT: assign file.%a.var, <error>
7272
// CHECK:STDOUT: %F.ref: <function> = name_ref F, file.%F [template = file.%F]

‎toolchain/check/testdata/namespace/add_to_import.carbon‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ var a: i32 = NS.A();
2222
// CHECK:STDOUT:
2323
// CHECK:STDOUT: file {
2424
// CHECK:STDOUT: package: <namespace> = namespace [template] {
25-
// CHECK:STDOUT: .NS = %.loc4
25+
// CHECK:STDOUT: .NS = %NS
2626
// CHECK:STDOUT: }
27-
// CHECK:STDOUT: %.loc4: <namespace> = namespace [template] {}
27+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {}
2828
// CHECK:STDOUT: }
2929
// CHECK:STDOUT:
3030
// CHECK:STDOUT: --- implicit.impl.carbon
@@ -35,11 +35,11 @@ var a: i32 = NS.A();
3535
// CHECK:STDOUT:
3636
// CHECK:STDOUT: file {
3737
// CHECK:STDOUT: package: <namespace> = namespace [template] {
38-
// CHECK:STDOUT: .NS = %.2
38+
// CHECK:STDOUT: .NS = %NS
3939
// CHECK:STDOUT: .a = %a
4040
// CHECK:STDOUT: }
4141
// CHECK:STDOUT: %import_ref: <namespace> = import_ref ir1, inst+1, used
42-
// CHECK:STDOUT: %.2: <namespace> = namespace %import_ref, [template] {
42+
// CHECK:STDOUT: %NS: <namespace> = namespace %import_ref, [template] {
4343
// CHECK:STDOUT: .A = %A
4444
// CHECK:STDOUT: }
4545
// CHECK:STDOUT: %A: <function> = fn_decl @A [template] {
@@ -57,7 +57,7 @@ var a: i32 = NS.A();
5757
// CHECK:STDOUT:
5858
// CHECK:STDOUT: fn @__global_init() {
5959
// CHECK:STDOUT: !entry:
60-
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%.2 [template = file.%.2]
60+
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%NS [template = file.%NS]
6161
// CHECK:STDOUT: %A.ref: <function> = name_ref A, file.%A [template = file.%A]
6262
// CHECK:STDOUT: %.loc6: init i32 = call %A.ref()
6363
// CHECK:STDOUT: assign file.%a.var, %.loc6

‎toolchain/check/testdata/namespace/alias.carbon‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ fn D() -> i32 { return C(); }
2424
// CHECK:STDOUT:
2525
// CHECK:STDOUT: file {
2626
// CHECK:STDOUT: package: <namespace> = namespace [template] {
27-
// CHECK:STDOUT: .NS = %.loc7
27+
// CHECK:STDOUT: .NS = %NS
2828
// CHECK:STDOUT: .ns = %ns
2929
// CHECK:STDOUT: .B = %B
3030
// CHECK:STDOUT: .C = %C
3131
// CHECK:STDOUT: .D = %D
3232
// CHECK:STDOUT: }
33-
// CHECK:STDOUT: %.loc7: <namespace> = namespace [template] {
33+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {
3434
// CHECK:STDOUT: .A = %A
3535
// CHECK:STDOUT: }
36-
// CHECK:STDOUT: %NS.ref.loc9: <namespace> = name_ref NS, %.loc7 [template = %.loc7]
37-
// CHECK:STDOUT: %ns: <namespace> = bind_alias ns, %.loc7 [template = %.loc7]
36+
// CHECK:STDOUT: %NS.ref.loc9: <namespace> = name_ref NS, %NS [template = %NS]
37+
// CHECK:STDOUT: %ns: <namespace> = bind_alias ns, %NS [template = %NS]
3838
// CHECK:STDOUT: %A: <function> = fn_decl @A [template] {
3939
// CHECK:STDOUT: %return.var.loc11: ref i32 = var <return slot>
4040
// CHECK:STDOUT: }
4141
// CHECK:STDOUT: %B: <function> = fn_decl @B [template] {
4242
// CHECK:STDOUT: %return.var.loc13: ref i32 = var <return slot>
4343
// CHECK:STDOUT: }
44-
// CHECK:STDOUT: %NS.ref.loc15: <namespace> = name_ref NS, %.loc7 [template = %.loc7]
44+
// CHECK:STDOUT: %NS.ref.loc15: <namespace> = name_ref NS, %NS [template = %NS]
4545
// CHECK:STDOUT: %A.ref: <function> = name_ref A, %A [template = %A]
4646
// CHECK:STDOUT: %C: <function> = bind_alias C, %A [template = %A]
4747
// CHECK:STDOUT: %D: <function> = fn_decl @D [template] {
@@ -57,7 +57,7 @@ fn D() -> i32 { return C(); }
5757
// CHECK:STDOUT:
5858
// CHECK:STDOUT: fn @B() -> i32 {
5959
// CHECK:STDOUT: !entry:
60-
// CHECK:STDOUT: %ns.ref: <namespace> = name_ref ns, file.%ns [template = file.%.loc7]
60+
// CHECK:STDOUT: %ns.ref: <namespace> = name_ref ns, file.%ns [template = file.%NS]
6161
// CHECK:STDOUT: %A.ref: <function> = name_ref A, file.%A [template = file.%A]
6262
// CHECK:STDOUT: %.loc13_28.1: init i32 = call %A.ref()
6363
// CHECK:STDOUT: %.loc13_30: i32 = value_of_initializer %.loc13_28.1

‎toolchain/check/testdata/namespace/fail_conflict_after_merge.carbon‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ fn NS();
4444
// CHECK:STDOUT:
4545
// CHECK:STDOUT: file {
4646
// CHECK:STDOUT: package: <namespace> = namespace [template] {
47-
// CHECK:STDOUT: .NS = %.loc4
47+
// CHECK:STDOUT: .NS = %NS
4848
// CHECK:STDOUT: }
49-
// CHECK:STDOUT: %.loc4: <namespace> = namespace [template] {}
49+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {}
5050
// CHECK:STDOUT: }
5151
// CHECK:STDOUT:
5252
// CHECK:STDOUT: --- fail_conflict.carbon
5353
// CHECK:STDOUT:
5454
// CHECK:STDOUT: file {
5555
// CHECK:STDOUT: package: <namespace> = namespace [template] {
56-
// CHECK:STDOUT: .NS = %.loc8_13.1
56+
// CHECK:STDOUT: .NS = %NS
5757
// CHECK:STDOUT: }
5858
// CHECK:STDOUT: %import_ref: <namespace> = import_ref ir1, inst+1, used
59-
// CHECK:STDOUT: %.loc8_13.1: <namespace> = namespace %import_ref, [template] {}
60-
// CHECK:STDOUT: %.loc8_13.2: <namespace> = namespace [template] {}
59+
// CHECK:STDOUT: %NS: <namespace> = namespace %import_ref, [template] {}
60+
// CHECK:STDOUT: %.loc8: <namespace> = namespace [template] {}
6161
// CHECK:STDOUT: %.loc16: <function> = fn_decl @.1 [template] {}
6262
// CHECK:STDOUT: %.loc20: <namespace> = namespace [template] {}
6363
// CHECK:STDOUT: %.loc28: <function> = fn_decl @.2 [template] {}

‎toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ fn NS.Foo();
3030
// CHECK:STDOUT:
3131
// CHECK:STDOUT: file {
3232
// CHECK:STDOUT: package: <namespace> = namespace [template] {
33-
// CHECK:STDOUT: .NS = %.loc4
33+
// CHECK:STDOUT: .NS = %NS
3434
// CHECK:STDOUT: }
35-
// CHECK:STDOUT: %.loc4: <namespace> = namespace [template] {}
35+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {}
3636
// CHECK:STDOUT: }
3737
// CHECK:STDOUT:
3838
// CHECK:STDOUT: --- fail_conflict.carbon
3939
// CHECK:STDOUT:
4040
// CHECK:STDOUT: file {
4141
// CHECK:STDOUT: package: <namespace> = namespace [template] {
42-
// CHECK:STDOUT: .NS = %.2
42+
// CHECK:STDOUT: .NS = %NS
4343
// CHECK:STDOUT: }
4444
// CHECK:STDOUT: %import_ref: <namespace> = import_ref ir1, inst+1, used
45-
// CHECK:STDOUT: %.2: <namespace> = namespace %import_ref, [template] {
45+
// CHECK:STDOUT: %NS: <namespace> = namespace %import_ref, [template] {
4646
// CHECK:STDOUT: .Foo = %Foo
4747
// CHECK:STDOUT: }
4848
// CHECK:STDOUT: %.loc12: <function> = fn_decl @.1 [template] {}

‎toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ fn NS.Bar() {}
3636
// CHECK:STDOUT:
3737
// CHECK:STDOUT: file {
3838
// CHECK:STDOUT: package: <namespace> = namespace [template] {
39-
// CHECK:STDOUT: .NS = %.loc4
39+
// CHECK:STDOUT: .NS = %NS
4040
// CHECK:STDOUT: }
41-
// CHECK:STDOUT: %.loc4: <namespace> = namespace [template] {
41+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {
4242
// CHECK:STDOUT: .Foo = %Foo
4343
// CHECK:STDOUT: }
4444
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo [template] {}
@@ -67,10 +67,10 @@ fn NS.Bar() {}
6767
// CHECK:STDOUT:
6868
// CHECK:STDOUT: file {
6969
// CHECK:STDOUT: package: <namespace> = namespace [template] {
70-
// CHECK:STDOUT: .NS = %.2
70+
// CHECK:STDOUT: .NS = %NS
7171
// CHECK:STDOUT: }
7272
// CHECK:STDOUT: %import_ref.1: <namespace> = import_ref ir1, inst+1, used
73-
// CHECK:STDOUT: %.2: <namespace> = namespace %import_ref.1, [template] {
73+
// CHECK:STDOUT: %NS: <namespace> = namespace %import_ref.1, [template] {
7474
// CHECK:STDOUT: .Foo = %import_ref.2
7575
// CHECK:STDOUT: .Bar = %Bar
7676
// CHECK:STDOUT: }

‎toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ fn NS.Bar() {}
5050
// CHECK:STDOUT:
5151
// CHECK:STDOUT: file {
5252
// CHECK:STDOUT: package: <namespace> = namespace [template] {
53-
// CHECK:STDOUT: .NS = %.loc10
53+
// CHECK:STDOUT: .NS = %NS
5454
// CHECK:STDOUT: }
55-
// CHECK:STDOUT: %.loc10: <namespace> = namespace [template] {
55+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {
5656
// CHECK:STDOUT: .Foo = %Foo
5757
// CHECK:STDOUT: }
5858
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo [template] {}
@@ -67,11 +67,11 @@ fn NS.Bar() {}
6767
// CHECK:STDOUT:
6868
// CHECK:STDOUT: file {
6969
// CHECK:STDOUT: package: <namespace> = namespace [template] {
70-
// CHECK:STDOUT: .NS = %.2
70+
// CHECK:STDOUT: .NS = %NS
7171
// CHECK:STDOUT: }
7272
// CHECK:STDOUT: %import_ref.1 = import_ref ir1, inst+1, unused
7373
// CHECK:STDOUT: %import_ref.2: <namespace> = import_ref ir2, inst+1, used
74-
// CHECK:STDOUT: %.2: <namespace> = namespace %import_ref.2, [template] {
74+
// CHECK:STDOUT: %NS: <namespace> = namespace %import_ref.2, [template] {
7575
// CHECK:STDOUT: .Foo = %import_ref.3
7676
// CHECK:STDOUT: .Bar = %Bar
7777
// CHECK:STDOUT: }

‎toolchain/check/testdata/namespace/fail_decl_in_alias.carbon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ fn ns.A() -> i32 { return 0; }
2525
// CHECK:STDOUT:
2626
// CHECK:STDOUT: file {
2727
// CHECK:STDOUT: package: <namespace> = namespace [template] {
28-
// CHECK:STDOUT: .NS = %.loc7
28+
// CHECK:STDOUT: .NS = %NS
2929
// CHECK:STDOUT: .ns = %ns
3030
// CHECK:STDOUT: }
31-
// CHECK:STDOUT: %.loc7: <namespace> = namespace [template] {}
32-
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, %.loc7 [template = %.loc7]
33-
// CHECK:STDOUT: %ns: <namespace> = bind_alias ns, %.loc7 [template = %.loc7]
31+
// CHECK:STDOUT: %NS: <namespace> = namespace [template] {}
32+
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, %NS [template = %NS]
33+
// CHECK:STDOUT: %ns: <namespace> = bind_alias ns, %NS [template = %NS]
3434
// CHECK:STDOUT: %.loc18: <function> = fn_decl @.1 [template] {
3535
// CHECK:STDOUT: %return.var: ref i32 = var <return slot>
3636
// CHECK:STDOUT: }

0 commit comments

Comments
 (0)