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-27 15:56:02 -07:00
parent b0ff277c2a 37ac1a0c99
commit cdde06ac25
309 changed files with 10355 additions and 2149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Frontend/CompilerInvocation.cpp
View File

@@ -321,8 +321,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Action = FrontendOptions::REPL;
} else if (Opt.matches(OPT_interpret)) {
Action = FrontendOptions::Immediate;
} else if (Opt.matches(OPT_update_code)) {
Action = FrontendOptions::UpdateCode;
} else {
llvm_unreachable("Unhandled mode option");
}
@@ -560,10 +558,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Suffix = "importedmodules";
break;
case FrontendOptions::UpdateCode:
Suffix = REMAP_EXTENSION;
break;
case FrontendOptions::EmitTBD:
if (Opts.OutputFilenames.empty())
Opts.setSingleOutputFilename("-");
@@ -714,7 +708,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::DumpTypeRefinementContexts:
case FrontendOptions::Immediate:
case FrontendOptions::REPL:
case FrontendOptions::UpdateCode:
Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_dependencies);
return true;
case FrontendOptions::Parse:
@@ -747,7 +740,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::DumpTypeRefinementContexts:
case FrontendOptions::Immediate:
case FrontendOptions::REPL:
case FrontendOptions::UpdateCode:
Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_header);
return true;
case FrontendOptions::Parse:
@@ -779,7 +771,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::DumpTypeRefinementContexts:
case FrontendOptions::Immediate:
case FrontendOptions::REPL:
case FrontendOptions::UpdateCode:
Diags.diagnose(SourceLoc(),
diag::error_mode_cannot_emit_loaded_module_trace);
return true;
@@ -816,7 +807,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitSILGen:
case FrontendOptions::Immediate:
case FrontendOptions::REPL:
case FrontendOptions::UpdateCode:
if (!Opts.ModuleOutputPath.empty())
Diags.diagnose(SourceLoc(), diag::error_mode_cannot_emit_module);
else
@@ -1578,11 +1568,16 @@ bool ParseMigratorArgs(MigratorOptions &Opts, llvm::Triple &Triple,
using namespace options;
Opts.AddObjC |= Args.hasArg(OPT_warn_swift3_objc_inference);
Opts.DumpUsr = Args.hasArg(OPT_dump_usr);
if (Args.hasArg(OPT_disable_migrator_fixits)) {
Opts.EnableMigratorFixits = false;
}
if (auto RemapFilePath = Args.getLastArg(OPT_emit_remap_file_path)) {
Opts.EmitRemapFilePath = RemapFilePath->getValue();
}
if (auto MigratedFilePath = Args.getLastArg(OPT_emit_migrated_file_path)) {
Opts.EmitMigratedFilePath = MigratedFilePath->getValue();
}
@@ -1610,6 +1605,7 @@ bool ParseMigratorArgs(MigratorOptions &Opts, llvm::Triple &Triple,
if (Supported)
Opts.APIDigesterDataStorePath = dataPath.str();
}
return false;
}