Skip to content

[reflection] Go back to 0/1 for bitwise_takable instead of false/true #27735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2019
Merged

[reflection] Go back to 0/1 for bitwise_takable instead of false/true #27735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0569796
Revert "[reflection] Fix tests with bitwise_takable output"
jrose-apple Oct 16, 2019
ac21ee4
[reflection] Go back to 0/1 for bitwise_takable instead of false/true
jrose-apple Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/public/Reflection/TypeLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class PrintTypeInfo {
printField("alignment", std::to_string(TI.getAlignment()));
printField("stride", std::to_string(TI.getStride()));
printField("num_extra_inhabitants", std::to_string(TI.getNumExtraInhabitants()));
printField("bitwise_takable", TI.isBitwiseTakable() ? "true" : "false");
printField("bitwise_takable", TI.isBitwiseTakable() ? "1" : "0");
}

void printFields(const RecordTypeInfo &TI) {
Expand Down
964 changes: 482 additions & 482 deletions test/Reflection/typeref_lowering.swift
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions test/Reflection/typeref_lowering_imported.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@

12TypeLowering9HasCTypesV
// CHECK: (struct TypeLowering.HasCTypes)
// CHECK-NEXT: (struct size=40 alignment=8 stride=40 num_extra_inhabitants=0 bitwise_takable=true
// CHECK-NEXT: (struct size=40 alignment=8 stride=40 num_extra_inhabitants=0 bitwise_takable=1
// CHECK-NEXT: (field name=mcs offset=0
// CHECK-NEXT: (builtin size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=true))
// CHECK-NEXT: (builtin size=24 alignment=8 stride=24 num_extra_inhabitants=0 bitwise_takable=1))
// CHECK-NEXT: (field name=mce offset=24
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=true))
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1))
// CHECK-NEXT: (field name=mcu offset=32
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true)))
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1)))


12TypeLowering13AlsoHasCTypesV
// CHECK: (struct size=12 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=true
// CHECK: (struct size=12 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
// CHECK-NEXT: (field name=mcu offset=0
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true))
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))
// CHECK-NEXT: (field name=mcsbf offset=8
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=true)))
// CHECK-NEXT: (builtin size=4 alignment=4 stride=4 num_extra_inhabitants=0 bitwise_takable=1)))

14 changes: 7 additions & 7 deletions test/Reflection/typeref_lowering_objc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

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

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

12TypeLowering11HasObjCEnumV
// CHECK: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=2147483647 bitwise_takable=true
// CHECK: (struct size=24 alignment=8 stride=24 num_extra_inhabitants=2147483647 bitwise_takable=1
// CHECK-NEXT: (field name=optionalEnum offset=0
// CHECK-NEXT: (single_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=true
// CHECK-NEXT: (single_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
// CHECK-NEXT: (field name=some offset=0
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=true))))
// CHECK-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))
// CHECK-NEXT: (field name=reference offset=16
// CHECK-NEXT: (class_existential size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=true
// CHECK-NEXT: (class_existential size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1
// CHECK-NEXT: (field name=object offset=0
// CHECK-NEXT: (reference kind=strong refcounting=unknown)))))

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

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