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-07-31 18:48:50 -07:00
parent 898b181277 374826c960
commit d549147e43
14 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Frontend/CompilerInvocation.cpp
View File

@@ -308,8 +308,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Action = FrontendOptions::EmitPCH;
} else if (Opt.matches(OPT_emit_imported_modules)) {
Action = FrontendOptions::EmitImportedModules;
} else if (Opt.matches(OPT_emit_tbd)) {
Action = FrontendOptions::EmitTBD;
} else if (Opt.matches(OPT_parse)) {
Action = FrontendOptions::Parse;
} else if (Opt.matches(OPT_typecheck)) {
@@ -601,13 +599,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
else
Suffix = "importedmodules";
break;
case FrontendOptions::EmitTBD:
if (Opts.OutputFilenames.empty())
Opts.setSingleOutputFilename("-");
else
Suffix = "tbd";
break;
}
if (!Suffix.empty()) {
@@ -717,6 +708,9 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
OPT_emit_loaded_module_trace_path,
"trace.json", false);
determineOutputFilename(Opts.TBDPath, OPT_emit_tbd, OPT_emit_tbd_path, "tbd",
false);
if (const Arg *A = Args.getLastArg(OPT_emit_fixits_path)) {
Opts.FixitsOutputPath = A->getValue();
}
@@ -771,7 +765,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
case FrontendOptions::EmitTBD:
break;
}
}
@@ -804,7 +797,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
case FrontendOptions::EmitTBD:
break;
}
}
@@ -838,7 +830,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
case FrontendOptions::EmitTBD:
break;
}
}
@@ -875,7 +866,6 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
case FrontendOptions::EmitAssembly:
case FrontendOptions::EmitObject:
case FrontendOptions::EmitImportedModules:
case FrontendOptions::EmitTBD:
break;
}
}