Skip to content

Commit 52f63a7

Browse files
rintarorintaro
authored
Merge pull request #27735 from jrose-apple/false-friend
[reflection] Go back to 0/1 for bitwise_takable instead of false/true
2 parents ad8a611 + ac21ee4 commit 52f63a7

35 files changed

+997
-997
lines changed

‎stdlib/public/Reflection/TypeLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class PrintTypeInfo {
7575
printField("alignment", std::to_string(TI.getAlignment()));
7676
printField("stride", std::to_string(TI.getStride()));
7777
printField("num_extra_inhabitants", std::to_string(TI.getNumExtraInhabitants()));
78-
printField("bitwise_takable", TI.isBitwiseTakable() ? "true" : "false");
78+
printField("bitwise_takable", TI.isBitwiseTakable() ? "1" : "0");
7979
}
8080

8181
void printFields(const RecordTypeInfo &TI) {

‎test/Reflection/typeref_lowering.swift

Lines changed: 482 additions & 482 deletions
Large diffs are not rendered by default.

‎test/Reflection/typeref_lowering_imported.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515

1616
12TypeLowering9HasCTypesV
1717
// CHECK: (struct TypeLowering.HasCTypes)
18-
// CHECK-NEXT: (struct size=40 alignment=8 stride=40 num_extra_inhabitants=0 bitwise_takable=true
18+
// CHECK-NEXT: (struct size=40 alignment=8 stride=40 num_extra_inhabitants=0 bitwise_takable=1
1919
// CHECK-NEXT: (field name=mcs offset=0
20-
// CHECK-NEXT: (builtin size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=true))
20+
// CHECK-NEXT: (builtin size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1))
2121
// CHECK-NEXT: (field name=mce offset=24
22-
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=true))
22+
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))
2323
// CHECK-NEXT: (field name=mcu offset=32
24-
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true)))
24+
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1)))
2525

2626

2727
12TypeLowering13AlsoHasCTypesV
28-
// CHECK: (struct size=12 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=true
28+
// CHECK: (struct size=12 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
2929
// CHECK-NEXT: (field name=mcu offset=0
30-
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true))
30+
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))
3131
// CHECK-NEXT: (field name=mcsbf offset=8
32-
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=true)))
32+
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1)))
3333

‎test/Reflection/typeref_lowering_objc.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
12TypeLowering14FunctionStructV
99
// CHECK: (struct TypeLowering.FunctionStruct)
10-
// CHECK-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=true
10+
// CHECK-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1
1111
// CHECK-NEXT: (field name=blockFunction offset=0
1212
// CHECK-NEXT: (reference kind=strong refcounting=unknown)))
1313

@@ -20,23 +20,23 @@
2020
// CHECK-NEXT: (reference kind=strong refcounting=unknown)
2121

2222
12TypeLowering11HasObjCEnumV
23-
// CHECK: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=2147483647 bitwise_takable=true
23+
// CHECK: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=2147483647 bitwise_takable=1
2424
// CHECK-NEXT: (field name=optionalEnum offset=0
25-
// CHECK-NEXT: (single_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=true
25+
// CHECK-NEXT: (single_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
2626
// CHECK-NEXT: (field name=some offset=0
27-
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true))))
27+
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
2828
// CHECK-NEXT: (field name=reference offset=16
29-
// CHECK-NEXT: (class_existential size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=true
29+
// CHECK-NEXT: (class_existential size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1
3030
// CHECK-NEXT: (field name=object offset=0
3131
// CHECK-NEXT: (reference kind=strong refcounting=unknown)))))
3232

3333
12TypeLowering22UnownedReferenceStructV
3434
// CHECK-64: (struct TypeLowering.UnownedReferenceStruct)
35-
// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=false
35+
// CHECK-64-NEXT: (struct size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=0
3636
// CHECK-64-NEXT: (field name=unownedRef offset=0
3737
// CHECK-64-NEXT: (reference kind=unowned refcounting=unknown)))
3838

3939
// CHECK-32: (struct TypeLowering.UnownedReferenceStruct)
40-
// CHECK-32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=4096 bitwise_takable=false
40+
// CHECK-32-NEXT: (struct size=4 alignment=4 stride=4 num_extra_inhabitants=4096 bitwise_takable=0
4141
// CHECK-32-NEXT: (field name=unownedRef offset=0
4242
// CHECK-32-NEXT: (reference kind=unowned refcounting=unknown)))

0 commit comments

Comments
 (0)