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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2017-04-18 15:28:40 -07:00
parent 5764ba83f1 acf4f6e27e
commit 3453ae878b
10 changed files with 88 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Frontend/CompilerInvocation.cpp
View File

@@ -1530,7 +1530,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
return false;
}
bool ParseMigratorArgs(MigratorOptions &Opts, ArgList &Args,
bool ParseMigratorArgs(MigratorOptions &Opts, llvm::Triple &Triple,
StringRef ResourcePath, ArgList &Args,
DiagnosticEngine &Diags) {
using namespace options;
@@ -1548,6 +1549,25 @@ bool ParseMigratorArgs(MigratorOptions &Opts, ArgList &Args,
Opts.DumpMigrationStatesDir = Dumpster->getValue();
}
if (auto DataPath = Args.getLastArg(OPT_api_diff_data_file)) {
Opts.APIDigesterDataStorePath = DataPath->getValue();
} else {
bool Supported = true;
llvm::SmallString<128> dataPath(ResourcePath);
llvm::sys::path::append(dataPath, "migrator");
if (Triple.isMacOSX())
llvm::sys::path::append(dataPath, "macos.json");
else if (Triple.isiOS())
llvm::sys::path::append(dataPath, "ios.json");
else if (Triple.isTvOS())
llvm::sys::path::append(dataPath, "tvos.json");
else if (Triple.isWatchOS())
llvm::sys::path::append(dataPath, "watchos.json");
else
Supported = false;
if (Supported)
Opts.APIDigesterDataStorePath = dataPath.str();
}
return false;
}
@@ -1612,7 +1632,8 @@ bool CompilerInvocation::parseArgs(ArrayRef<const char *> Args,
return true;
}
if (ParseMigratorArgs(MigratorOpts, ParsedArgs, Diags)) {
if (ParseMigratorArgs(MigratorOpts, LangOpts.Target,
SearchPathOpts.RuntimeResourcePath, ParsedArgs, Diags)) {
return true;
}