Skip to content

Commit 92499e1

Browse files
aschwaighoferaschwaighofer
committed
Fix directory test/Serialization
1 parent 99b5f1b commit 92499e1

File tree

3 files changed

+24
-38
lines changed

3 files changed

+24
-38
lines changed

‎test/Serialization/Recovery/typedefs-in-protocols.swift

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

88
// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST -DVERIFY %s -verify
99

10-
// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s | %FileCheck -check-prefix CHECK-IR %s
11-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s
12-
// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck -check-prefix CHECK-IR %s
13-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s
10+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s | %FileCheck -check-prefix CHECK-IR %s
11+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck -check-prefix CHECK-IR %s
1412

1513
#if TEST
1614

@@ -23,13 +21,12 @@ public func testWitnessDispatch(user: Proto) {
2321
// for the witness table slot for 'lastMethod()'. If the layout here
2422
// changes, please check that offset 11 is still correct.
2523
// CHECK-IR-NOT: ret
26-
// CHECK-IR: [[SLOT:%.+]] = getelementptr inbounds i8*, i8** {{%.+}}, i32 12
24+
// CHECK-IR: [[SLOT:%.+]] = getelementptr inbounds ptr, ptr {{%.+}}, i32 12
2725
// CHECK-IR-NOT: ret
28-
// CHECK-IR: [[RAW_METHOD:%.+]] = load i8*, i8** [[SLOT]]
26+
// CHECK-IR: [[RAW_METHOD:%.+]] = load ptr, ptr [[SLOT]]
2927
// CHECK-IR-NOT: ret
30-
// CHECK-IR: [[METHOD:%.+]] = bitcast i8* [[RAW_METHOD]] to void (%swift.opaque*, %swift.type*, i8**)*
3128
// CHECK-IR-NOT: ret
32-
// CHECK-IR: call swiftcc void [[METHOD]](
29+
// CHECK-IR: call swiftcc void [[RAW_METHOD]](
3330
_ = user.lastMethod()
3431
} // CHECK-IR: ret void
3532

@@ -39,13 +36,12 @@ public func testGenericDispatch<T: Proto>(user: T) {
3936
// for the witness table slot for 'lastMethod()'. If the layout here
4037
// changes, please check that offset 11 is still correct.
4138
// CHECK-IR-NOT: ret
42-
// CHECK-IR: [[SLOT:%.+]] = getelementptr inbounds i8*, i8** %T.Proto, i32 12
39+
// CHECK-IR: [[SLOT:%.+]] = getelementptr inbounds ptr, ptr %T.Proto, i32 12
4340
// CHECK-IR-NOT: ret
44-
// CHECK-IR: [[RAW_METHOD:%.+]] = load i8*, i8** [[SLOT]]
41+
// CHECK-IR: [[RAW_METHOD:%.+]] = load ptr, ptr [[SLOT]]
4542
// CHECK-IR-NOT: ret
46-
// CHECK-IR: [[METHOD:%.+]] = bitcast i8* [[RAW_METHOD]] to void (%swift.opaque*, %swift.type*, i8**)*
4743
// CHECK-IR-NOT: ret
48-
// CHECK-IR: call swiftcc void [[METHOD]](
44+
// CHECK-IR: call swiftcc void [[RAW_METHOD]](
4945
user.lastMethod()
5046
} // CHECK-IR: ret void
5147

‎test/Serialization/Recovery/typedefs.swift

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST -DVERIFY %s -verify
1414
// RUN: %target-swift-frontend -emit-silgen -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck -check-prefix CHECK-SIL %s
1515

16-
// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s
17-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s
18-
// RUN: %target-swift-frontend %use_no_opaque_pointers -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s
19-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s
16+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s
17+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/custom-modules -Xcc -DBAD -DTEST %s | %FileCheck --check-prefixes=CHECK-IR,CHECK-IR-%target-runtime %s
2018

2119
// RUN: %target-swift-frontend -typecheck -I %t -I %S/Inputs/custom-modules -Xcc -DBAD %S/Inputs/typedefs-helper.swift -verify
2220

@@ -40,8 +38,8 @@ public func testVTableBuilding(user: User) {
4038
// for the vtable slot for 'lastMethod()'. If the layout here
4139
// changes, please check that offset is still correct.
4240
// CHECK-IR-NOT: ret
43-
// CHECK-IR-objc: getelementptr inbounds void (%T3Lib4UserC*)*, void (%T3Lib4UserC*)** %{{[0-9]+}}, {{i64 28|i32 31}}
44-
// CHECK-IR-native: getelementptr inbounds void (%T3Lib4UserC*)*, void (%T3Lib4UserC*)** %{{[0-9]+}}, {{i64 25|i32 28}}
41+
// CHECK-IR-objc: getelementptr inbounds ptr, ptr %{{[0-9]+}}, {{i64 28|i32 31}}
42+
// CHECK-IR-native: getelementptr inbounds ptr, ptr %{{[0-9]+}}, {{i64 25|i32 28}}
4543
user.lastMethod()
4644
} // CHECK-IR: ret void
4745

