aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update calls to setup clang::DiagnosticsEngine properly before running preprocessor.

Browse Source 
This fixes (again) crashes when printing diagnostics when there are errors in 
preprocessor directives in the program we're compiling.
This commit is contained in:
Matt Pharr
2011-10-16 07:59:55 -04:00
parent fc2954419d
commit 209d093720
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module.cpp
View File

@@ -885,14 +885,22 @@ void
Module::execPreprocessor(const char* infilename, llvm::raw_string_ostream* ostream) const Module::execPreprocessor(const char* infilename, llvm::raw_string_ostream* ostream) const
{ {
clang::CompilerInstance inst; clang::CompilerInstance inst;
std::string error;
inst.createFileManager(); inst.createFileManager();
llvm::raw_fd_ostream stderrRaw(2, false); llvm::raw_fd_ostream stderrRaw(2, false);
#if defined(LLVM_3_0) || defined(LLVM_3_0svn)
clang::TextDiagnosticPrinter *diagPrinter =
new clang::TextDiagnosticPrinter(stderrRaw, clang::DiagnosticOptions());
llvm::IntrusiveRefCntPtr<clang::DiagnosticIDs> diagIDs(new clang::DiagnosticIDs);
clang::DiagnosticsEngine *diagEngine =
new clang::DiagnosticsEngine(diagIDs, diagPrinter);
inst.setDiagnostics(diagEngine);
#else
clang::TextDiagnosticPrinter *diagPrinter = clang::TextDiagnosticPrinter *diagPrinter =
new clang::TextDiagnosticPrinter(stderrRaw, clang::DiagnosticOptions()); new clang::TextDiagnosticPrinter(stderrRaw, clang::DiagnosticOptions());
inst.createDiagnostics(0, NULL, diagPrinter); inst.createDiagnostics(0, NULL, diagPrinter);
#endif
clang::TargetOptions &options = inst.getTargetOpts(); clang::TargetOptions &options = inst.getTargetOpts();
llvm::Triple triple(module->getTargetTriple()); llvm::Triple triple(module->getTargetTriple());