Skip to content

Commit 4ad4a4c

Browse files
hyphyp
committed
fix remaining tests
1 parent afdd81f commit 4ad4a4c

13 files changed

+80
-101
lines changed

‎test/IRGen/class_bounded_generics.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// RUN: %target-swift-frontend -module-name class_bounded_generics -enable-objc-interop -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module
21
// RUN: %target-swift-frontend -module-name class_bounded_generics -enable-objc-interop -emit-ir -primary-file %s -disable-objc-attr-requires-foundation-module | %FileCheck %s -DINT=i%target-ptrsize
32

43
// REQUIRES: CPU=x86_64
@@ -114,7 +113,7 @@ func call_class_bounded_archetype(_ x: ConcreteClass) -> ConcreteClass {
114113
// CHECK: ret ptr [[OUT_ORIG]]
115114
}
116115

117-
// CHECK: define hidden swiftcc void @"$s22class_bounded_generics04not_a1_B10_archetype{{[_0-9a-zA-Z]*}}F"(ptr noalias sret({{.*}}) %0, ptr noalias nocapture %1, ptr %T, ptr %T.NotClassBound)
116+
// CHECK: define hidden swiftcc void @"$s22class_bounded_generics04not_a1_B10_archetype{{[_0-9a-zA-Z]*}}F"(ptr noalias sret({{.*}}) %0, ptr noalias %1, ptr %T, ptr %T.NotClassBound)
118117
func not_class_bounded_archetype<T : NotClassBound>(_ x: T) -> T {
119118
return x
120119
}

‎test/IRGen/enum.sil

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// #if directives don't work with SIL keywords, therefore please put ObjC tests
22
// in `enum_objc.sil`.
3-
// RUN: %target-swift-frontend %s -Xllvm -sil-disable-pass=simplification -disable-type-layout -disable-generic-metadata-prespecialization -disable-generic-metadata-prespecialization -gnone -emit-ir -disable-diagnostic-passes -enable-objc-interop
4-
// RUN: echo "TWO"
5-
// RUN: %target-swift-frontend %s -Xllvm -sil-disable-pass=simplification -disable-type-layout -disable-generic-metadata-prespecialization -gnone -emit-ir -disable-diagnostic-passes -disable-objc-interop
63
// RUN: %target-swift-frontend %s -Xllvm -sil-disable-pass=simplification -disable-type-layout -disable-generic-metadata-prespecialization -disable-generic-metadata-prespecialization -gnone -emit-ir -disable-diagnostic-passes -enable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-objc --check-prefix=CHECK-objc-%target-ptrsize --check-prefix=CHECK-objc-%target-ptrsize-simulator-%target-is-simulator -DWORD=i%target-ptrsize
74
// RUN: %target-swift-frontend %s -Xllvm -sil-disable-pass=simplification -disable-type-layout -disable-generic-metadata-prespecialization -gnone -emit-ir -disable-diagnostic-passes -disable-objc-interop | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-native --check-prefix=CHECK-native-%target-ptrsize -DWORD=i%target-ptrsize
85

@@ -241,7 +238,7 @@ dest(%u2 : $(Builtin.Int64, Builtin.Int64)):
241238
return %x : $()
242239
}
243240

244-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @singleton_switch_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
241+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @singleton_switch_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
245242
// CHECK: entry:
246243
// CHECK: br label %[[DEST:[0-9]+]]
247244
// CHECK: [[DEST]]:
@@ -277,7 +274,7 @@ entry(%0 : $Builtin.Int64, %1 : $Builtin.Int64):
277274
return %u : $Singleton
278275
}
279276

280-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @singleton_inject_indirect(i64 %0, i64 %1, ptr dereferenceable({{.*}}) %2) {{.*}} {
277+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @singleton_inject_indirect(i64 %0, i64 %1, ptr nocapture dereferenceable({{.*}}) %2) {{.*}} {
281278
// CHECK: entry:
282279
// CHECK: [[DATA_0_ADDR:%.*]] = getelementptr inbounds <{ i64, i64 }>, ptr %2, i32 0, i32 0
283280
// CHECK: store i64 %0, ptr [[DATA_0_ADDR]]
@@ -352,7 +349,7 @@ end:
352349
return %x : $()
353350
}
354351

355-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @no_payload_switch_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
352+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @no_payload_switch_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
356353
sil @no_payload_switch_indirect : $@convention(thin) (@inout NoPayloads) -> () {
357354
entry(%u : $*NoPayloads):
358355
// CHECK: [[TAG_ADDR:%.*]] = getelementptr inbounds %T4enum10NoPayloadsO, ptr %0, i32 0, i32 0
@@ -401,7 +398,7 @@ entry:
401398
return %u : $NoPayloads
402399
}
403400

404-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @no_payload_inject_z_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
401+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @no_payload_inject_z_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
405402
// CHECK: entry:
406403
// CHECK: [[TAG_ADDR:%.*]] = getelementptr inbounds %T4enum10NoPayloadsO, ptr %0, i32 0, i32 0
407404
// CHECK: store i8 2, ptr [[TAG_ADDR]]
@@ -632,7 +629,7 @@ entry(%0 : $Builtin.Word):
632629
return %u : $SinglePayloadNoXI2
633630
}
634631

