Skip to content

Commit eb8aa7f

Browse files
slavapestovslavapestov
committed
Update missing member tests to use Swift 4/5 instead of 3/4
1 parent 7c0ee05 commit eb8aa7f

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

‎test/IRGen/Inputs/mixed_mode/ObjCStuff.apinotes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name: ObjCStuff
22
SwiftVersions:
3-
- Version: 4
3+
- Version: 5
44
Typedefs:
55
- Name: OJCCloudButt
66
SwiftName: OJCCloud.Butt
7-
- Version: 3
7+
- Version: 4
88
Typedefs:
99
- Name: OJCCloudButt
1010
SwiftWrapper: none

‎test/IRGen/mixed_mode_class_with_unimportable_fields.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -o %t/UsingObjCStuff.swiftmodule -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 4 %S/Inputs/mixed_mode/UsingObjCStuff.swift
3-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 3 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DWORD=i%target-ptrsize
2+
// RUN: %target-swift-frontend -emit-module -o %t/UsingObjCStuff.swiftmodule -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 5 %S/Inputs/mixed_mode/UsingObjCStuff.swift
43
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 4 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DWORD=i%target-ptrsize
4+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 5 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DWORD=i%target-ptrsize
55

66
// REQUIRES: objc_interop
77

‎test/IRGen/mixed_mode_class_with_unimportable_fields.swift

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %empty-directory(%t)
2-
// RUN: %target-swift-frontend -emit-module -o %t/UsingObjCStuff.swiftmodule -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 4 %S/Inputs/mixed_mode/UsingObjCStuff.swift
3-
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 3 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-V3 -DWORD=i%target-ptrsize
2+
// RUN: %target-swift-frontend -emit-module -o %t/UsingObjCStuff.swiftmodule -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 5 %S/Inputs/mixed_mode/UsingObjCStuff.swift
43
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 4 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-V4 -DWORD=i%target-ptrsize
4+
// RUN: %target-swift-frontend -emit-ir -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 5 %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize --check-prefix=CHECK-V5 -DWORD=i%target-ptrsize
55

66
// REQUIRES: objc_interop
77

