Skip to content

Commit c33c14d

Browse files
tbkkatbkka
committed
Generalize tests to work on 32 bit
1 parent 4f2d5f3 commit c33c14d

7 files changed

+62
-69
lines changed

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic2.swift

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,43 @@ case b(U)
2020

2121
reflect(enum: SimplePayload1<ClassTypeA, Void>.a(ClassTypeA()))
2222

23-
// X64: Reflecting an enum.
24-
// X64-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
25-
// X64-NEXT: Type reference:
26-
// X64-NEXT: (bound_generic_enum reflect_Enum_MultiPayload_generic2.SimplePayload1
27-
// X64-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
28-
// X64-NEXT: (tuple))
23+
// CHECK: Reflecting an enum.
24+
// CHECK-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
25+
// CHECK-NEXT: Type reference:
26+
// CHECK-NEXT: (bound_generic_enum reflect_Enum_MultiPayload_generic2.SimplePayload1
27+
// CHECK-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
28+
// CHECK-NEXT: (tuple))
2929

3030
// MemoryLayout<SimplePayload1<ClassTypeA, Void>> gives 9,8,16
3131
// SimplePayload1 is a BoundGenericTypeRef
3232
// It's getting laid out as a tagged MPE, not as an SPE
3333
// (an SPE would use the XIs of the ptr) XXXXXX OR WOULD IT??? Hmmmmm....
3434

35-
// X64: Type info:
35+
// CHECK: Type info:
3636
// X64-NEXT: (multi_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=254 bitwise_takable=1
3737
// X64-NEXT: (case name=a index=0 offset=0
3838
// X64-NEXT: (reference kind=strong refcounting=native))
3939
// X64-NEXT: (case name=b index=1 offset=0
4040
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
41-
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic214SimplePayload1OyAA10ClassTypeACytG
42-
// X64-NEXT: Demangled name: reflect_Enum_MultiPayload_generic2.SimplePayload1<reflect_Enum_MultiPayload_generic2.ClassTypeA, ()>
4341

44-
// X64: Enum value:
45-
// X64-NEXT: (enum_value name=a index=0
46-
// X64-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
47-
// X64-NEXT: )
42+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic214SimplePayload1OyAA10ClassTypeACytG
43+
// CHECK-NEXT: Demangled name: reflect_Enum_MultiPayload_generic2.SimplePayload1<reflect_Enum_MultiPayload_generic2.ClassTypeA, ()>
4844

49-
// X32: FAIL
45+
// CHECK: Enum value:
46+
// CHECK-NEXT: (enum_value name=a index=0
47+
// CHECK-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
48+
// CHECK-NEXT: )
5049

5150
reflect(enum: SimplePayload1<ClassTypeA, Void>.b(()))
5251

53-
// X64: Reflecting an enum.
54-
// X64-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
55-
// X64-NEXT: Type reference:
56-
// X64-NEXT: (bound_generic_enum reflect_Enum_MultiPayload_generic2.SimplePayload1
57-
// X64-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
58-
// X64-NEXT: (tuple))
52+
// CHECK: Reflecting an enum.
53+
// CHECK-NEXT: Instance pointer in child address space: 0x{{[0-9a-fA-F]+}}
54+
// CHECK-NEXT: Type reference:
55+
// CHECK-NEXT: (bound_generic_enum reflect_Enum_MultiPayload_generic2.SimplePayload1
56+
// CHECK-NEXT: (class reflect_Enum_MultiPayload_generic2.ClassTypeA)
57+
// CHECK-NEXT: (tuple))
5958

60-
// X64: Type info:
59+
// CHECK: Type info:
6160
// X64-NEXT: (multi_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=254 bitwise_takable=1
6261
// X64-NEXT: (case name=a index=0 offset=0
6362
// X64-NEXT: (reference kind=strong refcounting=native))
@@ -66,12 +65,10 @@ reflect(enum: SimplePayload1<ClassTypeA, Void>.b(()))
6665
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic214SimplePayload1OyAA10ClassTypeACytG
6766
// X64-NEXT: Demangled name: reflect_Enum_MultiPayload_generic2.SimplePayload1<reflect_Enum_MultiPayload_generic2.ClassTypeA, ()>
6867

