diff options
| -rw-r--r-- | lib/Driver/Compilation.cpp | 29 | ||||
| -rw-r--r-- | test/Driver/inhibit-downstream-commands.c | 5 |
2 files changed, 33 insertions, 1 deletions
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index df904f06b7..db948a5bfe 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -307,9 +307,36 @@ int Compilation::ExecuteCommand(const Command &C, return Res; } +typedef SmallVectorImpl< std::pair<int, const Command *> > FailingCommandList; + +static bool ActionFailed(const Action *A, + const FailingCommandList &FailingCommands) { + + if (FailingCommands.empty()) + return false; + + for (FailingCommandList::const_iterator CI = FailingCommands.begin(), + CE = FailingCommands.end(); CI != CE; ++CI) + if (A == &(CI->second->getSource())) + return true; + + for (Action::const_iterator AI = A->begin(), AE = A->end(); AI != AE; ++AI) + if (ActionFailed(*AI, FailingCommands)) + return true; + + return false; +} + +static bool InputsOk(const Command &C, + const FailingCommandList &FailingCommands) { + return !ActionFailed(&C.getSource(), FailingCommands); +} + void Compilation::ExecuteJob(const Job &J, - SmallVectorImpl< std::pair<int, const Command *> > &FailingCommands) const { + FailingCommandList &FailingCommands) const { if (const Command *C = dyn_cast<Command>(&J)) { + if (!InputsOk(*C, FailingCommands)) + return; const Command *FailingCommand = 0; if (int Res = ExecuteCommand(*C, FailingCommand)) FailingCommands.push_back(std::make_pair(Res, FailingCommand)); diff --git a/test/Driver/inhibit-downstream-commands.c b/test/Driver/inhibit-downstream-commands.c new file mode 100644 index 0000000000..e06fdb1a3d --- /dev/null +++ b/test/Driver/inhibit-downstream-commands.c @@ -0,0 +1,5 @@ +// RUN: %clang -no-integrated-as %s 2>&1 | FileCheck %s +// CHECK: error: unknown type name 'invalid' +// CHECK-NOT: clang: error: assembler command failed +// CHECK-NOT: clang: error: linker command failed +invalid C code! |