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

Always create a StructType node for every syntactic struct type. (#3084)

Browse Source 
Don't elide the StructType node if we've already created an equivalent
type. Its spelling and location may be interesting to diagnostics,
tooling, debug information, etc.
This commit is contained in:
Richard Smith
2023-08-10 20:30:39 +00:00
committed by GitHub
parent 6cbf280a68
commit 9c516c40b9
6 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/testdata/struct/fail_type_assign.carbon
Vendored
+4 -1
View File
@@ -32,6 +32,7 @@ var x: {.a: i32} = {.a: i32};
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
@@ -44,6 +45,7 @@ var x: {.a: i32} = {.a: i32};
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
@@ -54,7 +56,8 @@ var x: {.a: i32} = {.a: i32};
// CHECK:STDOUT: ]
// CHECK:STDOUT:
// CHECK:STDOUT: package {
// CHECK:STDOUT: %.loc10: type = struct_type {.a: i32}
// CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32}
// CHECK:STDOUT: %x: {.a: i32} = var
// CHECK:STDOUT: %.loc10_28: type = struct_type {.a: i32}
// CHECK:STDOUT: assign %x, <error>
// CHECK:STDOUT: }
toolchain/semantics/testdata/struct/one_entry.carbon
Vendored
+5 -2
View File
@@ -37,9 +37,10 @@ var y: {.a: i32} = x;
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+10, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: node+2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+11, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+2},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -57,6 +58,7 @@ var y: {.a: i32} = x;
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: node+12,
// CHECK:STDOUT: node+13,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
@@ -79,6 +81,7 @@ var y: {.a: i32} = x;
// CHECK:STDOUT: %.loc7_24: i32 = stub_reference %.loc7_26
// CHECK:STDOUT: %.loc7_27: {.a: i32} = struct_value (%.loc7_24)
// CHECK:STDOUT: assign %x, %.loc7_27
// CHECK:STDOUT: %.loc8: type = struct_type {.a: i32}
// CHECK:STDOUT: %y: {.a: i32} = var
// CHECK:STDOUT: assign %y, %x
// CHECK:STDOUT: }
toolchain/semantics/testdata/struct/tuple_as_element.carbon
Vendored
+5 -2
View File
@@ -60,9 +60,10 @@ var y: {.a: i32, .b: (i32,)} = x;
// CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block8, type: type1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type2},
// CHECK:STDOUT: {kind: StructType, arg0: block7, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+23, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+23, arg1: node+7},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+24, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+24, arg1: node+7},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -92,6 +93,7 @@ var y: {.a: i32, .b: (i32,)} = x;
// CHECK:STDOUT: node+23,
// CHECK:STDOUT: node+24,
// CHECK:STDOUT: node+25,
// CHECK:STDOUT: node+26,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
@@ -137,6 +139,7 @@ var y: {.a: i32, .b: (i32,)} = x;
// CHECK:STDOUT: assign %x, %.loc7_50
// CHECK:STDOUT: %.loc8_23: type = stub_reference i32
// CHECK:STDOUT: %.loc8_27: (type,) = tuple_value (%.loc8_23)
// CHECK:STDOUT: %.loc8_28: type = struct_type {.a: i32, .b: (i32,)}
// CHECK:STDOUT: %y: {.a: i32, .b: (i32,)} = var
// CHECK:STDOUT: assign %y, %x
// CHECK:STDOUT: }
toolchain/semantics/testdata/struct/two_entries.carbon
Vendored
+5 -2
View File
@@ -44,9 +44,10 @@ var y: {.a: i32, .b: i32} = x;
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+11},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+15, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+15, arg1: node+3},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+16, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+16, arg1: node+3},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -68,6 +69,7 @@ var y: {.a: i32, .b: i32} = x;
// CHECK:STDOUT: node+15,
// CHECK:STDOUT: node+16,
// CHECK:STDOUT: node+17,
// CHECK:STDOUT: node+18,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
@@ -96,6 +98,7 @@ var y: {.a: i32, .b: i32} = x;
// CHECK:STDOUT: %.loc7_41: i32 = stub_reference %.loc7_43
// CHECK:STDOUT: %.loc7_44: {.a: i32, .b: i32} = struct_value (%.loc7_33, %.loc7_41)
// CHECK:STDOUT: assign %x, %.loc7_44
// CHECK:STDOUT: %.loc8: type = struct_type {.a: i32, .b: i32}
// CHECK:STDOUT: %y: {.a: i32, .b: i32} = var
// CHECK:STDOUT: assign %y, %x
// CHECK:STDOUT: }