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

Stop special-casing empty structs. (#2849)

Browse Source 
This removes special-casing of empty structs, handling them as just a regular value instead of a builtin. Note the `{} as Type` is still special-cased.

In lowering, removes the test of calling a function using `{}` because it's missing the proper load/store. This setup notices that error whereas the prior worked due to said special-casing. Fixing this will need to be done as part of generally adding loads for variable uses.
This commit is contained in:
Jon Ross-Perkins
2023-05-26 10:33:17 -07:00
committed by GitHub
parent 1d56e165ef
commit 76151d1fff
13 changed files with 99 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/testdata/struct/empty.carbon
Vendored
+21 -7
View File
@@ -15,15 +15,23 @@
// CHECK:STDOUT: y,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyStructType,
// CHECK:STDOUT: node+0,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: nodeEmptyStruct, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+3, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: Assign, arg0: node+3, arg1: node+0, type: nodeEmptyStructType},
// 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: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -35,6 +43,12 @@
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
toolchain/semantics/testdata/struct/fail_assign_empty.carbon
Vendored
+5
View File
@@ -17,12 +17,15 @@
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+1,
// 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: ]
// CHECK:STDOUT: node_blocks: [
@@ -34,6 +37,8 @@
// CHECK:STDOUT: node+2,
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
toolchain/semantics/testdata/struct/fail_assign_to_empty.carbon
Vendored
+14 -10
View File
@@ -16,19 +16,21 @@
// CHECK:STDOUT: a,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyStructType,
// CHECK:STDOUT: node+0,
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeEmptyStructType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeEmptyStructType},
// 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+2, 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+5},
// CHECK:STDOUT: {kind: Assign, arg0: node+0, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: StructValue, arg0: block3, type: node+7},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -37,16 +39,18 @@
// CHECK:STDOUT: node+0,
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: node+2,
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]