From 9c74e4310c894a6083e8fe1d95a4d38526397fbb Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Fri, 20 Apr 2012 00:30:04 +0000 Subject: [PATCH] When generating the clang crash diagnostic script, strip out the -D, -F, and -I flags. We have preprocessed source, so we don't need these. No test case as it's fairly difficult to make the compiler crash on demand. I'll patiently wait for Ben to tell me how to do this in 2 lines of code. :) rdar://11283560 llvm-svn: 155180 --- clang/lib/Driver/Driver.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 3ddac69e98cb..1ffa9b7b7d9c 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -489,6 +489,20 @@ void Driver::generateCompilationDiagnostics(Compilation &C, Diag(clang::diag::note_drv_command_failed_diag_msg) << "Error generating run script: " + Script + " " + Err; } else { + // Strip -D, -F, and -I. + // FIXME: This doesn't work with quotes (e.g., -D "foo bar"). + std::string Flag[3] = {"-D ", "-F", "-I "}; + for (unsigned i = 0; i < 3; ++i) { + size_t I = 0, E = 0; + do { + I = Cmd.find(Flag[i], I); + if (I == std::string::npos) break; + + E = Cmd.find(" ", I + Flag[i].length()); + if (E == std::string::npos) break; + Cmd.erase(I, E - I + 1); + } while(1); + } ScriptOS << Cmd; Diag(clang::diag::note_drv_command_failed_diag_msg) << Script; }