diff options
author | Chad Rosier <mcrosier@apple.com> | 2013-01-29 20:15:05 +0000 |
---|---|---|
committer | Chad Rosier <mcrosier@apple.com> | 2013-01-29 20:15:05 +0000 |
commit | a16355c31878403443f99077cc8df8318457faf5 (patch) | |
tree | a09155eff30a4a409d7ef68e7386524c1925af41 /lib/Driver/Compilation.cpp | |
parent | d4f2c2e21addd8ed0a50b92f062d3229cde0506a (diff) |
[driver] Refactor the driver so that a failing commands doesn't prevent
subsequent commands from being executed.
The diagnostics generation isn't designed for this use case, so add a note to
fix this in the very near future. For now, just generated the diagnostics for
the first failing command.
Part of rdar://12984531
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173825 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Compilation.cpp')
-rw-r--r-- | lib/Driver/Compilation.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index 96e6048551..da589b9d5b 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -307,17 +307,17 @@ int Compilation::ExecuteCommand(const Command &C, return Res; } -int Compilation::ExecuteJob(const Job &J, - const Command *&FailingCommand) const { +void Compilation::ExecuteJob(const Job &J, + SmallVectorImpl< std::pair<int, const Command *> > &FailingCommands) const { if (const Command *C = dyn_cast<Command>(&J)) { - return ExecuteCommand(*C, FailingCommand); + const Command *FailingCommand = 0; + if (int Res = ExecuteCommand(*C, FailingCommand)) + FailingCommands.push_back(std::make_pair(Res, FailingCommand)); } else { const JobList *Jobs = cast<JobList>(&J); - for (JobList::const_iterator - it = Jobs->begin(), ie = Jobs->end(); it != ie; ++it) - if (int Res = ExecuteJob(**it, FailingCommand)) - return Res; - return 0; + for (JobList::const_iterator it = Jobs->begin(), ie = Jobs->end(); + it != ie; ++it) + ExecuteJob(**it, FailingCommands); } } |