69-
// X64: Enum value:
70-
// X64-NEXT: (enum_value name=b index=1
71-
// X64-NEXT: (tuple)
72-
// X64-NEXT: )
73-
74-
// X32: FAIL
68+
// CHECK: Enum value:
69+
// CHECK-NEXT: (enum_value name=b index=1
70+
// CHECK-NEXT: (tuple)
71+
// CHECK-NEXT: )
7572

7673
doneReflecting()
7774

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic3.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
3939
// MemoryLayout<StructWithEnumDepth0<Int>>.size => 10
4040
// MemoryLayout<StructWithEnumDepth0<Int>?>.size => 11
4141

42-
// X64: Type info:
42+
// CHECK: Type info:
4343
// X64-NEXT: (single_payload_enum size=11 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
4444
// X64-NEXT: (case name=some index=0 offset=0
4545
// X64-NEXT: (struct size=10 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
@@ -55,10 +55,9 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
5555
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))))
5656
// X64-NEXT: (case name=none index=1)))))
5757
// X64-NEXT: (case name=none index=1))
58-
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic3010StructWithB6Depth0VySiGSg
59-
// X64-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic3.StructWithEnumDepth0<Swift.Int>>
6058

61-
// X32: FAIL
59+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic3010StructWithB6Depth0VySiGSg
60+
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic3.StructWithEnumDepth0<Swift.Int>>
6261

6362
// CHECK: Enum value:
6463
// CHECK-NEXT: (enum_value name=none index=1)

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic4.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
3737
// MemoryLayout<> on ARM64 macOS gives 9,8,16 as the sizes of both SWED0<Int>? and SWED0<Int>.E
3838
// from that, we can infer that SWED0<Int>.E must have a non-zero number of extra inhabitants
3939

40-
// X64: Type info:
40+
// CHECK: Type info:
4141
// X64-NEXT: (single_payload_enum size=9 alignment=8 stride=16 num_extra_inhabitants=252 bitwise_takable=1
4242
// X64-NEXT: (case name=some index=0 offset=0
4343
// X64-NEXT: (struct size=9 alignment=8 stride=16 num_extra_inhabitants=253 bitwise_takable=1
@@ -55,10 +55,9 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
5555
// X64-NEXT: (builtin size=8 alignment=8 stride=8 num_extra_inhabitants=0 bitwise_takable=1))))))
5656
// X64-NEXT: (case name=none index=1)))))
5757
// X64-NEXT: (case name=none index=1))
58-
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic4010StructWithB6Depth0VySiGSg
59-
// X64-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic4.StructWithEnumDepth0<Swift.Int>>
6058

61-
// X32: FAIL
59+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic4010StructWithB6Depth0VySiGSg
60+
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic4.StructWithEnumDepth0<Swift.Int>>
6261

6362
// CHECK: Enum value:
6463
// CHECK-NEXT: (enum_value name=none index=1)

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic5.swift

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
3434
// MemoryLayout<StructWithEnumDepth0<Int>>.size => 10
3535
// MemoryLayout<StructWithEnumDepth0<Int>?>.size => 11
3636

37-
// X64: Type info:
37+
// CHECK: Type info:
3838
// X64-NEXT: (single_payload_enum size=11 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
3939
// X64-NEXT: (case name=some index=0 offset=0
4040
// X64-NEXT: (struct size=10 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
@@ -50,10 +50,9 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
5050
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))))
5151
// X64-NEXT: (case name=none index=1)))))
5252
// X64-NEXT: (case name=none index=1))
53-
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic5010StructWithB6Depth0VySiGSg
54-
// X64-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic5.StructWithEnumDepth0<Swift.Int>>
5553