635-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_no_xi_inject_x_indirect([[WORD]] %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
632+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_no_xi_inject_x_indirect([[WORD]] %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
636633
// CHECK: entry:
637634
// CHECK: store [[WORD]] %0, ptr %1
638635
// CHECK: [[T0:%.*]] = getelementptr inbounds %T4enum18SinglePayloadNoXI2O, ptr %1, i32 0, i32 1
@@ -658,7 +655,7 @@ entry:
658655
return %u : $SinglePayloadNoXI2
659656
}
660657

661-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_no_xi_inject_y_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
658+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_no_xi_inject_y_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
662659
// CHECK: entry:
663660
// CHECK: store [[WORD]] 0, ptr %0
664661
// CHECK: [[T0:%.*]] = getelementptr inbounds %T4enum18SinglePayloadNoXI2O, ptr %0, i32 0, i32 1
@@ -995,7 +992,7 @@ entry(%0 : $Builtin.Int63):
995992
return %u : $SinglePayloadSpareBit
996993
}
997994

998-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_spare_bit_inject_x_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
995+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_spare_bit_inject_x_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
999996
// CHECK-64: entry:
1000997
// CHECK-64: [[T:%.*]] = trunc i64 %0 to i63
1001998
// CHECK-64: [[BYTE:%.*]] = zext i63 [[T]] to i64
@@ -1022,7 +1019,7 @@ entry:
10221019
return %u : $SinglePayloadSpareBit
10231020
}
10241021

1025-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_spare_bit_inject_y_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
1022+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @single_payload_spare_bit_inject_y_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
10261023
// CHECK-64: entry:
10271024
// -- 0x8000_0000_0000_0000
10281025
// CHECK-64: store i64 -9223372036854775808, ptr %0
@@ -1248,7 +1245,7 @@ end:
12481245
return %v : $()
12491246
}
12501247

1251-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @dynamic_single_payload_inject_x(ptr noalias sret({{.*}}) %0, ptr noalias nocapture %1, ptr %T) {{.*}} {
1248+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @dynamic_single_payload_inject_x(ptr noalias sret({{.*}}) %0, ptr noalias %1, ptr %T) {{.*}} {
12521249
// CHECK: [[TMP2:%.*]] = getelementptr inbounds ptr, ptr %T, i{{.*}} -1
12531250
// CHECK: [[VWT:%.*]] = load ptr, ptr [[TMP2]]
12541251
// CHECK: [[ENUMADDR:%.*]] = getelementptr inbounds ptr, ptr [[VWT]], i32 7
@@ -1307,7 +1304,7 @@ end(%z : $()):
13071304
return %z : $()
13081305
}
13091306

1310-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc i8 @dynamic_single_payload_empty_payload_load(ptr dereferenceable({{.*}}) %0) {{.*}} {
1307+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc i8 @dynamic_single_payload_empty_payload_load(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
13111308
// CHECK: entry:
13121309
// CHECK: %1 = load i8, ptr %0
13131310
// CHECK: ret i8 %1
@@ -1318,7 +1315,7 @@ entry(%p : $*DynamicSinglePayload<()>):
13181315
return %x : $DynamicSinglePayload<()>
13191316
}
13201317

1321-
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @dynamic_single_payload_empty_payload_store(ptr dereferenceable({{.*}}) %0, i8 %1) {{.*}} {
1318+
// CHECK: define{{( dllexport)?}}{{( protected)?}} swiftcc void @dynamic_single_payload_empty_payload_store(ptr nocapture dereferenceable({{.*}}) %0, i8 %1) {{.*}} {
13221319
// CHECK: entry:
13231320
// CHECK: store i8 %1, ptr %0
13241321
// CHECK: ret void
@@ -1443,7 +1440,7 @@ end:
14431440
return %v : $()
14441441
}
14451442

1446-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bits_switch_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
1443+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bits_switch_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
14471444
sil @multi_payload_no_spare_bits_switch_indirect : $(@inout MultiPayloadNoSpareBits) -> () {
14481445
entry(%u : $*MultiPayloadNoSpareBits):
14491446
// CHECK-64: [[PAYLOAD:%.*]] = load i64, ptr %0
@@ -1497,7 +1494,7 @@ entry(%0 : $Builtin.Int64):
14971494
return %u : $MultiPayloadNoSpareBits
14981495
}
14991496

1500-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bit_inject_x_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
1497+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bit_inject_x_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
15011498
// CHECK-64: entry:
15021499
// CHECK-64: store i64 %0, ptr %1
15031500
// CHECK-64: [[T0:%.*]] = getelementptr inbounds %T4enum23MultiPayloadNoSpareBitsO, ptr %1, i32 0, i32 1
@@ -1550,7 +1547,7 @@ entry:
15501547
return %u : $MultiPayloadNoSpareBits
15511548
}
15521549

1553-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bit_inject_a_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
1550+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_no_spare_bit_inject_a_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
15541551
// CHECK-64: entry:
15551552
// CHECK-64: store i64 0, ptr %0
15561553
// CHECK-64: [[T0:%.*]] = getelementptr inbounds %T4enum23MultiPayloadNoSpareBitsO, ptr %0, i32 0, i32 1
@@ -1741,7 +1738,7 @@ entry(%0 : $Builtin.Int62):
17411738
return %u : $MultiPayloadOneSpareBit
17421739
}
17431740