@@ -23,22 +23,22 @@ public class SubSubButtHolder: SubButtHolder {
2323
// CHECK-LABEL: define {{(protected )?}}{{(dllexport )?}}swiftcc void @"$S4main17accessFinalFields2ofyp_ypt14UsingObjCStuff10ButtHolderC_tF"
2424
public func accessFinalFields(of holder: ButtHolder) -> (Any, Any) {
2525

26-
// ButtHolder.y cannot be imported in Swift 3 mode, so make sure we use field
26+
// ButtHolder.y cannot be imported in Swift 4 mode, so make sure we use field
2727
// offset globals here.
2828

29-
// CHECK-V3: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1xSivpWvd"
30-
// CHECK-V3: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
31-
// CHECK-V3: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
29+
// CHECK-V4: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1xSivpWvd"
30+
// CHECK-V4: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
31+
// CHECK-V4: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
3232

33-
// CHECK-V3: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1zSSvpWvd"
34-
// CHECK-V3: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
35-
// CHECK-V3: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
33+
// CHECK-V4: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1zSSvpWvd"
34+
// CHECK-V4: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
35+
// CHECK-V4: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
3636

37-
// ButtHolder.y is correctly imported in Swift 4 mode, so we can use fixed offsets.
37+
// ButtHolder.y is correctly imported in Swift 5 mode, so we can use fixed offsets.
3838

39-
// CHECK-V4: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* %2, i32 0, i32 1
39+
// CHECK-V5: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* %2, i32 0, i32 1
4040

41-
// CHECK-V4: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* %2, i32 0, i32 3
41+
// CHECK-V5: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* %2, i32 0, i32 3
4242

4343
return (holder.x, holder.z)
4444
}
@@ -48,31 +48,31 @@ public func accessFinalFields(ofSub holder: SubButtHolder) -> (Any, Any, Any) {
4848
// We should use the runtime-adjusted ivar offsets since we may not have
4949
// a full picture of the layout in mixed Swift language version modes.
5050

51-
// ButtHolder.y cannot be imported in Swift 3 mode, so make sure we use field
51+
// ButtHolder.y cannot be imported in Swift 4 mode, so make sure we use field
5252
// offset globals here.
5353

54-
// CHECK-V3: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1xSivpWvd"
55-
// CHECK-V3: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
56-
// CHECK-V3: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
54+
// CHECK-V4: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1xSivpWvd"
55+
// CHECK-V4: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
56+
// CHECK-V4: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
5757

58-
// CHECK-V3: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1zSSvpWvd"
59-
// CHECK-V3: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
60-
// CHECK-V3: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
58+
// CHECK-V4: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S14UsingObjCStuff10ButtHolderC1zSSvpWvd"
59+
// CHECK-V4: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
60+
// CHECK-V4: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
6161

62-
// CHECK-V3: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S4main13SubButtHolderC1wSfvpWvd"
62+
// CHECK-V4: [[OFFSET:%.*]] = load [[WORD]], [[WORD]]* @"$S4main13SubButtHolderC1wSfvpWvd"
6363

64-
// CHECK-V3: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
65-
// CHECK-V3: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
64+
// CHECK-V4: [[INSTANCE_RAW:%.*]] = bitcast {{.*}} to i8*
65+
// CHECK-V4: getelementptr inbounds i8, i8* [[INSTANCE_RAW]], [[WORD]] [[OFFSET]]
6666

67-
// ButtHolder.y is correctly imported in Swift 4 mode, so we can use fixed offsets.
67+
// ButtHolder.y is correctly imported in Swift 5 mode, so we can use fixed offsets.
6868

69-
// CHECK-V4: [[SELF:%.*]] = bitcast %T4main13SubButtHolderC* %3 to %T14UsingObjCStuff10ButtHolderC*
70-
// CHECK-V4: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* [[SELF]], i32 0, i32 1
69+
// CHECK-V5: [[SELF:%.*]] = bitcast %T4main13SubButtHolderC* %3 to %T14UsingObjCStuff10ButtHolderC*
70+
// CHECK-V5: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* [[SELF]], i32 0, i32 1
7171

72-
// CHECK-V4: [[SELF:%.*]] = bitcast %T4main13SubButtHolderC* %3 to %T14UsingObjCStuff10ButtHolderC*
73-
// CHECK-V4: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* [[SELF]], i32 0, i32 3
72+
// CHECK-V5: [[SELF:%.*]] = bitcast %T4main13SubButtHolderC* %3 to %T14UsingObjCStuff10ButtHolderC*
73+
// CHECK-V5: [[OFFSET:%.*]] = getelementptr inbounds %T14UsingObjCStuff10ButtHolderC, %T14UsingObjCStuff10ButtHolderC* [[SELF]], i32 0, i32 3
7474

75-
// CHECK-V4: [[OFFSET:%.*]] = getelementptr inbounds %T4main13SubButtHolderC, %T4main13SubButtHolderC* %3, i32 0, i32 4
75+
// CHECK-V5: [[OFFSET:%.*]] = getelementptr inbounds %T4main13SubButtHolderC, %T4main13SubButtHolderC* %3, i32 0, i32 4
7676

7777
return (holder.x, holder.z, holder.w)
7878
}
@@ -91,9 +91,9 @@ public func invokeMethod(on holder: SubButtHolder) {
9191
holder.subVirtual()
9292
}
9393

94-
// CHECK-V3-LABEL: define private void @initialize_metadata_SubButtHolder
95-
// CHECK-V3: call void @swift_initClassMetadata(
94+
// CHECK-V4-LABEL: define private void @initialize_metadata_SubButtHolder
95+
// CHECK-V4: call void @swift_initClassMetadata(
9696

97-
// CHECK-V3-LABEL: define private void @initialize_metadata_SubSubButtHolder
98-
// CHECK-V3: call void @swift_initClassMetadata(
97+
// CHECK-V4-LABEL: define private void @initialize_metadata_SubSubButtHolder
98+
// CHECK-V4: call void @swift_initClassMetadata(
9999

‎test/Interpreter/SDK/Inputs/mixed_mode/ObjCStuff.apinotes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Name: ObjCStuff
22
SwiftVersions:
3-
- Version: 4
3+
- Version: 5
44
Typedefs:
55
- Name: OJCCloudButt
66
SwiftName: OJCCloud.Butt
7-
- Version: 3
7+
- Version: 4
88
Typedefs:
99
- Name: OJCCloudButt
1010
SwiftWrapper: none

‎test/Interpreter/SDK/mixed_mode_class_with_missing_properties.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// RUN: %empty-directory(%t)
22
// RUN: cp %s %t/main.swift
3-
// RUN: %target-build-swift -whole-module-optimization -emit-module-path %t/UsingObjCStuff.swiftmodule -c -o %t/UsingObjCStuff.o -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 4 -parse-as-library %S/Inputs/mixed_mode/UsingObjCStuff.swift
4-
// RUN: %target-build-swift -o %t/a.out.v3 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 3 %t/main.swift %t/UsingObjCStuff.o
3+
// RUN: %target-build-swift -whole-module-optimization -emit-module-path %t/UsingObjCStuff.swiftmodule -c -o %t/UsingObjCStuff.o -module-name UsingObjCStuff -I %t -I %S/Inputs/mixed_mode -swift-version 5 -parse-as-library %S/Inputs/mixed_mode/UsingObjCStuff.swift
54
// RUN: %target-build-swift -o %t/a.out.v4 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 4 %t/main.swift %t/UsingObjCStuff.o
6-
// RUN: %target-run %t/a.out.v3 | %FileCheck %s
5+
// RUN: %target-build-swift -o %t/a.out.v5 -I %t -I %S/Inputs/mixed_mode -module-name main -swift-version 5 %t/main.swift %t/UsingObjCStuff.o
76
// RUN: %target-run %t/a.out.v4 | %FileCheck %s
7+
// RUN: %target-run %t/a.out.v5 | %FileCheck %s
88

99
// REQUIRES: objc_interop
1010
// REQUIRES: executable_test

0 commit comments

Comments
 (0)