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

[driver] Reworked Driver::buildJobsForAction() so that it doesn’t create the same Job multiple times.

Browse Source 
Since a Job may be reached through multiple paths in the dependency graph, we
need to include support for caching Jobs. (Currently, the cache maps
Action/ToolChain pairs to Jobs.)

As a result of these changes, Tool::constructJob() and
Driver::buildJobsForAction() return a plain Job *, instead of a
std::unique_ptr<Job>, since the Jobs returned by buildJobsForAction() no longer
need to be unique.

Swift SVN r12443
This commit is contained in:
Connor Wakamo
2014-01-17 00:47:21 +00:00
parent 31df3cb241
commit 40b38c40b2
5 changed files with 71 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Driver/Tools.cpp
View File

@@ -29,12 +29,10 @@ using namespace llvm::opt;
/// Swift Tool
std::unique_ptr<Job> Swift::constructJob(const JobAction &JA,
std::unique_ptr<JobList> Inputs,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions,
const ArgList &Args,
StringRef LinkingOutput) const {
Job *Swift::constructJob(const JobAction &JA, std::unique_ptr<JobList> Inputs,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions, const ArgList &Args,
StringRef LinkingOutput) const {
ArgStringList Arguments;
const char *Exec = getToolChain().getDriver().getSwiftProgramPath();
@@ -139,10 +137,8 @@ std::unique_ptr<Job> Swift::constructJob(const JobAction &JA,
Args.AddLastArg(Arguments, options::OPT__DASH_DASH);
}
std::unique_ptr<Job> Cmd(new Command(JA, *this, std::move(Inputs),
std::move(Output),
Exec, Arguments));
return Cmd;
return new Command(JA, *this, std::move(Inputs), std::move(Output), Exec,
Arguments);
}
/// Darwin Tools
@@ -172,13 +168,12 @@ void darwin::DarwinTool::AddDarwinArch(const ArgList &Args,
CmdArgs.push_back(Args.MakeArgString(ArchName));
}
std::unique_ptr<Job>
darwin::Linker::constructJob(const JobAction &JA,
std::unique_ptr<JobList> Inputs,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions,
const ArgList &Args,
StringRef LinkingOutput) const {
Job *darwin::Linker::constructJob(const JobAction &JA,
std::unique_ptr<JobList> Inputs,
std::unique_ptr<CommandOutput> Output,
const ActionList &InputActions,
const ArgList &Args,
StringRef LinkingOutput) const {
assert(Output->getType() == types::TY_Image && "Invalid linker output type.");
ArgStringList Arguments;
Arguments.push_back("-v");
@@ -186,8 +181,6 @@ darwin::Linker::constructJob(const JobAction &JA,
std::string Exec = getToolChain().getDriver().getProgramPath("ld",
getToolChain());
std::unique_ptr<Job>Cmd (new Command(JA, *this, std::move(Inputs),
std::move(Output),
Args.MakeArgString(Exec), Arguments));
return Cmd;
return new Command(JA, *this, std::move(Inputs), std::move(Output),
Args.MakeArgString(Exec), Arguments);
}