‎test/Serialization/autolinking.swift

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,33 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift
33
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/out.txt
4-
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t
5-
// RUN: %target-swift-frontend %use_no_opaque_pointers -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/out.txt
4+
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/out.txt
65
// RUN: %FileCheck %s < %t/out.txt
76
// RUN: %FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/out.txt
87

98
// RUN: %empty-directory(%t/someModule.framework/Modules/someModule.swiftmodule)
109
// RUN: mv %t/someModule.swiftmodule %t/someModule.framework/Modules/someModule.swiftmodule/%target-swiftmodule-name
1110
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -lmagic %s -F %t > %t/framework.txt
12-
// RUN: %target-swift-frontend %use_no_opaque_pointers -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -F %t > %t/framework.txt
13-
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -F %t
11+
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -F %t > %t/framework.txt
1412
// RUN: %FileCheck -check-prefix=FRAMEWORK %s < %t/framework.txt
1513
// RUN: %FileCheck -check-prefix=NO-FORCE-LOAD %s < %t/framework.txt
1614

1715
// RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load
18-
// RUN: %target-swift-frontend %use_no_opaque_pointers -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/force-load.txt
19-
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -lmagic %s -I %t
16+
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/force-load.txt
2017
// RUN: %FileCheck %s < %t/force-load.txt
2118
// RUN: %FileCheck -check-prefix FORCE-LOAD-CLIENT -check-prefix FORCE-LOAD-CLIENT-%target-object-format %s < %t/force-load.txt
2219

23-
// RUN: %target-swift-frontend %use_no_opaque_pointers -runtime-compatibility-version none -emit-ir -debugger-support %s -I %t > %t/force-load.txt
24-
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -debugger-support %s -I %t
20+
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -debugger-support %s -I %t > %t/force-load.txt
2521
// RUN: %FileCheck -check-prefix NO-FORCE-LOAD-CLIENT %s < %t/force-load.txt
2622

27-
// RUN: %target-swift-frontend %use_no_opaque_pointers -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
28-
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift
29-
// RUN: %target-swift-frontend %use_no_opaque_pointers -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
30-
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift
31-
// RUN: %target-swift-frontend %use_no_opaque_pointers -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD %s
32-
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load
33-
// RUN: %target-swift-frontend %use_no_opaque_pointers -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name 0module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD-HEX %s
23+
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
24+
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift | %FileCheck --check-prefix=NO-FORCE-LOAD %s
25+
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD %s
26+
// RUN: %target-swift-frontend -runtime-compatibility-version none -emit-ir -parse-stdlib -module-name someModule -module-link-name 0module %S/../Inputs/empty.swift -autolink-force-load | %FileCheck --check-prefix=FORCE-LOAD-HEX %s
3427

3528
// RUN: %target-swift-frontend -emit-module -parse-stdlib -o %t -module-name someModule -module-link-name module %S/../Inputs/empty.swift -public-autolink-library anotherLib
3629
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-dynamic-replacements -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/public-autolink.txt
37-
// RUN: %target-swift-frontend %use_no_opaque_pointers -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/public-autolink.txt
38-
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t
30+
// RUN: %target-swift-frontend -disable-autolinking-runtime-compatibility-concurrency -runtime-compatibility-version none -emit-ir -lmagic %s -I %t > %t/public-autolink.txt
3931
// RUN: %FileCheck %s < %t/public-autolink.txt
4032
// RUN: %FileCheck -check-prefix=PUBLIC-DEP %s < %t/public-autolink.txt
4133

@@ -61,9 +53,9 @@ import someModule
6153
// FORCE-LOAD-HEX: @"_swift_FORCE_LOAD_$306d6f64756c65"
6254

6355
// NO-FORCE-LOAD-CLIENT-NOT: FORCE_LOAD
64-
// FORCE-LOAD-CLIENT: @"_swift_FORCE_LOAD_$_module_$_autolinking" = weak_odr hidden constant void ()* @"_swift_FORCE_LOAD_$_module"
65-
// FORCE-LOAD-CLIENT: @llvm.used = appending global [{{[0-9]+}} x i8*] [
66-
// FORCE-LOAD-CLIENT: i8* bitcast (void ()** @"_swift_FORCE_LOAD_$_module_$_autolinking" to i8*)
56+
// FORCE-LOAD-CLIENT: @"_swift_FORCE_LOAD_$_module_$_autolinking" = weak_odr hidden constant ptr @"_swift_FORCE_LOAD_$_module"
57+
// FORCE-LOAD-CLIENT: @llvm.used = appending global [{{[0-9]+}} x ptr] [
58+
// FORCE-LOAD-CLIENT: ptr @"_swift_FORCE_LOAD_$_module_$_autolinking"
6759
// FORCE-LOAD-CLIENT: ], section "llvm.metadata"
6860
// FORCE-LOAD-CLIENT-macho: declare extern_weak {{(dllimport )?}}void @"_swift_FORCE_LOAD_$_module"()
6961
// FORCE-LOAD-CLIENT-COFF: declare extern {{(dllimport )?}}void @"_swift_FORCE_LOAD_$_module"()

0 commit comments

Comments
 (0)