Skip to content

Commit 321a1ea

Browse files
authored
Merge pull request #38496 from slavapestov/irgen-overlay-fix
IRGen: Build test overlays with -enable-library-evolution
2 parents a5c2b6b + 49637ce commit 321a1ea

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

test/IRGen/Inputs/ObjectiveC.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This is an overlay Swift module.
22
@_exported import ObjectiveC
33

4+
@frozen
45
public struct ObjCBool : CustomStringConvertible {
56
#if (os(macOS) && arch(x86_64)) || (os(iOS) && (arch(i386) || arch(arm) || targetEnvironment(macCatalyst)))
67

@@ -34,6 +35,7 @@ public struct ObjCBool : CustomStringConvertible {
3435
}
3536
}
3637

38+
@frozen
3739
public struct Selector {
3840
private var ptr : OpaquePointer
3941
}

test/IRGen/lit.local.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
config.substitutions = list(config.substitutions)
33

44
config.substitutions.insert(0, ('%build-irgen-test-overlays',
5-
'%target-swift-frontend -enable-objc-interop -disable-objc-attr-requires-foundation-module -emit-module -o %t -sdk %S/Inputs %S/Inputs/ObjectiveC.swift && '
6-
'%target-swift-frontend -enable-objc-interop -emit-module -o %t -sdk %S/Inputs %S/Inputs/Foundation.swift -I %t'))
5+
'%target-swift-frontend -enable-objc-interop -disable-objc-attr-requires-foundation-module -emit-module -enable-library-evolution -o %t -sdk %S/Inputs %S/Inputs/ObjectiveC.swift && '
6+
'%target-swift-frontend -enable-objc-interop -emit-module -enable-library-evolution -o %t -sdk %S/Inputs %S/Inputs/Foundation.swift -I %t'))
77

88
config.substitutions.insert(0, ('%build-irgen-test-overlays\(mock-sdk-directory: ([^)]+)\)',
9-
SubstituteCaptures(r'%target-swift-frontend -enable-objc-interop -disable-objc-attr-requires-foundation-module -emit-module -o %t -sdk \1 \1/ObjectiveC.swift && '
10-
r'%target-swift-frontend -enable-objc-interop -emit-module -o %t -sdk \1 \1/Foundation.swift -I %t')))
9+
SubstituteCaptures(r'%target-swift-frontend -enable-objc-interop -disable-objc-attr-requires-foundation-module -emit-module -enable-library-evolution -o %t -sdk \1 \1/ObjectiveC.swift && '
10+
r'%target-swift-frontend -enable-objc-interop -emit-module -enable-library-evolution -o %t -sdk \1 \1/Foundation.swift -I %t')))
1111

1212
def get_target_os():
1313
import re

0 commit comments

Comments
 (0)