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

Remove the type field from semantics nodes that don't produce values of that type. (#3049)

Browse Source 
For `Assign` and `ReturnExpression`, this field wasn't used for
anything. For `StructTypeField`, we stored the type of the field here,
and now store it as an argument of the node instead.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Richard Smith
2023-08-02 17:30:27 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent ab709b4117
commit 0c33dead70
71 changed files with 170 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/testdata/return/code_after_return.carbon
Vendored
+1 -1
View File
@@ -30,7 +30,7 @@
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+4, arg1: node+5, type: type0},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6, type: type0},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+6},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/return/code_after_return_value.carbon
Vendored
+2 -2
View File
@@ -30,13 +30,13 @@
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3, type: type1},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1},
// CHECK:STDOUT: {kind: BlockArg, arg0: unreachable, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+9, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: node+9},
// CHECK:STDOUT: {kind: BoolLiteral, arg0: false, type: type0},
// CHECK:STDOUT: {kind: UnaryOperatorNot, arg0: node+0, type: type0},
// CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type0},
toolchain/semantics/testdata/return/fail_type_mismatch.carbon
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: nodeError, type: typeError},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: nodeError},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/return/fail_value_disallowed.carbon
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: type0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/return/struct.carbon
Vendored
+3 -3
View File
@@ -23,14 +23,14 @@
// CHECK:STDOUT: type_blocks: [
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
// CHECK:STDOUT: {kind: StructType, arg0: block2, type: typeTypeType},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, type: type0},
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0},
// CHECK:STDOUT: {kind: StructValue, arg0: block5, type: type1},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+6, type: type1},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+6},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/return/tuple.carbon
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1},
// CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type2},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+10, type: type2},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+10},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
toolchain/semantics/testdata/return/value.carbon
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: type0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [