diff --git a/clang/tools/driver/driver.cpp b/tools/driver/driver.cpp --- a/clang/tools/driver/driver.cpp +++ b/tools/driver/driver.cpp @@ -505,7 +505,10 @@ bool IsCrash = false; Driver::CommandStatus CommandStatus = Driver::CommandStatus::Ok; // Pretend the first command failed if ReproStatus is Always. - const Command *FailingCommand = &*C->getJobs().begin(); + const Command *FailingCommand = nullptr; + if (!C->getJobs().empty()) + FailingCommand = &*C->getJobs().begin(); + if (C && !C->containsError()) { SmallVector, 4> FailingCommands; Res = TheDriver.ExecuteCompilation(*C, FailingCommands); @@ -542,7 +545,8 @@ // crash, but only if we're crashing due to FORCE_CLANG_DIAGNOSTICS_CRASH. if (::getenv("FORCE_CLANG_DIAGNOSTICS_CRASH")) llvm::dbgs() << llvm::getBugReportMsg(); - if (TheDriver.maybeGenerateCompilationDiagnostics(CommandStatus, ReproLevel, + if (FailingCommand != nullptr && + TheDriver.maybeGenerateCompilationDiagnostics(CommandStatus, ReproLevel, *C, *FailingCommand)) Res = 1;