maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[driver - crash diagnostics] Convert the flags back to an array of strings and use 

array_lengthof.  Also, append the new filename with correct preprocessed suffix.
Last part of rdar://11285725

llvm-svn: 156117
This commit is contained in:
Chad Rosier 2012-05-03 22:38:00 +00:00
parent 16d127cb7b
commit dcef562557
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Driver/Driver.cpp
View File

@ -521,7 +521,19 @@ void Driver::generateCompilationDiagnostics(Compilation &C,
Cmd.erase(I, E - I + 1); Cmd.erase(I, E - I + 1);
} while(1); } while(1);
} }
// FIXME: Append the new filename with correct preprocessed suffix. // Append the new filename with correct preprocessed suffix.
size_t I, E;
I = Cmd.find("-main-file-name ");
assert (I != std::string::npos && "Expected to find -main-file-name");
I += 16;
E = Cmd.find(" ", I);
assert (E != std::string::npos && "-main-file-name missing argument?");
std::string OldFilename = Cmd.substr(I, E - I);
std::string NewFilename = llvm::sys::path::filename(*it).str();
I = Cmd.rfind(OldFilename);
E = I + OldFilename.length() - 1;
I = Cmd.rfind(" ", I);
Cmd.replace(I + 1, E - I, NewFilename);
ScriptOS << Cmd; ScriptOS << Cmd;
Diag(clang::diag::note_drv_command_failed_diag_msg) << Script; Diag(clang::diag::note_drv_command_failed_diag_msg) << Script;
} }