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

[Driver] Infer simulator-ness for iOS/tvOS/watchOS.

Browse Source 
Localize the hack to infer simulator-ness of the target in the driver
itself, when it first processes the target. Emit a warning about the
missing "-simulator" and correct the triple immediately.

This gives a longer grace period for tools that might still not pass
through the simulator environment, while narrowing the hack.
This commit is contained in:
Doug Gregor
2020-04-16 13:24:11 -07:00
parent 992ca5651a
commit 643491e37c
3 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Driver/Driver.cpp
View File

@@ -264,17 +264,35 @@ static void validateArgs(DiagnosticEngine &diags, const ArgList &args,
std::unique_ptr<ToolChain>
Driver::buildToolChain(const llvm::opt::InputArgList &ArgList) {
if (const Arg *A = ArgList.getLastArg(options::OPT_target))
if (const Arg *A = ArgList.getLastArg(options::OPT_target)) {
DefaultTargetTriple = llvm::Triple::normalize(A->getValue());
}
const llvm::Triple target(DefaultTargetTriple);
llvm::Triple target(DefaultTargetTriple);
switch (target.getOS()) {
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX:
case llvm::Triple::IOS:
case llvm::Triple::TvOS:
case llvm::Triple::WatchOS: {
case llvm::Triple::WatchOS:
// Backward compatibility hack: infer "simulator" environment for x86
// iOS/tvOS/watchOS.
if (!target.isSimulatorEnvironment() &&
(target.getArch() == llvm::Triple::x86 ||
target.getArch() == llvm::Triple::x86_64) &&
!tripleIsMacCatalystEnvironment(target)) {
// Set the simulator environment.
target.setEnvironment(llvm::Triple::EnvironmentType::Simulator);
auto newTargetTriple = target.normalize();
Diags.diagnose(SourceLoc(), diag::warning_inferred_simulator_target,
DefaultTargetTriple, newTargetTriple);
DefaultTargetTriple = newTargetTriple;
}
LLVM_FALLTHROUGH;
case llvm::Triple::Darwin:
case llvm::Triple::MacOSX: {
Optional<llvm::Triple> targetVariant;
if (const Arg *A = ArgList.getLastArg(options::OPT_target_variant))
targetVariant = llvm::Triple(llvm::Triple::normalize(A->getValue()));