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

Only use supplementary outputs for first parallel-generated input.

Browse Source
This commit is contained in:
David Ungar
2018-02-15 10:17:22 -07:00
parent e7a120f9b3
commit dec78900cd
5 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/FrontendTool/FrontendTool.cpp
View File

@@ -1065,9 +1065,8 @@ static void setPrivateDiscriminatorIfNeeded(IRGenOptions &IRGenOpts,
IRGenOpts.DWARFDebugFlags += (" -private-discriminator " + PD.str()).str();
}
static bool serializeSIB(FrontendOptions &opts, SILModule *SM,
const PrimarySpecificPaths &PSPs, ASTContext &Context,
ModuleOrSourceFile MSF) {
static bool serializeSIB(SILModule *SM, const PrimarySpecificPaths &PSPs,
ASTContext &Context, ModuleOrSourceFile MSF) {
const std::string &moduleOutputPath =
PSPs.SupplementaryOutputs.ModuleOutputPath;
assert(!moduleOutputPath.empty() && "must have an output path");
@@ -1209,8 +1208,7 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
if (Action == FrontendOptions::ActionType::EmitSIBGen) {
linkAllIfNeeded(Invocation, SM.get());
serializeSIB(Invocation.getFrontendOptions(), SM.get(), PSPs,
Instance.getASTContext(), MSF);
serializeSIB(SM.get(), PSPs, Instance.getASTContext(), MSF);
return Context.hadError();
}
@@ -1271,8 +1269,7 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
opts.ImplicitObjCHeaderPath, moduleIsPublic);
if (Action == FrontendOptions::ActionType::EmitSIB)
return serializeSIB(Invocation.getFrontendOptions(), SM.get(), PSPs,
Instance.getASTContext(), MSF);
return serializeSIB(SM.get(), PSPs, Instance.getASTContext(), MSF);
const bool haveModulePath =
!PSPs.SupplementaryOutputs.ModuleOutputPath.empty() ||