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

Switch types to a SemanticsTypeId. (#2854)

Browse Source 
This switches types to using SemanticsTypeId instead of SemanticsNodeId, and lowering pre-builds its list of types. The empty tuple type is special-cased because we don't want to emit it unless it's in-use, but as the implicit return for functions, it's frequently used. Callables use invalid to indicate the implicit return, and that seems undesirable to change due to the size increase.
This commit is contained in:
Jon Ross-Perkins
2023-05-26 11:19:49 -07:00
committed by GitHub
parent a2156f5a4b
commit 1497e1333d
71 changed files with 645 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/testdata/struct/empty.carbon
Vendored
+12 -12
View File
@@ -20,18 +20,18 @@
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+0},
// CHECK:STDOUT: {kind: VarStorage, type: node+0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: node+0},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+4},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+5, type: node+4},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+7},
// CHECK:STDOUT: {kind: VarStorage, type: node+7},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+9, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: node+2, type: node+0},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+5, type: type1},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type2},
// CHECK:STDOUT: {kind: VarStorage, type: type2},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+9, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+9, arg1: node+2, type: type0},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_assign_empty.carbon
Vendored
+7 -7
View File
@@ -20,13 +20,13 @@
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+4},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon
Vendored
+10 -10
View File
@@ -21,16 +21,16 @@
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+0},
// CHECK:STDOUT: {kind: VarStorage, type: node+0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: node+0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block3, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type1},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block3, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_field_name_mismatch.carbon
Vendored
+10 -10
View File
@@ -22,16 +22,16 @@
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_field_type_mismatch.carbon
Vendored
+10 -10
View File
@@ -23,16 +23,16 @@
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type2},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, type: type2},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type2},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_member_access_type.carbon
Vendored
+13 -13
View File
@@ -24,19 +24,19 @@
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: node+7},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+10, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: type2},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+10, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_non_member_access.carbon
Vendored
+13 -13
View File
@@ -23,19 +23,19 @@
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: node+7},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+10, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: type2},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+10, type: type0},
// CHECK:STDOUT: {kind: Assign, arg0: node+10, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_too_few_values.carbon
Vendored
+11 -11
View File
@@ -22,17 +22,17 @@
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: node+2},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+8},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_type_assign.carbon
Vendored
+7 -7
View File
@@ -19,13 +19,13 @@
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/fail_value_as_type.carbon
Vendored
+7 -7
View File
@@ -20,13 +20,13 @@
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block3, type: node+3},
// CHECK:STDOUT: {kind: VarStorage, type: nodeInvalidType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+5, type: nodeInvalidType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block3, type: type1},
// CHECK:STDOUT: {kind: VarStorage, type: typeInvalidType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+5, type: typeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/member_access.carbon
Vendored
+21 -21
View File
@@ -26,27 +26,27 @@
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: node+2},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+11},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+12, type: node+11},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+14, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructMemberAccess, arg0: node+3, arg1: member1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Assign, arg0: node+14, arg1: node+16, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+18, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+14, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type1},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: type2},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+12, type: type3},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+14, type: type1},
// CHECK:STDOUT: {kind: StructMemberAccess, arg0: node+3, arg1: member1, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+14, arg1: node+16, type: type1},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+18, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+14, type: type1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/one_entry.carbon
Vendored
+15 -15
View File
@@ -23,21 +23,21 @@
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: node+7},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+11},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: node+11},
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+2, type: node+1},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8, type: type2},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+2, type: type1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/struct/two_entries.carbon
Vendored
+20 -20
View File
@@ -25,26 +25,26 @@
// CHECK:STDOUT: node+16,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: node+2},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: node+11},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+12, type: node+11},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: nodeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: node+16},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+17, type: node+16},
// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: node+3, type: node+2},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+3, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block3, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+12, type: type2},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+17, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: node+3, type: type1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [