mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Collapse names into VarStorage (#3116)
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
+3
-3
@@ -13,9 +13,9 @@ fn And() -> bool {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}},
|
||||
// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: {block4, block5, block6}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]},
|
||||
// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: [block4, block5, block6]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: ]
|
||||
|
||||
+51
-59
@@ -24,7 +24,7 @@ fn Main() {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2, block8, block9, block10}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2, block8, block9, block10]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 12,
|
||||
@@ -53,10 +53,10 @@ fn Main() {
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: types: [
|
||||
// CHECK:STDOUT: nodeIntegerType,
|
||||
// CHECK:STDOUT: node+9,
|
||||
// CHECK:STDOUT: node+11,
|
||||
// CHECK:STDOUT: node+30,
|
||||
// CHECK:STDOUT: node+47,
|
||||
// CHECK:STDOUT: node+8,
|
||||
// CHECK:STDOUT: node+10,
|
||||
// CHECK:STDOUT: node+28,
|
||||
// CHECK:STDOUT: node+44,
|
||||
// CHECK:STDOUT: nodeBoolType,
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: type_blocks: [
|
||||
@@ -71,70 +71,66 @@ fn Main() {
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: nodes: [
|
||||
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type0},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int1, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+5},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+4},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: nodeIntegerType, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock0, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: TupleValue, arg0: block3, type: type1},
|
||||
// CHECK:STDOUT: {kind: TupleType, arg0: typeBlock1, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type2},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+12, type: type2},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type2},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int2, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, 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+16, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+14, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type2},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+12, arg1: node+18},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+11, arg1: node+16},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int4, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleIndex, arg0: node+12, arg1: node+20, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleIndex, arg0: node+11, arg1: node+18, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int5, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+21, arg1: node+22},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+19, arg1: node+20},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int6, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleIndex, arg0: node+12, arg1: node+24, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleIndex, arg0: node+11, arg1: node+22, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int7, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+25, arg1: node+26},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+23, arg1: node+24},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StructType, arg0: block5, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type3},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str3, arg1: node+31, type: type3},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str3, type: type3},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int8, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str1, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+30, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int9, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str2, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+36, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+33, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructValue, arg0: block7, type: type3},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+31, arg1: node+39},
|
||||
// CHECK:STDOUT: {kind: StructAccess, arg0: node+31, arg1: member0, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+29, arg1: node+36},
|
||||
// CHECK:STDOUT: {kind: StructAccess, arg0: node+29, arg1: member0, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int10, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+42},
|
||||
// CHECK:STDOUT: {kind: StructAccess, arg0: node+31, arg1: member1, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+38, arg1: node+39},
|
||||
// CHECK:STDOUT: {kind: StructAccess, arg0: node+29, arg1: member1, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int11, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+44, arg1: node+45},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+42},
|
||||
// CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type4},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str4, arg1: node+48, type: type4},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str4, type: type4},
|
||||
// CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type4},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+48, arg1: node+50},
|
||||
// CHECK:STDOUT: {kind: Dereference, arg0: node+48, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+45, arg1: node+46},
|
||||
// CHECK:STDOUT: {kind: Dereference, arg0: node+45, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int12, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+52, arg1: node+53},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+48, arg1: node+49},
|
||||
// CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type5},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block8, arg1: node+55},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block8, arg1: node+51},
|
||||
// CHECK:STDOUT: {kind: Branch, arg0: block9},
|
||||
// CHECK:STDOUT: {kind: AddressOf, arg0: node+1, type: type4},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+48},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+58},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+45},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block10, arg1: node+54},
|
||||
// CHECK:STDOUT: {kind: BlockArg, arg0: block10, type: type4},
|
||||
// CHECK:STDOUT: {kind: Dereference, arg0: node+61, type: type0},
|
||||
// CHECK:STDOUT: {kind: Dereference, arg0: node+57, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int13, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+62, arg1: node+63},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+58, arg1: node+59},
|
||||
// CHECK:STDOUT: {kind: Return},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: node_blocks: [
|
||||
@@ -174,11 +170,11 @@ fn Main() {
|
||||
// CHECK:STDOUT: node+28,
|
||||
// CHECK:STDOUT: node+29,
|
||||
// CHECK:STDOUT: node+30,
|
||||
// CHECK:STDOUT: node+31,
|
||||
// CHECK:STDOUT: node+32,
|
||||
// CHECK:STDOUT: node+33,
|
||||
// CHECK:STDOUT: node+35,
|
||||
// CHECK:STDOUT: node+36,
|
||||
// CHECK:STDOUT: node+37,
|
||||
// CHECK:STDOUT: node+38,
|
||||
// CHECK:STDOUT: node+39,
|
||||
// CHECK:STDOUT: node+40,
|
||||
@@ -195,44 +191,40 @@ fn Main() {
|
||||
// CHECK:STDOUT: node+51,
|
||||
// CHECK:STDOUT: node+52,
|
||||
// CHECK:STDOUT: node+53,
|
||||
// CHECK:STDOUT: node+54,
|
||||
// CHECK:STDOUT: node+55,
|
||||
// CHECK:STDOUT: node+56,
|
||||
// CHECK:STDOUT: node+57,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+6,
|
||||
// CHECK:STDOUT: node+7,
|
||||
// CHECK:STDOUT: node+8,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+13,
|
||||
// CHECK:STDOUT: node+15,
|
||||
// CHECK:STDOUT: node+17,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+28,
|
||||
// CHECK:STDOUT: node+29,
|
||||
// CHECK:STDOUT: node+26,
|
||||
// CHECK:STDOUT: node+27,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+31,
|
||||
// CHECK:STDOUT: node+34,
|
||||
// CHECK:STDOUT: node+37,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+32,
|
||||
// CHECK:STDOUT: node+35,
|
||||
// CHECK:STDOUT: node+38,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+59,
|
||||
// CHECK:STDOUT: node+55,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+54,
|
||||
// CHECK:STDOUT: node+56,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+57,
|
||||
// CHECK:STDOUT: node+58,
|
||||
// CHECK:STDOUT: node+59,
|
||||
// CHECK:STDOUT: node+60,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+61,
|
||||
// CHECK:STDOUT: node+62,
|
||||
// CHECK:STDOUT: node+63,
|
||||
// CHECK:STDOUT: node+64,
|
||||
// CHECK:STDOUT: node+65,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT:
|
||||
@@ -242,7 +234,7 @@ fn Main() {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn @Main() {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %a: i32 = var
|
||||
// CHECK:STDOUT: %a: i32 = var "a"
|
||||
// CHECK:STDOUT: %.loc8: i32 = int_literal 12
|
||||
// CHECK:STDOUT: assign %a, %.loc8
|
||||
// CHECK:STDOUT: %.loc9: i32 = int_literal -7
|
||||
@@ -252,7 +244,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: %.loc11_19.1: type = tuple_type (type, type)
|
||||
// CHECK:STDOUT: %.loc11_19.2: (type, type) = tuple_value (%.loc11_11, %.loc11_16)
|
||||
// CHECK:STDOUT: %.loc11_19.3: type = tuple_type (i32, i32)
|
||||
// CHECK:STDOUT: %b: (i32, i32) = var
|
||||
// CHECK:STDOUT: %b: (i32, i32) = var "b"
|
||||
// CHECK:STDOUT: %.loc11_24.1: i32 = int_literal 1
|
||||
// CHECK:STDOUT: %.loc11_24.2: i32 = stub_reference %.loc11_24.1
|
||||
// CHECK:STDOUT: %.loc11_27.1: i32 = int_literal 2
|
||||
@@ -268,7 +260,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: %.loc13_10: i32 = int_literal 4
|
||||
// CHECK:STDOUT: assign %.loc13_6, %.loc13_10
|
||||
// CHECK:STDOUT: %.loc15_27: type = struct_type {.a: i32, .b: i32}
|
||||
// CHECK:STDOUT: %c: {.a: i32, .b: i32} = var
|
||||
// CHECK:STDOUT: %c: {.a: i32, .b: i32} = var "c"
|
||||
// CHECK:STDOUT: %.loc15_37: i32 = int_literal 1
|
||||
// CHECK:STDOUT: %.loc15_35: i32 = stub_reference %.loc15_37
|
||||
// CHECK:STDOUT: %.loc15_45: i32 = int_literal 2
|
||||
@@ -282,7 +274,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: %.loc17_9: i32 = int_literal 4
|
||||
// CHECK:STDOUT: assign %.loc17_4, %.loc17_9
|
||||
// CHECK:STDOUT: %.loc19_13: type = ptr_type i32
|
||||
// CHECK:STDOUT: %p: i32* = var
|
||||
// CHECK:STDOUT: %p: i32* = var "p"
|
||||
// CHECK:STDOUT: %.loc19_17: i32* = address_of %a
|
||||
// CHECK:STDOUT: assign %p, %.loc19_17
|
||||
// CHECK:STDOUT: %.loc20_3: i32 = dereference %p
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ fn Main() -> i32 {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 12,
|
||||
|
||||
+42
-46
@@ -48,7 +48,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, body: {block2, block11, block12, block13, block14, block15, block16}}},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, body: [block2, block11, block12, block13, block14, block15, block16]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 1,
|
||||
@@ -83,7 +83,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: types: [
|
||||
// CHECK:STDOUT: nodeIntegerType,
|
||||
// CHECK:STDOUT: node+12,
|
||||
// CHECK:STDOUT: node+41,
|
||||
// CHECK:STDOUT: node+40,
|
||||
// CHECK:STDOUT: nodeBoolType,
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: type_blocks: [
|
||||
@@ -113,57 +113,55 @@ fn Main() {
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+16, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleValue, arg0: block4, type: type1},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+13, arg1: node+18},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type0},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str2, arg1: node+20, type: type0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str2, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int7, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+20, arg1: node+22},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+20, arg1: node+21},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+20, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+20, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleValue, arg0: block5, type: type1},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int8, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+27, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+26, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int9, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+29, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+28, type: type0},
|
||||
// CHECK:STDOUT: {kind: TupleValue, arg0: block6, type: type1},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+26, arg1: node+31},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+25, arg1: node+30},
|
||||
// CHECK:STDOUT: {kind: PointerType, arg0: type0, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: nodeIntegerType, arg1: node+33},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: nodeIntegerType, arg1: node+32},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int10, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+35, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+34, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int11, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+38, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+37, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructType, arg0: block7, type: typeTypeType},
|
||||
// CHECK:STDOUT: {kind: StructValue, arg0: block8, type: type2},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int12, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str3, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+43, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+42, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int13, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructTypeField, arg0: str4, arg1: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+46, type: type0},
|
||||
// CHECK:STDOUT: {kind: StubReference, arg0: node+45, type: type0},
|
||||
// CHECK:STDOUT: {kind: StructValue, arg0: block10, type: type2},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+42, arg1: node+49},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+41, arg1: node+48},
|
||||
// CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type3},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+51},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block11, arg1: node+50},
|
||||
// CHECK:STDOUT: {kind: Branch, arg0: block12},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int14, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int15, type: type0},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+53},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+54},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block13, arg1: node+55},
|
||||
// CHECK:STDOUT: {kind: BlockArg, arg0: block13, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int16, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+58, arg1: node+59},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type0},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str5, arg1: node+61, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+57, arg1: node+58},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str5, type: type0},
|
||||
// CHECK:STDOUT: {kind: BoolLiteral, arg0: true, type: type3},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block14, arg1: node+63},
|
||||
// CHECK:STDOUT: {kind: BranchIf, arg0: block14, arg1: node+61},
|
||||
// CHECK:STDOUT: {kind: Branch, arg0: block15},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+61},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+61},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+60},
|
||||
// CHECK:STDOUT: {kind: BranchWithArg, arg0: block16, arg1: node+60},
|
||||
// CHECK:STDOUT: {kind: BlockArg, arg0: block16, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int17, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+68, arg1: node+69},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+66, arg1: node+67},
|
||||
// CHECK:STDOUT: {kind: Return},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: node_blocks: [
|
||||
@@ -207,21 +205,20 @@ fn Main() {
|
||||
// CHECK:STDOUT: node+32,
|
||||
// CHECK:STDOUT: node+33,
|
||||
// CHECK:STDOUT: node+34,
|
||||
// CHECK:STDOUT: node+35,
|
||||
// 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: node+42,
|
||||
// CHECK:STDOUT: node+43,
|
||||
// CHECK:STDOUT: node+44,
|
||||
// CHECK:STDOUT: node+45,
|
||||
// CHECK:STDOUT: node+46,
|
||||
// CHECK:STDOUT: node+47,
|
||||
// CHECK:STDOUT: node+48,
|
||||
// CHECK:STDOUT: node+49,
|
||||
// CHECK:STDOUT: node+50,
|
||||
// CHECK:STDOUT: node+51,
|
||||
// CHECK:STDOUT: node+52,
|
||||
// CHECK:STDOUT: node+53,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+9,
|
||||
@@ -232,58 +229,57 @@ fn Main() {
|
||||
// CHECK:STDOUT: node+17,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+23,
|
||||
// CHECK:STDOUT: node+24,
|
||||
// CHECK:STDOUT: node+25,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+28,
|
||||
// CHECK:STDOUT: node+30,
|
||||
// CHECK:STDOUT: node+27,
|
||||
// CHECK:STDOUT: node+29,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+35,
|
||||
// CHECK:STDOUT: node+38,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+36,
|
||||
// CHECK:STDOUT: node+39,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+37,
|
||||
// CHECK:STDOUT: node+40,
|
||||
// CHECK:STDOUT: node+43,
|
||||
// CHECK:STDOUT: node+46,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+44,
|
||||
// CHECK:STDOUT: node+47,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+45,
|
||||
// CHECK:STDOUT: node+48,
|
||||
// CHECK:STDOUT: node+53,
|
||||
// CHECK:STDOUT: node+55,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+54,
|
||||
// CHECK:STDOUT: node+56,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+55,
|
||||
// CHECK:STDOUT: node+57,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+58,
|
||||
// CHECK:STDOUT: node+59,
|
||||
// CHECK:STDOUT: node+60,
|
||||
// CHECK:STDOUT: node+61,
|
||||
// CHECK:STDOUT: node+62,
|
||||
// CHECK:STDOUT: node+63,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+64,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+65,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+66,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+67,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+68,
|
||||
// CHECK:STDOUT: node+69,
|
||||
// CHECK:STDOUT: node+70,
|
||||
// CHECK:STDOUT: node+71,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT:
|
||||
@@ -314,7 +310,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: %.loc21_16.2: i32 = stub_reference %.loc21_16.1
|
||||
// CHECK:STDOUT: %.loc21_17: (i32, i32) = tuple_value (%.loc21_13.2, %.loc21_16.2)
|
||||
// CHECK:STDOUT: assign %.loc21_8.2, %.loc21_17
|
||||
// CHECK:STDOUT: %n: i32 = var
|
||||
// CHECK:STDOUT: %n: i32 = var "n"
|
||||
// CHECK:STDOUT: %.loc22: i32 = int_literal 0
|
||||
// CHECK:STDOUT: assign %n, %.loc22
|
||||
// CHECK:STDOUT: %.loc26_4: i32 = stub_reference %n
|
||||
@@ -355,7 +351,7 @@ fn Main() {
|
||||
// CHECK:STDOUT: %.loc38_4: i32 = block_arg !if.expr.result.loc38
|
||||
// CHECK:STDOUT: %.loc38_29: i32 = int_literal 3
|
||||
// CHECK:STDOUT: assign %.loc38_4, %.loc38_29
|
||||
// CHECK:STDOUT: %a: i32 = var
|
||||
// CHECK:STDOUT: %a: i32 = var "a"
|
||||
// CHECK:STDOUT: %.loc45_7: bool = bool_literal true
|
||||
// CHECK:STDOUT: if %.loc45_7 br !if.expr.then.loc45 else br !if.expr.else.loc45
|
||||
// CHECK:STDOUT:
|
||||
|
||||
@@ -13,7 +13,7 @@ fn Main() -> i32 {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 12,
|
||||
|
||||
+5
-7
@@ -14,7 +14,7 @@ fn Main() {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, body: [block2]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 3,
|
||||
@@ -34,12 +34,11 @@ fn Main() {
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: nodes: [
|
||||
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type0},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+1, type: type0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0},
|
||||
// CHECK:STDOUT: {kind: IntegerLiteral, arg0: int0, type: type0},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+3},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+2},
|
||||
// CHECK:STDOUT: {kind: RealLiteral, arg0: real0, type: type1},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+5},
|
||||
// CHECK:STDOUT: {kind: Assign, arg0: node+1, arg1: node+4},
|
||||
// CHECK:STDOUT: {kind: Return},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: node_blocks: [
|
||||
@@ -55,7 +54,6 @@ fn Main() {
|
||||
// CHECK:STDOUT: node+4,
|
||||
// CHECK:STDOUT: node+5,
|
||||
// CHECK:STDOUT: node+6,
|
||||
// CHECK:STDOUT: node+7,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT:
|
||||
@@ -65,7 +63,7 @@ fn Main() {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn @Main() {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %a: i32 = var
|
||||
// CHECK:STDOUT: %a: i32 = var "a"
|
||||
// CHECK:STDOUT: %.loc8: i32 = int_literal 3
|
||||
// CHECK:STDOUT: assign %a, %.loc8
|
||||
// CHECK:STDOUT: %.loc12: f64 = real_literal 56e-1
|
||||
|
||||
@@ -15,7 +15,7 @@ fn Main() -> i32 {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: 12,
|
||||
|
||||
+3
-3
@@ -13,9 +13,9 @@ fn Or() -> bool {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: {block2}}},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: {block3}}},
|
||||
// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: {block4, block5, block6}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block0, return_type: type0, body: [block2]},
|
||||
// CHECK:STDOUT: {name: str1, param_refs: block0, return_type: type0, body: [block3]},
|
||||
// CHECK:STDOUT: {name: str2, param_refs: block0, return_type: type0, body: [block4, block5, block6]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: ]
|
||||
|
||||
+6
-8
@@ -10,7 +10,7 @@ fn Not(b: bool) -> bool {
|
||||
|
||||
// CHECK:STDOUT: cross_reference_irs_size: 1
|
||||
// CHECK:STDOUT: functions: [
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: {block4}}},
|
||||
// CHECK:STDOUT: {name: str0, param_refs: block2, return_type: type0, body: [block4]},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: integer_literals: [
|
||||
// CHECK:STDOUT: ]
|
||||
@@ -26,28 +26,26 @@ fn Not(b: bool) -> bool {
|
||||
// CHECK:STDOUT: type_blocks: [
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: nodes: [
|
||||
// CHECK:STDOUT: {kind: VarStorage, type: type0},
|
||||
// CHECK:STDOUT: {kind: BindName, arg0: str1, arg1: node+0, type: type0},
|
||||
// CHECK:STDOUT: {kind: VarStorage, arg0: str1, type: type0},
|
||||
// CHECK:STDOUT: {kind: FunctionDeclaration, arg0: function0},
|
||||
// CHECK:STDOUT: {kind: UnaryOperatorNot, arg0: node+0, type: type0},
|
||||
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+3},
|
||||
// CHECK:STDOUT: {kind: ReturnExpression, arg0: node+2},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: node_blocks: [
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+0,
|
||||
// CHECK:STDOUT: node+1,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+0,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+1,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+2,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: [
|
||||
// CHECK:STDOUT: node+3,
|
||||
// CHECK:STDOUT: node+4,
|
||||
// CHECK:STDOUT: ],
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT:
|
||||
|
||||
Reference in New Issue
Block a user