Skip to content

Loosen restriction for building deprecated iOS targets #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2022
Merged

Loosen restriction for building deprecated iOS targets #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ public struct Driver {
try toolchain.validateArgs(&parsedOptions,
targetTriple: self.frontendTargetInfo.target.triple,
targetVariantTriple: self.frontendTargetInfo.targetVariant?.triple,
compilerOutputType: self.compilerOutputType,
diagnosticsEngine: diagnosticEngine)

// Compute debug information output.
Expand Down
20 changes: 13 additions & 7 deletions Sources/SwiftDriver/Toolchains/DarwinToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,17 @@ public final class DarwinToolchain: Toolchain {
public enum ToolchainValidationError: Error, DiagnosticData {
case osVersionBelowMinimumDeploymentTarget(String)
case argumentNotSupported(String)
case iOSVersionAboveMaximumDeploymentTarget(Int)
case invalidDeploymentTargetForIR(String, String)
case unsupportedTargetVariant(variant: Triple)
case darwinOnlySupportsLibCxx

public var description: String {
switch self {
case .osVersionBelowMinimumDeploymentTarget(let target):
return "Swift requires a minimum deployment target of \(target)"
case .iOSVersionAboveMaximumDeploymentTarget(let version):
return "iOS \(version) does not support 32-bit programs"
case .invalidDeploymentTargetForIR(let target, let archName):
return
"\(target) and above does not support emitting binaries or IR for \(archName)"
case .unsupportedTargetVariant(variant: let variant):
return "unsupported '\(variant.isiOS ? "-target-variant" : "-target")' value '\(variant.triple)'; use 'ios-macabi' instead"
case .argumentNotSupported(let argument):
Expand All @@ -166,6 +167,7 @@ public final class DarwinToolchain: Toolchain {
public func validateArgs(_ parsedOptions: inout ParsedOptions,
targetTriple: Triple,
targetVariantTriple: Triple?,
compilerOutputType: FileType?,
diagnosticsEngine: DiagnosticsEngine) throws {
// On non-darwin hosts, libArcLite won't be found and a warning will be emitted
// Guard for the sake of tests running on all platforms
Expand All @@ -176,7 +178,8 @@ public final class DarwinToolchain: Toolchain {
diagnosticsEngine: diagnosticsEngine)
#endif
// Validating apple platforms deployment targets.
try validateDeploymentTarget(&parsedOptions, targetTriple: targetTriple)
try validateDeploymentTarget(&parsedOptions, targetTriple: targetTriple,
compilerOutputType: compilerOutputType)
if let targetVariantTriple = targetVariantTriple,
!targetTriple.isValidForZipperingWithTriple(targetVariantTriple) {
throw ToolchainValidationError.unsupportedTargetVariant(variant: targetVariantTriple)
Expand All @@ -198,7 +201,7 @@ public final class DarwinToolchain: Toolchain {
}

func validateDeploymentTarget(_ parsedOptions: inout ParsedOptions,
targetTriple: Triple) throws {
targetTriple: Triple, compilerOutputType: FileType?) throws {
// Check minimum supported OS versions.
if targetTriple.isMacOSX,
targetTriple.version(for: .macOS) < Triple.Version(10, 9, 0) {
Expand All @@ -213,8 +216,11 @@ public final class DarwinToolchain: Toolchain {
throw ToolchainValidationError.osVersionBelowMinimumDeploymentTarget("iOS 7")
}
if targetTriple.arch?.is32Bit == true,
targetTriple.version(for: .iOS(.device)) >= Triple.Version(11, 0, 0) {
throw ToolchainValidationError.iOSVersionAboveMaximumDeploymentTarget(targetTriple.version(for: .iOS(.device)).major)
targetTriple.version(for: .iOS(.device)) >= Triple.Version(11, 0, 0),
compilerOutputType != .swiftModule {
throw
ToolchainValidationError
.invalidDeploymentTargetForIR("iOS 11", targetTriple.archName)
}
} else if targetTriple.isWatchOS,
targetTriple.version(for: .watchOS(.device)) < Triple.Version(2, 0, 0) {
Expand Down
9 changes: 6 additions & 3 deletions Sources/SwiftDriver/Toolchains/Toolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ public protocol Toolchain {
/// Perform platform-specific argument validation.
func validateArgs(_ parsedOptions: inout ParsedOptions,
targetTriple: Triple,
targetVariantTriple: Triple?, diagnosticsEngine: DiagnosticsEngine) throws
targetVariantTriple: Triple?,
compilerOutputType: FileType?,
diagnosticsEngine: DiagnosticsEngine) throws

/// Adds platform-specific linker flags to the provided command line
func addPlatformSpecificLinkerArgs(
Expand Down Expand Up @@ -214,8 +216,9 @@ extension Toolchain {
}

public func validateArgs(_ parsedOptions: inout ParsedOptions,
targetTriple: Triple,
targetVariantTriple: Triple?, diagnosticsEngine: DiagnosticsEngine) {}
targetTriple: Triple, targetVariantTriple: Triple?,
compilerOutputType: FileType?,
diagnosticsEngine: DiagnosticsEngine) {}

public func addPlatformSpecificCommonFrontendOptions(
commandLine: inout [Job.ArgTemplate],
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftDriver/Toolchains/WindowsToolchain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ extension WindowsToolchain.ToolchainValidationError {

public func validateArgs(_ parsedOptions: inout ParsedOptions,
targetTriple: Triple, targetVariantTriple: Triple?,
compilerOutputType: FileType?,
diagnosticEngine: DiagnosticsEngine) throws {
// TODO(compnerd) validate any options we can
}
Expand Down
22 changes: 20 additions & 2 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3039,6 +3039,16 @@ final class SwiftDriverTests: XCTestCase {
}
}

func testValidDeprecatedTargets() throws {
var driver = try Driver(args: ["swiftc", "-emit-module", "-target", "armv7-apple-ios13.0", "foo.swift"])
let plannedJobs = try driver.planBuild()
let emitModuleJob = plannedJobs.first(where: {$0.kind == .emitModule})
XCTAssertNotNil(emitModuleJob)
let currentJob = emitModuleJob!
XCTAssert(currentJob.commandLine.contains(.flag("-target")))
XCTAssert(currentJob.commandLine.contains(.flag("armv7-apple-ios13.0")))
}

func testClangTargetForExplicitModule() throws {
#if os(macOS)
// Check -clang-target is on by defualt when explicit module is on.
Expand Down Expand Up @@ -3133,14 +3143,22 @@ final class SwiftDriverTests: XCTestCase {
}
}

XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "armv7-apple-ios12.0",
XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "armv7-apple-ios12.1",
"foo.swift"])) { error in
guard case DarwinToolchain.ToolchainValidationError.iOSVersionAboveMaximumDeploymentTarget(12) = error else {
guard case DarwinToolchain.ToolchainValidationError.invalidDeploymentTargetForIR("iOS 11", "armv7") = error else {
XCTFail()
return
}
}

XCTAssertThrowsError(try Driver(args: ["swiftc", "-emit-module", "-c", "-target",
"armv7s-apple-ios12.0", "foo.swift"])) { error in
guard case DarwinToolchain.ToolchainValidationError.invalidDeploymentTargetForIR("iOS 11", "armv7s") = error else {
XCTFail()
return
}
}

XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-ios13.0",
"-target-variant", "x86_64-apple-macosx10.14",
"foo.swift"])) { error in
Expand Down