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

Collapse names into VarStorage (#3116)

Browse Source 
This removes BindName, putting name information directly on VarStorage.
As a side-effect of updating semantics_ir_test for this change, I also
noted that function bodies were being generated as invalid YAML so am
fixing that (just `{}` to `[]` bracketing, otherwise the test wouldn't
work anymore).

Because names are now available, I've updated lowering to use them for
vars.

In the SemIR formatter, the name is now repeated because it's a
parameter to VarStorage. I believe this is just default behavior, and
we'd have to special-case VarStorage to remove it because it's automatic
argument printing in action. On the balance, it felt like letting it
print was reasonable.

I've noted in places that the name on VarStorage is expected to be
optional, but am not adding support because I'd have no way of testing
it at present.
This commit is contained in:
Jon Ross-Perkins
2023-08-22 18:55:31 +00:00
committed by GitHub
parent e05523db21
commit 2425e28e3a
166 changed files with 1381 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/semantics/testdata/array/assign_return_value.carbon
Vendored
+6 -8
View File
@@ -12,8 +12,8 @@ fn Run() {
// CHECK:STDOUT: cross_reference_irs_size: 1
// CHECK:STDOUT: functions: [
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: {block3}}},
// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block5}}},
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type2, body: [block3]},
// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block5]},
// CHECK:STDOUT: ]
// CHECK:STDOUT: integer_literals: [
// CHECK:STDOUT: 0,
@@ -53,11 +53,10 @@ fn Run() {
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+10, arg1: type1, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: type3},
// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type3},
// CHECK:STDOUT: {kind: Call, arg0: block0, arg1: function0, type: type2},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+14, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+15},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+13, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+14},
// CHECK:STDOUT: {kind: Return},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
@@ -91,7 +90,6 @@ fn Run() {
// CHECK:STDOUT: node+14,
// CHECK:STDOUT: node+15,
// CHECK:STDOUT: node+16,
// CHECK:STDOUT: node+17,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
@@ -116,7 +114,7 @@ fn Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %.loc10_16: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_17: type = array_type %.loc10_16, i32
// CHECK:STDOUT: %t: [i32; 1] = var
// CHECK:STDOUT: %t: [i32; 1] = var "t"
// CHECK:STDOUT: %.loc10_22.1: (i32,) = call @F()
// CHECK:STDOUT: %.loc10_22.2: [i32; 1] = array_value %.loc10_22.1
// CHECK:STDOUT: assign %t, %.loc10_22.2
toolchain/semantics/testdata/array/assign_var.carbon
Vendored
+14 -18
View File
@@ -26,7 +26,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+17,
// CHECK:STDOUT: node+16,
// CHECK:STDOUT: ]
// CHECK:STDOUT: type_blocks: [
// CHECK:STDOUT: [
@@ -47,22 +47,20 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type0},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type2},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+6, type: type2},
// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type2},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+10, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+9, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type1},
// CHECK:STDOUT: {kind: StubReference, arg0: node+11, type: type1},
// CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+14},
// CHECK:STDOUT: {kind: Assign, arg0: node+6, arg1: node+13},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type1},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+16, arg1: type1, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type3},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+18, type: type3},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+15, arg1: type1, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type3},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+18, arg1: node+20},
// CHECK:STDOUT: {kind: Assign, arg0: node+17, arg1: node+18},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -88,8 +86,6 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: node+17,
// CHECK:STDOUT: node+18,
// CHECK:STDOUT: node+19,
// CHECK:STDOUT: node+20,
// CHECK:STDOUT: node+21,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+0,
@@ -97,9 +93,9 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: node+2,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: node+13,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+12,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
@@ -110,7 +106,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (type, type, type)
// CHECK:STDOUT: %.loc7_22.2: (type, type, type) = tuple_value (%.loc7_9, %.loc7_14, %.loc7_19)
// CHECK:STDOUT: %.loc7_22.3: type = tuple_type (i32, i32, i32)
// CHECK:STDOUT: %a: (i32, i32, i32) = var
// CHECK:STDOUT: %a: (i32, i32, i32) = var "a"
// CHECK:STDOUT: %.loc7_27.1: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_27.2: i32 = stub_reference %.loc7_27.1
// CHECK:STDOUT: %.loc7_30.1: i32 = int_literal 2
@@ -121,7 +117,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: assign %a, %.loc7_34
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, i32
// CHECK:STDOUT: %b: [i32; 3] = var
// CHECK:STDOUT: %b: [i32; 3] = var "b"
// CHECK:STDOUT: %.loc7_5: [i32; 3] = array_value %a
// CHECK:STDOUT: assign %b, %.loc7_5
// CHECK:STDOUT: }
toolchain/semantics/testdata/array/base.carbon
Vendored
+35 -41
View File
@@ -29,13 +29,13 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: nodeFloatingPointType,
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: node+18,
// CHECK:STDOUT: node+22,
// CHECK:STDOUT: node+25,
// CHECK:STDOUT: node+38,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+16,
// CHECK:STDOUT: node+20,
// CHECK:STDOUT: node+23,
// CHECK:STDOUT: node+35,
// CHECK:STDOUT: ]
// CHECK:STDOUT: type_blocks: [
// CHECK:STDOUT: [
@@ -58,46 +58,43 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+7, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+8},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+6, type: type1},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: node+7},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+10, arg1: type3, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type4},
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+12, type: type4},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+9, arg1: type3, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type4},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type3},
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type3},
// CHECK:STDOUT: {kind: StubReference, arg0: node+12, type: type3},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real1, type: type3},
// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type3},
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type3},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type5},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+19, type: type4},
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+20},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+17, type: type4},
// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+18},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock2, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+24, arg1: type6, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type7},
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+26, type: type7},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+22, arg1: type6, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type7},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+28, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+25, type: type6},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+30, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+27, type: type6},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+32, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+29, type: type6},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+34, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+31, type: type6},
// CHECK:STDOUT: {kind: TupleValue, arg0: block0, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+36, type: type6},
// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type6},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock3, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type8},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+39, type: type7},
// CHECK:STDOUT: {kind: Assign, arg0: node+26, arg1: node+40},
// CHECK:STDOUT: {kind: ArrayValue, arg0: node+36, type: type7},
// CHECK:STDOUT: {kind: Assign, arg0: node+24, arg1: node+37},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -142,30 +139,27 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: node+36,
// CHECK:STDOUT: node+37,
// CHECK:STDOUT: node+38,
// CHECK:STDOUT: node+39,
// CHECK:STDOUT: node+40,
// CHECK:STDOUT: node+41,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+13,
// CHECK:STDOUT: node+15,
// CHECK:STDOUT: node+17,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+29,
// CHECK:STDOUT: node+31,
// CHECK:STDOUT: node+33,
// CHECK:STDOUT: node+35,
// CHECK:STDOUT: node+37,
// CHECK:STDOUT: node+26,
// CHECK:STDOUT: node+28,
// CHECK:STDOUT: node+30,
// CHECK:STDOUT: node+32,
// CHECK:STDOUT: node+34,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
// CHECK:STDOUT: package {
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a: [i32; 1] = var
// CHECK:STDOUT: %a: [i32; 1] = var "a"
// CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (i32)
@@ -174,7 +168,7 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: assign %a, %.loc7_22.3
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 2
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, f64
// CHECK:STDOUT: %b: [f64; 2] = var
// CHECK:STDOUT: %b: [f64; 2] = var "b"
// CHECK:STDOUT: %.loc8_20.1: f64 = real_literal 111e-1
// CHECK:STDOUT: %.loc8_20.2: f64 = stub_reference %.loc8_20.1
// CHECK:STDOUT: %.loc8_26.1: f64 = real_literal 22e-1
@@ -187,7 +181,7 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc9_10.2: () = tuple_value ()
// CHECK:STDOUT: %.loc9_13: i32 = int_literal 5
// CHECK:STDOUT: %.loc9_14: type = array_type %.loc9_13, ()
// CHECK:STDOUT: %c: [(); 5] = var
// CHECK:STDOUT: %c: [(); 5] = var "c"
// CHECK:STDOUT: %.loc9_20.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_20.2: () = stub_reference %.loc9_20.1
// CHECK:STDOUT: %.loc9_24.1: () = tuple_value ()
toolchain/semantics/testdata/array/fail_invalid_type.carbon
Vendored
+2 -4
View File
@@ -31,8 +31,7 @@ var a: [1; 1];
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+1, arg1: typeError, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+3, type: type1},
// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1},
// CHECK:STDOUT: ]
// CHECK:STDOUT: node_blocks: [
// CHECK:STDOUT: [
@@ -42,7 +41,6 @@ var a: [1; 1];
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: node+2,
// CHECK:STDOUT: node+3,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
@@ -50,5 +48,5 @@ var a: [1; 1];
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, <error>
// CHECK:STDOUT: %a: [<error>; 1] = var
// CHECK:STDOUT: %a: [<error>; 1] = var "a"
// CHECK:STDOUT: }
toolchain/semantics/testdata/array/fail_out_of_bound.carbon
Vendored
+9 -11
View File
@@ -26,7 +26,7 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: types: [
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: ]
// CHECK:STDOUT: type_blocks: [
// CHECK:STDOUT: [
@@ -38,14 +38,13 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type0},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int3, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+8, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+7, type: type0},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type2},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError},
@@ -66,19 +65,18 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: node+11,
// CHECK:STDOUT: node+12,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
// CHECK:STDOUT: package {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a: [i32; 1] = var
// CHECK:STDOUT: %a: [i32; 1] = var "a"
// CHECK:STDOUT: %.loc10_20.1: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_20.2: i32 = stub_reference %.loc10_20.1
// CHECK:STDOUT: %.loc10_23.1: i32 = int_literal 2
toolchain/semantics/testdata/array/fail_type_mismatch.carbon
Vendored
+7 -9
View File
@@ -26,7 +26,7 @@ var a: [i32; 2] = (1, 2.5);
// CHECK:STDOUT: nodeIntegerType,
// CHECK:STDOUT: node+1,
// CHECK:STDOUT: nodeFloatingPointType,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: ]
// CHECK:STDOUT: type_blocks: [
// CHECK:STDOUT: [
@@ -37,12 +37,11 @@ var a: [i32; 2] = (1, 2.5);
// CHECK:STDOUT: nodes: [
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
// CHECK:STDOUT: {kind: ArrayType, arg0: node+0, arg1: type0, type: typeTypeType},
// CHECK:STDOUT: {kind: VarStorage, type: type1},
// CHECK:STDOUT: {kind: BindName, arg0: str0, arg1: node+2, type: type1},
// CHECK:STDOUT: {kind: VarStorage, arg0: str0, type: type1},
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+4, type: type0},
// CHECK:STDOUT: {kind: StubReference, arg0: node+3, type: type0},
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type2},
// CHECK:STDOUT: {kind: StubReference, arg0: node+6, type: type2},
// CHECK:STDOUT: {kind: StubReference, arg0: node+5, type: type2},
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType},
// CHECK:STDOUT: {kind: TupleValue, arg0: block2, type: type3},
// CHECK:STDOUT: {kind: Assign, arg0: node+2, arg1: nodeError},
@@ -61,18 +60,17 @@ var a: [i32; 2] = (1, 2.5);
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: node+8,
// CHECK:STDOUT: node+9,
// CHECK:STDOUT: node+10,
// CHECK:STDOUT: ],
// CHECK:STDOUT: [
// CHECK:STDOUT: node+5,
// CHECK:STDOUT: node+7,
// CHECK:STDOUT: node+4,
// CHECK:STDOUT: node+6,
// CHECK:STDOUT: ],
// CHECK:STDOUT: ]
// CHECK:STDOUT:
// CHECK:STDOUT: package {
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 2
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a: [i32; 2] = var
// CHECK:STDOUT: %a: [i32; 2] = var "a"
// CHECK:STDOUT: %.loc10_20.1: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_20.2: i32 = stub_reference %.loc10_20.1
// CHECK:STDOUT: %.loc10_23.1: f64 = real_literal 25e-1