Skip to content

Commit 35dad11

Browse files
tbkkatbkka
authored
Fix reflection_Optional_Any to support non-Apple platforms (swiftlang#35546)
* Fix reflection_Optional_Any to support non-Apple platforms Apple and non-Apple platforms happen to use different number of extra inhabitants in 64-bit pointers. This is already supported by the test framework, we just need to fill it in properly for this one test. * Remove OS= restriction
1 parent a69bf4e commit 35dad11

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

‎validation-test/Reflection/reflect_Optional_Any.swift‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
// RUN: %target-build-swift -g -lswiftSwiftReflectionTest %s -o %t/reflect_Optional_Any
55
// RUN: %target-codesign %t/reflect_Optional_Any
66

7-
// RUN: %target-run %target-swift-reflection-test %t/reflect_Optional_Any | %FileCheck %s --check-prefix=CHECK-%target-ptrsize
7+
// RUN: %target-run %target-swift-reflection-test %t/reflect_Optional_Any | %FileCheck %s --check-prefix=CHECK-%target-ptrsize %add_num_extra_inhabitants
88

99
// REQUIRES: reflection_test_support
1010
// REQUIRES: executable_test
11-
// REQUIRES: OS=macosx || OS=tvos || OS=watchos || OS=ios
1211
// UNSUPPORTED: use_os_stdlib
1312

1413
import SwiftReflectionTest
@@ -31,11 +30,11 @@ reflect(enum: optionalAnyNonNil)
3130
// CHECK-64: (protocol_composition))
3231

3332
// CHECK-64: Type info:
34-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483646 bitwise_takable=1
33+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-1]] bitwise_takable=1
3534
// CHECK-64: (case name=some index=0 offset=0
36-
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
35+
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1
3736
// CHECK-64: (field name=metadata offset=24
38-
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
37+
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1))))
3938
// CHECK-64: (case name=none index=1))
4039

4140
// CHECK-64: Mangled name: $sypSg
@@ -80,11 +79,11 @@ reflect(enum: optionalAnyNil)
8079
// CHECK-64: (protocol_composition))
8180

8281
// CHECK-64: Type info:
83-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483646 bitwise_takable=1
82+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-1]] bitwise_takable=1
8483
// CHECK-64: (case name=some index=0 offset=0
85-
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
84+
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1
8685
// CHECK-64: (field name=metadata offset=24
87-
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
86+
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1))))
8887
// CHECK-64: (case name=none index=1))
8988

9089
// CHECK-64: Mangled name: $sypSg
@@ -127,13 +126,13 @@ reflect(enum: optionalOptionalAnyNil)
127126
// CHECK-64: (protocol_composition)))
128127

129128
// CHECK-64: Type info:
130-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483645 bitwise_takable=1
129+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-2]] bitwise_takable=1
131130
// CHECK-64: (case name=some index=0 offset=0
132-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483646 bitwise_takable=1
131+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-1]] bitwise_takable=1
133132
// CHECK-64: (case name=some index=0 offset=0
134-
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
133+
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1
135134
// CHECK-64: (field name=metadata offset=24
136-
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
135+
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1))))
137136
// CHECK-64: (case name=none index=1)))
138137
// CHECK-64: (case name=none index=1))
139138

@@ -180,13 +179,13 @@ reflect(enum: optionalOptionalAnySomeNil)
180179
// CHECK-64: (protocol_composition)))
181180

182181
// CHECK-64: Type info:
183-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483645 bitwise_takable=1
182+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-2]] bitwise_takable=1
184183
// CHECK-64: (case name=some index=0 offset=0
185-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483646 bitwise_takable=1
184+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-1]] bitwise_takable=1
186185
// CHECK-64: (case name=some index=0 offset=0
187-
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
186+
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1
188187
// CHECK-64: (field name=metadata offset=24
189-
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
188+
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1))))
190189
// CHECK-64: (case name=none index=1)))
191190
// CHECK-64: (case name=none index=1))
192191

@@ -239,13 +238,13 @@ reflect(enum: optionalOptionalAnyNonNil)
239238
// CHECK-64: (protocol_composition)))
240239

241240
// CHECK-64: Type info:
242-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483645 bitwise_takable=1
241+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-2]] bitwise_takable=1
243242
// CHECK-64: (case name=some index=0 offset=0
244-
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=2147483646 bitwise_takable=1
243+
// CHECK-64: (single_payload_enum size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit-1]] bitwise_takable=1
245244
// CHECK-64: (case name=some index=0 offset=0
246-
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=2147483647 bitwise_takable=1
245+
// CHECK-64: (opaque_existential size=32 alignment=8 stride=32 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1
247246
// CHECK-64: (field name=metadata offset=24
248-
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=2147483647 bitwise_takable=1))))
247+
// CHECK-64: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=[[#num_extra_inhabitants_64bit]] bitwise_takable=1))))
249248
// CHECK-64: (case name=none index=1)))
250249
// CHECK-64: (case name=none index=1))
251250

0 commit comments

Comments
 (0)