56-
// X32: FAIL
54+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic5010StructWithB6Depth0VySiGSg
55+
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic5.StructWithEnumDepth0<Swift.Int>>
5756

5857
// CHECK: Enum value:
5958
// CHECK-NEXT: (enum_value name=none index=1)

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic6.swift

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
4242
// The TR for E is not a BoundGenericTypeRef
4343
// The compiler is not providing a BuiltinTypeInfo
4444

45-
// X64: Type info:
45+
// CHECK: Type info:
4646
// X64-NEXT: (single_payload_enum size=11 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
4747
// X64-NEXT: (case name=some index=0 offset=0
4848
// X64-NEXT: (struct size=10 alignment=8 stride=16 num_extra_inhabitants=0 bitwise_takable=1
@@ -64,17 +64,18 @@ reflect(enum: StructWithEnumDepth0<Int>?.none)
6464
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))))
6565
// X64-NEXT: (case name=none index=1)))))
6666
// X64-NEXT: (case name=none index=1))
67-
// X64-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic6010StructWithB6Depth0VySiGSg
68-
// X64-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic6.StructWithEnumDepth0<Swift.Int>>
6967

70-
// X32: FAIL
68+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic6010StructWithB6Depth0VySiGSg
69+
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic6.StructWithEnumDepth0<Swift.Int>>
7170

7271
// CHECK: Enum value:
7372
// CHECK-NEXT: (enum_value name=none index=1)
7473

7574
let example = StructWithEnumDepth0<Int>(e: StructWithEnumDepth0<Int>.E.w(17))
7675
reflect(enum: example as StructWithEnumDepth0<Int>?)
7776

77+
// CHECK: Reflecting an enum.
78+
// CHECK: Type info:
7879
// CHECK: Enum value:
7980
// CHECK-NEXT: (enum_value name=some index=0
8081
// CHECK-NEXT: (bound_generic_struct reflect_Enum_MultiPayload_generic6.StructWithEnumDepth0
@@ -83,6 +84,8 @@ reflect(enum: example as StructWithEnumDepth0<Int>?)
8384

8485
reflect(enum: example.e)
8586

87+
// CHECK: Reflecting an enum.
88+
// CHECK: Type info:
8689
// CHECK: Enum value:
8790
// CHECK-NEXT: (enum_value name=some index=0
8891
// CHECK-NEXT: (bound_generic_enum reflect_Enum_MultiPayload_generic6.StructWithEnumDepth0.E
@@ -92,6 +95,8 @@ reflect(enum: example.e)
9295

9396
reflect(enum: example.e!)
9497

98+
// CHECK: Reflecting an enum.
99+
// CHECK: Type info:
95100
// CHECK: Enum value:
96101
// CHECK-NEXT: (enum_value name=w index=0
97102
// CHECK-NEXT: (struct Swift.Int)
@@ -100,6 +105,8 @@ reflect(enum: example.e!)
100105
let example2 = StructWithEnumDepth0<Int>(e: StructWithEnumDepth0<Int>.E.t(()))
101106
reflect(enum: example2 as StructWithEnumDepth0<Int>?)
102107

108+
// CHECK: Reflecting an enum.
109+
// CHECK: Type info:
103110
// CHECK: Enum value:
104111
// CHECK-NEXT: (enum_value name=some index=0
105112
// CHECK-NEXT: (bound_generic_struct reflect_Enum_MultiPayload_generic6.StructWithEnumDepth0
@@ -108,6 +115,8 @@ reflect(enum: example2 as StructWithEnumDepth0<Int>?)
108115

109116
reflect(enum: example2.e!)
110117

118+
// CHECK: Reflecting an enum.
119+
// CHECK: Type info:
111120
// CHECK: Enum value:
112121
// CHECK-NEXT: (enum_value name=t index=1
113122
// CHECK-NEXT: (tuple)
@@ -116,6 +125,8 @@ reflect(enum: example2.e!)
116125
let example3 = StructWithEnumDepth0<Int>(e: StructWithEnumDepth0<Int>.E.x(()))
117126
reflect(enum: example3.e!)
118127

