averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

ModuleInterface: Print -target-variant flag in .swiftinterface files.

Browse Source 
This is necessary to ensure that availability checks contained in inlined
functions are compiled correctly for zippered modules when built from
interface.

Resolves rdar://130094532.
This commit is contained in:
Allan Shortlidge
2024-07-18 12:31:51 -07:00
parent 7d6391f598
commit e836fea314
3 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/Option/Options.td
View File

@@ -1376,7 +1376,7 @@ def target_cpu : Separate<["-"], "target-cpu">, Flags<[FrontendOption, ModuleInt
HelpText<"Generate code for a particular CPU variant">;
def target_variant : Separate<["-"], "target-variant">,
Flags<[FrontendOption]>,
Flags<[FrontendOption, ModuleInterfaceOption]>,
HelpText<"Generate 'zippered' code for macCatalyst that can run on the specified"
" variant target triple in addition to the main -target triple">;

13
test/ModuleInterface/target-variant.swift Normal file
View File

@@ -0,0 +1,13 @@
// RUN: %empty-directory(%t)
// RUN: %target-swift-emit-module-interface(%t/TargetVariant.swiftinterface) %s -module-name TargetVariant -target %target-cpu-apple-macosx13 -target-variant %target-cpu-apple-ios16-macabi
// RUN: %target-swift-typecheck-module-from-interface(%t/TargetVariant.swiftinterface) -module-name TargetVariant
// RUN: %FileCheck %s < %t/TargetVariant.swiftinterface
// REQUIRES: OS=macosx
// CHECK: swift-module-flags
// CHECK-SAME: -target {{.*}}-apple-macosx13
// CHECK-SAME: -target-variant {{.*}}-apple-ios16-macabi
// CHECK: public func test()
public func test() {}

39
test/SIL/availability_query_maccatalyst_zippered_inlined.swift Normal file
View File

@@ -0,0 +1,39 @@
// RUN: %empty-directory(%t)
// RUN: split-file %s %t
// RUN: %target-swift-frontend -emit-module %t/Library.swift -swift-version 5 -enable-library-evolution -module-name Library -target %target-cpu-apple-macosx13 -target-variant %target-cpu-apple-ios16-macabi -o %t -emit-module-interface-path %t/Library.swiftinterface
// RUN: %target-swift-frontend -emit-sil %t/main.swift -target %target-cpu-apple-macosx13 -target-variant %target-cpu-apple-ios16-macabi -I %t | %FileCheck %t/main.swift
// Remove the .swiftmodule and test again with the library module built from interface.
// RUN: rm %t/Library.swiftmodule
// RUN: %target-swift-frontend -emit-sil %t/main.swift -target %target-cpu-apple-macosx13 -target-variant %target-cpu-apple-ios16-macabi -I %t | %FileCheck %t/main.swift
// REQUIRES: maccatalyst_support
//--- Library.swift
public func foo() {}
@_alwaysEmitIntoClient
public func test() {
if #available(macOS 14, iOS 17, *) {
foo()
}
}
//--- main.swift
import Library
test()
// CHECK-LABEL: sil shared @$s7Library4testyyF
// CHECK: [[MACOS_MAJOR:%.*]] = integer_literal $Builtin.Word, 14
// CHECK: [[MACOS_MINOR:%.*]] = integer_literal $Builtin.Word, 0
// CHECK: [[MACOS_PATCH:%.*]] = integer_literal $Builtin.Word, 0
// CHECK: [[IOS_MAJOR:%.*]] = integer_literal $Builtin.Word, 17
// CHECK: [[IOS_MINOR:%.*]] = integer_literal $Builtin.Word, 0
// CHECK: [[IOS_PATCH:%.*]] = integer_literal $Builtin.Word, 0
// CHECK: [[FUNC:%.*]] = function_ref @$ss042_stdlib_isOSVersionAtLeastOrVariantVersiondE0yBi1_Bw_BwBwBwBwBwtF : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1
// CHECK: [[QUERY_RESULT:%.*]] = apply [[FUNC]]([[MACOS_MAJOR]], [[MACOS_MINOR]], [[MACOS_PATCH]], [[IOS_MAJOR]], [[IOS_MINOR]], [[IOS_PATCH]]) : $@convention(thin) (Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word, Builtin.Word) -> Builtin.Int1