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

Change getSourceFileOfCodeToBeGenerated to getPrimaryOrMainSourceFile.

Browse Source 
# Conflicts:
#	lib/FrontendTool/FrontendTool.cpp
This commit is contained in:
David Ungar
2018-02-05 17:46:47 -08:00
parent 34df54a44a
commit 15011fbc2f
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/FrontendTool/FrontendTool.cpp
View File

@@ -660,9 +660,8 @@ static void dumpAndPrintScopeMap(CompilerInvocation &Invocation,
scope.print(llvm::errs());
}
static SourceFile *
getSourceFileOfCodeToBeGenerated(CompilerInvocation &Invocation,
CompilerInstance &Instance) {
static SourceFile *getPrimaryOrMainSourceFile(CompilerInvocation &Invocation,
CompilerInstance &Instance) {
SourceFile *SF = Instance.getPrimarySourceFile();
if (!SF) {
SourceFileKind Kind = Invocation.getSourceFileKind();
@@ -686,36 +685,35 @@ static Optional<bool> dumpASTIfNeeded(CompilerInvocation &Invocation,
return None;
case FrontendOptions::ActionType::PrintAST:
getSourceFileOfCodeToBeGenerated(Invocation, Instance)
getPrimaryOrMainSourceFile(Invocation, Instance)
->print(llvm::outs(), PrintOptions::printEverything());
break;
case FrontendOptions::ActionType::DumpScopeMaps:
dumpAndPrintScopeMap(
Invocation, Instance,
getSourceFileOfCodeToBeGenerated(Invocation, Instance));
dumpAndPrintScopeMap(Invocation, Instance,
getPrimaryOrMainSourceFile(Invocation, Instance));
break;
case FrontendOptions::ActionType::DumpTypeRefinementContexts:
getSourceFileOfCodeToBeGenerated(Invocation, Instance)
getPrimaryOrMainSourceFile(Invocation, Instance)
->getTypeRefinementContext()
->dump(llvm::errs(), Context.SourceMgr);
break;
case FrontendOptions::ActionType::DumpInterfaceHash:
getSourceFileOfCodeToBeGenerated(Invocation, Instance)
getPrimaryOrMainSourceFile(Invocation, Instance)
->dumpInterfaceHash(llvm::errs());
break;
case FrontendOptions::ActionType::EmitSyntax:
emitSyntax(getSourceFileOfCodeToBeGenerated(Invocation, Instance),
emitSyntax(getPrimaryOrMainSourceFile(Invocation, Instance),
Invocation.getLangOptions(), Instance.getSourceMgr(),
opts.InputsAndOutputs.getSingleOutputFilename());
break;
case FrontendOptions::ActionType::DumpParse:
case FrontendOptions::ActionType::DumpAST:
getSourceFileOfCodeToBeGenerated(Invocation, Instance)->dump();
getPrimaryOrMainSourceFile(Invocation, Instance)->dump();
break;
case FrontendOptions::ActionType::EmitImportedModules:
@@ -1039,8 +1037,8 @@ static void setPrivateDiscriminatorIfNeeded(IRGenOptions &IRGenOpts,
IRGenOpts.DWARFDebugFlags += (" -private-discriminator " + PD.str()).str();
}
static bool serializeSIBIfNeeded(FrontendOptions &opts, SILModule *SM,
ASTContext &Context, ModuleOrSourceFile MSF) {
static bool serializeSIB(FrontendOptions &opts, SILModule *SM,
ASTContext &Context, ModuleOrSourceFile MSF) {
const std::string &moduleOutputPath = opts.ModuleOutputPath;
assert(!moduleOutputPath.empty() && "must have an output path");
@@ -1177,8 +1175,8 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
if (Action == FrontendOptions::ActionType::EmitSIBGen) {
linkAllIfNeeded(Invocation, SM.get());
serializeSIBIfNeeded(Invocation.getFrontendOptions(), SM.get(),
Instance.getASTContext(), MSF);
serializeSIB(Invocation.getFrontendOptions(), SM.get(),
Instance.getASTContext(), MSF);
return Context.hadError();
}
@@ -1237,8 +1235,8 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
opts.ImplicitObjCHeaderPath, moduleIsPublic);
if (Action == FrontendOptions::ActionType::EmitSIB)
return serializeSIBIfNeeded(Invocation.getFrontendOptions(), SM.get(),
Instance.getASTContext(), MSF);
return serializeSIB(Invocation.getFrontendOptions(), SM.get(),
Instance.getASTContext(), MSF);
const bool haveModulePath =
!opts.ModuleOutputPath.empty() || !opts.ModuleDocOutputPath.empty();