carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Distinguish between name IDs and string IDs in the type system. (#3341)

Browse Source 
Add a `NameId` that is effectively just a wrapper around a `StringId`,
with
some additional predefined values for names that don't correspond to
strings, such as the name of `self` or the function's return slot.
This commit is contained in:
Richard Smith
2023-11-09 16:51:36 +00:00
committed by GitHub
parent 84bc8cc4bf
commit 71aa4a45be
206 changed files with 1050 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/array/array_in_place.carbon
Vendored
+4 -4
View File
@@ -30,15 +30,15 @@ fn G() {
// CHECK:STDOUT: %.loc10_25: (type, type, type) = tuple_literal (i32, i32, i32)
// CHECK:STDOUT: %.loc10_28: i32 = int_literal 2
// CHECK:STDOUT: %.loc10_29: type = array_type %.loc10_28, (i32, i32, i32)
// CHECK:STDOUT: %v.var: ref [(i32, i32, i32); 2] = var "v"
// CHECK:STDOUT: %v: ref [(i32, i32, i32); 2] = bind_name "v", %v.var
// CHECK:STDOUT: %F.ref.loc10_34: <function> = name_reference "F", file.%F
// CHECK:STDOUT: %v.var: ref [(i32, i32, i32); 2] = var v
// CHECK:STDOUT: %v: ref [(i32, i32, i32); 2] = bind_name v, %v.var
// CHECK:STDOUT: %F.ref.loc10_34: <function> = name_reference F, file.%F
// CHECK:STDOUT: %.loc10_42.3: ref (i32, i32, i32) = splice_block %.loc10_42.2 {
// CHECK:STDOUT: %.loc10_42.1: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_42.2: ref (i32, i32, i32) = array_index %v.var, %.loc10_42.1
// CHECK:STDOUT: }
// CHECK:STDOUT: %.loc10_35: init (i32, i32, i32) = call %F.ref.loc10_34() to %.loc10_42.3
// CHECK:STDOUT: %F.ref.loc10_39: <function> = name_reference "F", file.%F
// CHECK:STDOUT: %F.ref.loc10_39: <function> = name_reference F, file.%F
// CHECK:STDOUT: %.loc10_42.6: ref (i32, i32, i32) = splice_block %.loc10_42.5 {
// CHECK:STDOUT: %.loc10_42.4: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_42.5: ref (i32, i32, i32) = array_index %v.var, %.loc10_42.4
toolchain/check/testdata/array/assign_return_value.carbon
Vendored
+3 -3
View File
@@ -33,9 +33,9 @@ fn Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %.loc10_16: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_17: type = array_type %.loc10_16, i32
// CHECK:STDOUT: %t.var: ref [i32; 1] = var "t"
// CHECK:STDOUT: %t: ref [i32; 1] = bind_name "t", %t.var
// CHECK:STDOUT: %F.ref: <function> = name_reference "F", file.%F
// CHECK:STDOUT: %t.var: ref [i32; 1] = var t
// CHECK:STDOUT: %t: ref [i32; 1] = bind_name t, %t.var
// CHECK:STDOUT: %F.ref: <function> = name_reference F, file.%F
// CHECK:STDOUT: %.loc10_22.1: init (i32,) = call %F.ref()
// CHECK:STDOUT: %.loc10_22.2: ref (i32,) = temporary_storage
// CHECK:STDOUT: %.loc10_22.3: ref (i32,) = temporary %.loc10_22.2, %.loc10_22.1
toolchain/check/testdata/array/assign_var.carbon
Vendored
+5 -5
View File
@@ -16,8 +16,8 @@ var b: [i32; 3] = a;
// CHECK:STDOUT:
// CHECK:STDOUT: file "assign_var.carbon" {
// CHECK:STDOUT: %.loc7_22: (type, type, type) = tuple_literal (i32, i32, i32)
// CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var "a"
// CHECK:STDOUT: %a: ref (i32, i32, i32) = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a
// CHECK:STDOUT: %a: ref (i32, i32, i32) = bind_name a, %a.var
// CHECK:STDOUT: %.loc7_27: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_30: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_33: i32 = int_literal 3
@@ -32,9 +32,9 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: assign %a.var, %.loc7_34.8
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, i32
// CHECK:STDOUT: %b.var: ref [i32; 3] = var "b"
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name "b", %b.var
// CHECK:STDOUT: %a.ref: ref (i32, i32, i32) = name_reference "a", %a
// CHECK:STDOUT: %b.var: ref [i32; 3] = var b
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name b, %b.var
// CHECK:STDOUT: %a.ref: ref (i32, i32, i32) = name_reference a, %a
// CHECK:STDOUT: %.loc8_19.1: ref i32 = tuple_access %a.ref, member0
// CHECK:STDOUT: %.loc8_19.2: i32 = bind_value %.loc8_19.1
// CHECK:STDOUT: %.loc8_19.3: i32 = int_literal 0
toolchain/check/testdata/array/base.carbon
Vendored
+6 -6
View File
@@ -21,8 +21,8 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: file "base.carbon" {
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var "a"
// CHECK:STDOUT: %a: ref [i32; 1] = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
// CHECK:STDOUT: %a: ref [i32; 1] = bind_name a, %a.var
// CHECK:STDOUT: %.loc7_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_22.1: (i32,) = tuple_literal (%.loc7_20)
// CHECK:STDOUT: %.loc7_22.2: i32 = int_literal 0
@@ -32,8 +32,8 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: assign %a.var, %.loc7_22.5
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 2
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, f64
// CHECK:STDOUT: %b.var: ref [f64; 2] = var "b"
// CHECK:STDOUT: %b: ref [f64; 2] = bind_name "b", %b.var
// CHECK:STDOUT: %b.var: ref [f64; 2] = var b
// CHECK:STDOUT: %b: ref [f64; 2] = bind_name b, %b.var
// CHECK:STDOUT: %.loc8_20: f64 = real_literal 111e-1
// CHECK:STDOUT: %.loc8_26: f64 = real_literal 22e-1
// CHECK:STDOUT: %.loc8_30.1: (f64, f64) = tuple_literal (%.loc8_20, %.loc8_26)
@@ -48,8 +48,8 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc9_10: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_13: i32 = int_literal 5
// CHECK:STDOUT: %.loc9_14: type = array_type %.loc9_13, ()
// CHECK:STDOUT: %c.var: ref [(); 5] = var "c"
// CHECK:STDOUT: %c: ref [(); 5] = bind_name "c", %c.var
// CHECK:STDOUT: %c.var: ref [(); 5] = var c
// CHECK:STDOUT: %c: ref [(); 5] = bind_name c, %c.var
// CHECK:STDOUT: %.loc9_20.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_24.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_28.1: () = tuple_literal ()
toolchain/check/testdata/array/fail_bound_overflow.carbon
Vendored
+2 -2
View File
@@ -12,6 +12,6 @@ var a: [1; 39999999999999999993];
// CHECK:STDOUT: file "fail_bound_overflow.carbon" {
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 39999999999999999993
// CHECK:STDOUT: %a.var: ref <error> = var "a"
// CHECK:STDOUT: %a: ref <error> = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref <error> = var a
// CHECK:STDOUT: %a: ref <error> = bind_name a, %a.var
// CHECK:STDOUT: }
toolchain/check/testdata/array/fail_incomplete_element.carbon
Vendored
+7 -7
View File
@@ -26,16 +26,16 @@ var p: Incomplete* = &a[0];
// CHECK:STDOUT: file "fail_incomplete_element.carbon" {
// CHECK:STDOUT: class_declaration @Incomplete, ()
// CHECK:STDOUT: %Incomplete: type = class_type @Incomplete
// CHECK:STDOUT: %Incomplete.ref.loc15: type = name_reference "Incomplete", %Incomplete
// CHECK:STDOUT: %Incomplete.ref.loc15: type = name_reference Incomplete, %Incomplete
// CHECK:STDOUT: %.loc15_21: i32 = int_literal 1
// CHECK:STDOUT: %.loc15_22: type = array_type %.loc15_21, Incomplete
// CHECK:STDOUT: %a.var: ref <error> = var "a"
// CHECK:STDOUT: %a: ref <error> = bind_name "a", %a.var
// CHECK:STDOUT: %Incomplete.ref.loc20: type = name_reference "Incomplete", %Incomplete
// CHECK:STDOUT: %a.var: ref <error> = var a
// CHECK:STDOUT: %a: ref <error> = bind_name a, %a.var
// CHECK:STDOUT: %Incomplete.ref.loc20: type = name_reference Incomplete, %Incomplete
// CHECK:STDOUT: %.loc20_18: type = ptr_type Incomplete
// CHECK:STDOUT: %p.var: ref Incomplete* = var "p"
// CHECK:STDOUT: %p: ref Incomplete* = bind_name "p", %p.var
// CHECK:STDOUT: %a.ref: ref <error> = name_reference "a", %a
// CHECK:STDOUT: %p.var: ref Incomplete* = var p
// CHECK:STDOUT: %p: ref Incomplete* = bind_name p, %p.var
// CHECK:STDOUT: %a.ref: ref <error> = name_reference a, %a
// CHECK:STDOUT: %.loc20_25: i32 = int_literal 0
// CHECK:STDOUT: %.loc20_22: <error>* = address_of <error>
// CHECK:STDOUT: assign %p.var, <error>
toolchain/check/testdata/array/fail_invalid_type.carbon
Vendored
+2 -2
View File
@@ -17,6 +17,6 @@ var a: [1; 1];
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, <error>
// CHECK:STDOUT: %a.var: ref [<error>; 1] = var "a"
// CHECK:STDOUT: %a: ref [<error>; 1] = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref [<error>; 1] = var a
// CHECK:STDOUT: %a: ref [<error>; 1] = bind_name a, %a.var
// CHECK:STDOUT: }
toolchain/check/testdata/array/fail_out_of_bound.carbon
Vendored
+2 -2
View File
@@ -17,8 +17,8 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: file "fail_out_of_bound.carbon" {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var "a"
// CHECK:STDOUT: %a: ref [i32; 1] = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
// CHECK:STDOUT: %a: ref [i32; 1] = bind_name a, %a.var
// CHECK:STDOUT: %.loc10_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_23: i32 = int_literal 2
// CHECK:STDOUT: %.loc10_26: i32 = int_literal 3
toolchain/check/testdata/array/fail_type_mismatch.carbon
Vendored
+14 -14
View File
@@ -41,8 +41,8 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: file "fail_type_mismatch.carbon" {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 3] = var "a"
// CHECK:STDOUT: %a: ref [i32; 3] = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref [i32; 3] = var a
// CHECK:STDOUT: %a: ref [i32; 3] = bind_name a, %a.var
// CHECK:STDOUT: %.loc10_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_23: String = string_literal "Hello"
// CHECK:STDOUT: %.loc10_32: String = string_literal "World"
@@ -52,13 +52,13 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %.loc10_39.4: init i32 = initialize_from %.loc10_20 to %.loc10_39.3
// CHECK:STDOUT: assign %a.var, <error>
// CHECK:STDOUT: %.loc12: (type, type, type) = tuple_literal (i32, String, String)
// CHECK:STDOUT: %t1.var: ref (i32, String, String) = var "t1"
// CHECK:STDOUT: %t1: ref (i32, String, String) = bind_name "t1", %t1.var
// CHECK:STDOUT: %t1.var: ref (i32, String, String) = var t1
// CHECK:STDOUT: %t1: ref (i32, String, String) = bind_name t1, %t1.var
// CHECK:STDOUT: %.loc16_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc16_15: type = array_type %.loc16_14, i32
// CHECK:STDOUT: %b.var: ref [i32; 3] = var "b"
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name "b", %b.var
// CHECK:STDOUT: %t1.ref: ref (i32, String, String) = name_reference "t1", %t1
// CHECK:STDOUT: %b.var: ref [i32; 3] = var b
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name b, %b.var
// CHECK:STDOUT: %t1.ref: ref (i32, String, String) = name_reference t1, %t1
// CHECK:STDOUT: %.loc16_19.1: ref i32 = tuple_access %t1.ref, member0
// CHECK:STDOUT: %.loc16_19.2: i32 = bind_value %.loc16_19.1
// CHECK:STDOUT: %.loc16_19.3: i32 = int_literal 0
@@ -68,19 +68,19 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: assign %b.var, <error>
// CHECK:STDOUT: %.loc21_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc21_15: type = array_type %.loc21_14, i32
// CHECK:STDOUT: %c.var: ref [i32; 3] = var "c"
// CHECK:STDOUT: %c: ref [i32; 3] = bind_name "c", %c.var
// CHECK:STDOUT: %c.var: ref [i32; 3] = var c
// CHECK:STDOUT: %c: ref [i32; 3] = bind_name c, %c.var
// CHECK:STDOUT: %.loc21_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc21_23: i32 = int_literal 2
// CHECK:STDOUT: %.loc21_24: (i32, i32) = tuple_literal (%.loc21_20, %.loc21_23)
// CHECK:STDOUT: assign %c.var, <error>
// CHECK:STDOUT: %.loc23: (type, type) = tuple_literal (i32, i32)
// CHECK:STDOUT: %t2.var: ref (i32, i32) = var "t2"
// CHECK:STDOUT: %t2: ref (i32, i32) = bind_name "t2", %t2.var
// CHECK:STDOUT: %t2.var: ref (i32, i32) = var t2
// CHECK:STDOUT: %t2: ref (i32, i32) = bind_name t2, %t2.var
// CHECK:STDOUT: %.loc27_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc27_15: type = array_type %.loc27_14, i32
// CHECK:STDOUT: %d.var: ref [i32; 3] = var "d"
// CHECK:STDOUT: %d: ref [i32; 3] = bind_name "d", %d.var
// CHECK:STDOUT: %t2.ref: ref (i32, i32) = name_reference "t2", %t2
// CHECK:STDOUT: %d.var: ref [i32; 3] = var d
// CHECK:STDOUT: %d: ref [i32; 3] = bind_name d, %d.var
// CHECK:STDOUT: %t2.ref: ref (i32, i32) = name_reference t2, %t2
// CHECK:STDOUT: assign %d.var, <error>
// CHECK:STDOUT: }
toolchain/check/testdata/array/function_param.carbon
Vendored
+3 -3
View File
@@ -24,8 +24,8 @@ fn G() -> i32 {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @F(%arr: [i32; 3], %i: i32) -> i32 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %arr.ref: [i32; 3] = name_reference "arr", %arr
// CHECK:STDOUT: %i.ref: i32 = name_reference "i", %i
// CHECK:STDOUT: %arr.ref: [i32; 3] = name_reference arr, %arr
// CHECK:STDOUT: %i.ref: i32 = name_reference i, %i
// CHECK:STDOUT: %.loc8_15.1: ref [i32; 3] = value_as_reference %arr.ref
// CHECK:STDOUT: %.loc8_15.2: ref i32 = array_index %.loc8_15.1, %i.ref
// CHECK:STDOUT: %.loc8_15.3: i32 = bind_value %.loc8_15.2
@@ -34,7 +34,7 @@ fn G() -> i32 {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @G() -> i32 {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %F.ref: <function> = name_reference "F", file.%F
// CHECK:STDOUT: %F.ref: <function> = name_reference F, file.%F
// CHECK:STDOUT: %.loc12_13: i32 = int_literal 1
// CHECK:STDOUT: %.loc12_16: i32 = int_literal 2
// CHECK:STDOUT: %.loc12_19: i32 = int_literal 3
toolchain/check/testdata/array/nine_elements.carbon
Vendored
+2 -2
View File
@@ -14,8 +14,8 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: file "nine_elements.carbon" {
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 9
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 9] = var "a"
// CHECK:STDOUT: %a: ref [i32; 9] = bind_name "a", %a.var
// CHECK:STDOUT: %a.var: ref [i32; 9] = var a
// CHECK:STDOUT: %a: ref [i32; 9] = bind_name a, %a.var
// CHECK:STDOUT: %.loc7_20: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_23: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_26: i32 = int_literal 3