1744-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_x_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
1741+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_x_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
17451742
// CHECK-64: entry:
17461743
// CHECK-64: [[NATIVECC_TRUNC:%.*]] = trunc i64 %0 to i62
17471744
// CHECK-64: [[BYTE:%.*]] = zext i62 [[NATIVECC_TRUNC]] to i64
@@ -1779,7 +1776,7 @@ entry(%0 : $Builtin.Int63):
17791776
return %u : $MultiPayloadOneSpareBit
17801777
}
17811778

1782-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_y_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
1779+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_y_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
17831780
// CHECK-64: entry:
17841781
// CHECK-64: [[NATIVECC_TRUNC:%.*]] = trunc i64 %0 to i63
17851782
// CHECK-64: [[BYTE:%.*]] = zext i63 [[NATIVECC_TRUNC]] to i64
@@ -1829,7 +1826,7 @@ entry:
18291826
return %u : $MultiPayloadOneSpareBit
18301827
}
18311828

1832-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_a_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
1829+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_one_spare_bit_inject_a_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
18331830
// CHECK-64: entry:
18341831
// -- 0x8000_0000_0000_0000
18351832
// CHECK-64: store i64 -9223372036854775808, ptr %0
@@ -1973,7 +1970,7 @@ entry(%0 : $Builtin.Int62):
19731970
return %u : $MultiPayloadTwoSpareBits
19741971
}
19751972

1976-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_x_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
1973+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_x_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
19771974
// CHECK-64: entry:
19781975
// CHECK-64: [[NATIVECC_TRUNC:%.*]] = trunc i64 %0 to i62
19791976
// CHECK-64: [[BYTE:%.*]] = zext i62 [[NATIVECC_TRUNC]] to i64
@@ -2007,7 +2004,7 @@ entry(%0 : $Builtin.Int60):
20072004
return %u : $MultiPayloadTwoSpareBits
20082005
}
20092006

2010-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_y_indirect(i64 %0, ptr dereferenceable({{.*}}) %1) {{.*}} {
2007+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_y_indirect(i64 %0, ptr nocapture dereferenceable({{.*}}) %1) {{.*}} {
20112008
// CHECK-64: entry:
20122009
// CHECK-64: [[NATIVECC_TRUNC:%.*]] = trunc i64 %0 to i60
20132010
// CHECK-64: [[BYTE:%.*]] = zext i60 [[NATIVECC_TRUNC]] to i64
@@ -2054,7 +2051,7 @@ entry:
20542051
return %u : $MultiPayloadTwoSpareBits
20552052
}
20562053

2057-
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_a_indirect(ptr dereferenceable({{.*}}) %0) {{.*}} {
2054+
// CHECK-64: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_two_spare_bits_inject_a_indirect(ptr nocapture dereferenceable({{.*}}) %0) {{.*}} {
20582055
// CHECK-64: entry:
20592056
// -- 0xC000_0000_0000_0000
20602057
// CHECK-64: store i64 -4611686018427387904, ptr %0
@@ -2258,7 +2255,7 @@ enum MultiPayloadNestedSpareBits {
22582255
case B(MultiPayloadInnerSpareBits)
22592256
}
22602257

2261-
// CHECK-64-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_nested_spare_bits_switch(ptr noalias dereferenceable({{.*}}) %0) {{.*}} {
2258+
// CHECK-64-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_nested_spare_bits_switch(ptr noalias nocapture dereferenceable({{.*}}) %0) {{.*}} {
22622259
// CHECK-64: entry:
22632260
// CHECK-64: %1 = load [[WORD]], ptr %0
22642261
// CHECK-64: %2 = lshr [[WORD]] %1, 61
@@ -2328,7 +2325,7 @@ enum MultiPayloadAddressOnlyFixed {
23282325
case Y(Builtin.Int32)
23292326
}
23302327

2331-
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_address_only_destroy(ptr noalias dereferenceable({{.*}}) %0)
2328+
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @multi_payload_address_only_destroy(ptr noalias nocapture dereferenceable({{.*}}) %0)
23322329
sil @multi_payload_address_only_destroy : $@convention(thin) (@in MultiPayloadAddressOnlyFixed) -> () {
23332330
entry(%m : $*MultiPayloadAddressOnlyFixed):
23342331
destroy_addr %m : $*MultiPayloadAddressOnlyFixed

0 commit comments

Comments
 (0)