128+
// CHECK: Reflecting an enum.
129+
// CHECK: Type info:
119130
// CHECK: Enum value:
120131
// CHECK-NEXT: (enum_value name=x index=4
121132
// CHECK-NEXT: (tuple)

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic7.swift

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ reflect(enum: A<Int>.a(7))
4141
// X64-NEXT: (case name=c index=2 offset=0
4242
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
4343

44-
// X32: FAIL
45-
46-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic71AOySiG
44+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic71AOySiG
4745
// CHECK-NEXT: Demangled name: reflect_Enum_MultiPayload_generic7.A<Swift.Int>
4846

4947
// CHECK: Enum value:
@@ -65,17 +63,15 @@ reflect(enum: A<Void>.a(()))
6563
// CHECK: Reflecting an enum.
6664

6765
// CHECK: Type info:
68-
// X64-NEXT: (multi_payload_enum size=1 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1
69-
// X64-NEXT: (case name=a index=0 offset=0
70-
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
71-
// X64-NEXT: (case name=b index=1 offset=0
72-
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
73-
// X64-NEXT: (case name=c index=2 offset=0
74-
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
75-
76-
// X32: FAIL
77-
78-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic71AOyytG
66+
// CHECK-NEXT: (multi_payload_enum size=1 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1
67+
// CHECK-NEXT: (case name=a index=0 offset=0
68+
// CHECK-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
69+
// CHECK-NEXT: (case name=b index=1 offset=0
70+
// CHECK-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))
71+
// CHECK-NEXT: (case name=c index=2 offset=0
72+
// CHECK-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
73+
74+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic71AOyytG
7975
// CHECK-NEXT: Demangled name: reflect_Enum_MultiPayload_generic7.A<()>
8076

8177
// CHECK: Enum value:
@@ -123,9 +119,7 @@ reflect(enum: B<Int>.a(1))
123119
// X64-NEXT: (case name=c index=2 offset=0
124120
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
125121

126-
// X32: FAIL
127-
128-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic71BOySiG
122+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic71BOySiG
129123
// CHECK-NEXT: Demangled name: reflect_Enum_MultiPayload_generic7.B<Swift.Int>
130124

131125
// CHECK: Enum value:
@@ -165,9 +159,7 @@ reflect(enum: B<Void>.a(8))
165159
// X64-NEXT: (case name=c index=2 offset=0
166160
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1)))
167161

168-
// X32: FAIL
169-
170-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic71BOyytG
162+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic71BOyytG
171163
// CHECK-NEXT: Demangled name: reflect_Enum_MultiPayload_generic7.B<()>
172164

173165
// CHECK: Enum value:

‎validation-test/Reflection/reflect_Enum_MultiPayload_generic8.swift

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ reflect(enum: A<Void>.a(S<Void>(t: ())) as A<Void>?)
4949
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))))
5050
// X64-NEXT: (case name=none index=1))
5151

52-
// X32: FAIL
53-
54-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic81AOyytGSg
52+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic81AOyytGSg
5553
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic8.A<()>>
5654

5755
// CHECK: Enum value:
@@ -114,9 +112,7 @@ reflect(enum: B<Int>.a(S<Void>(t: ())) as B<Int>?)
114112
// X64-NEXT: (tuple size=0 alignment=1 stride=1 num_extra_inhabitants=0 bitwise_takable=1))))
115113
// X64-NEXT: (case name=none index=1))
116114

117-
// X32: FAIL
118-
119-
// CHECK-NEXT: Mangled name: $s34reflect_Enum_MultiPayload_generic81BOySiGSg
115+
// CHECK: Mangled name: $s34reflect_Enum_MultiPayload_generic81BOySiGSg
120116
// CHECK-NEXT: Demangled name: Swift.Optional<reflect_Enum_MultiPayload_generic8.B<Swift.Int>>
121117

122118
// CHECK: Enum value:

0 commit comments

Comments
 (0)