carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 22:02:52 +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/function/call/empty_struct.carbon
Vendored
+13 -12
View File
@@ -5,7 +5,7 @@
// AUTOUPDATE
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: callables: [
// CHECK:STDOUT: {param_refs: block2, return_type: node+4},
// CHECK:STDOUT: {param_refs: block2, return_type: type1},
// CHECK:STDOUT: {param_refs: block0},
// CHECK:STDOUT: ]
// CHECK:STDOUT: integer_literals: [
@@ -20,23 +20,24 @@
// CHECK:STDOUT: types: [
// CHECK:STDOUT: node+0,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: node+10,
// 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: 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: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2, type: node+0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block4},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: nodeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: node+10},
// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: node+10},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0, type: node+4},
// CHECK:STDOUT: {kind: StructType, arg0: block0, type: typeTypeType},
// CHECK:STDOUT: {kind: StructValue, arg0: block0, type: type3},
// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type3},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0, type: type1},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+9, arg1: block5},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
toolchain/semantics/testdata/function/call/fail_param_count.carbon
Vendored
+19 -18
View File
@@ -29,34 +29,35 @@
// CHECK:STDOUT: Main,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block0},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+6, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+8, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+6, type: type1},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+8, type: type1},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str4, arg1: callable2},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+10, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str5, arg1: callable3},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+21, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+23, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+15, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+21, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+23, type: type1},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+12, arg1: block6},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
toolchain/semantics/testdata/function/call/fail_param_type.carbon
Vendored
+5 -4
View File
@@ -20,16 +20,17 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: nodeFloatingPointType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type2},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type2},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block4},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
toolchain/semantics/testdata/function/call/fail_return_type_mismatch.carbon
Vendored
+8 -7
View File
@@ -5,7 +5,7 @@
// AUTOUPDATE
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: callables: [
// CHECK:STDOUT: {param_refs: block0, return_type: nodeFloatingPointType},
// CHECK:STDOUT: {param_refs: block0, return_type: type0},
// CHECK:STDOUT: {param_refs: block0},
// CHECK:STDOUT: ]
// CHECK:STDOUT: integer_literals: [
@@ -20,18 +20,19 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeFloatingPointType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+1, type: type0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+0, arg1: block2},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable1},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Call, arg0: block0, arg1: callable0, type: nodeFloatingPointType},
// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: nodeInvalidType, type: nodeInvalidType},
// CHECK:STDOUT: {kind: VarStorage, type: type2},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+5, type: type2},
// CHECK:STDOUT: {kind: Call, arg0: block0, arg1: callable0, type: type0},
// CHECK:STDOUT: {kind: Assign, arg0: node+5, arg1: nodeInvalidType, type: typeInvalidType},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block3},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
toolchain/semantics/testdata/function/call/i32.carbon
Vendored
+11 -10
View File
@@ -5,7 +5,7 @@
// AUTOUPDATE
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: callables: [
// CHECK:STDOUT: {param_refs: block2, return_type: nodeIntegerType},
// CHECK:STDOUT: {param_refs: block2, return_type: type0},
// CHECK:STDOUT: {param_refs: block0},
// CHECK:STDOUT: ]
// CHECK:STDOUT: integer_literals: [
@@ -21,20 +21,21 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block4},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+6, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+10, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+6, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0, type: type0},
// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+10, type: type0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+5, arg1: block5},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
toolchain/semantics/testdata/function/call/more_param_ir.carbon
Vendored
+19 -18
View File
@@ -27,29 +27,30 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+4, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str4, arg1: callable1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+9, arg1: node+10, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+11, arg1: node+12, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+15, arg1: node+16, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+9, arg1: node+10, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+11, arg1: node+12, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+13, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0},
// CHECK:STDOUT: {kind: BinaryOperatorAdd, arg0: node+15, arg1: node+16, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+17, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+19, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block5, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+8, arg1: block4},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/call/params_one.carbon
Vendored
+5 -4
View File
@@ -20,15 +20,16 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block5, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block4},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/call/params_one_comma.carbon
Vendored
+7 -6
View File
@@ -21,18 +21,19 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block5, arg1: callable0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block4},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/call/params_two.carbon
Vendored
+9 -8
View File
@@ -22,19 +22,20 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block5, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block4},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/call/params_two_comma.carbon
Vendored
+13 -12
View File
@@ -24,24 +24,25 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str3, arg1: callable1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block5, arg1: callable0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: nodeIntegerType},
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: nodeIntegerType},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0},
// CHECK:STDOUT: {kind: Call, arg0: block6, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block4},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/call/params_zero.carbon
Vendored
+1
View File
@@ -17,6 +17,7 @@
// CHECK:STDOUT: Main,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0},
toolchain/semantics/testdata/function/definition/fail_param_name_conflict.carbon
Vendored
+5 -4
View File
@@ -17,12 +17,13 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/definition/order.carbon
Vendored
+1
View File
@@ -19,6 +19,7 @@
// CHECK:STDOUT: Baz,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0},
toolchain/semantics/testdata/function/definition/params_one.carbon
Vendored
+3 -2
View File
@@ -17,10 +17,11 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/definition/params_one_comma.carbon
Vendored
+3 -2
View File
@@ -17,10 +17,11 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/definition/params_two.carbon
Vendored
+5 -4
View File
@@ -18,12 +18,13 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/definition/params_two_comma.carbon
Vendored
+5 -4
View File
@@ -18,12 +18,13 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+2, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+4, arg1: block0},
// CHECK:STDOUT: ]
toolchain/semantics/testdata/function/definition/params_zero.carbon
Vendored
+1
View File
@@ -15,6 +15,7 @@
// CHECK:STDOUT: Foo,
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str0, arg1: callable0},
toolchain/semantics/testdata/function/definition/same_param_name.carbon
Vendored
+5 -4
View File
@@ -19,14 +19,15 @@
// CHECK:STDOUT: ]
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: nodeEmptyTupleType,
// CHECK:STDOUT: ]
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+0, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str1, arg1: callable0},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+2, arg1: block0},
// CHECK:STDOUT: {kind: VarStorage, type: nodeIntegerType},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: nodeIntegerType},
// CHECK:STDOUT: {kind: VarStorage, type: type0},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+4, type: type0},
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: str2, arg1: callable1},
// CHECK:STDOUT: {kind: FunctionDefinition, arg0: node+6, arg1: block0},
// CHECK:STDOUT: ]