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

Provide a properly initialized TextDiagnosticPrinter to clang's preprocessor.

Browse Source 
Fixes issue #100 (crash when the preprocessor was trying to emit a diagnostic
about a mismatched #if/#endif).
This commit is contained in:
Matt Pharr
2011-09-23 15:50:18 -07:00
parent 4e91f3777a
commit b3d3e8987b
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module.cpp
View File

@@ -78,6 +78,7 @@
#include <llvm/Analysis/Verifier.h> #include <llvm/Analysis/Verifier.h>
#include <llvm/Support/CFG.h> #include <llvm/Support/CFG.h>
#include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/CompilerInstance.h>
#include <clang/Frontend/TextDiagnosticPrinter.h>
#include <clang/Frontend/Utils.h> #include <clang/Frontend/Utils.h>
#include <clang/Basic/TargetInfo.h> #include <clang/Basic/TargetInfo.h>
#include <llvm/Support/ToolOutputFile.h> #include <llvm/Support/ToolOutputFile.h>
@@ -1388,23 +1389,26 @@ Module::execPreprocessor(const char* infilename, llvm::raw_string_ostream* ostre
std::string error; std::string error;
inst.createFileManager(); inst.createFileManager();
inst.createDiagnostics(0, NULL);
clang::TargetOptions& options = inst.getTargetOpts();
llvm::raw_fd_ostream stderrRaw(2, false);
clang::TextDiagnosticPrinter *diagPrinter =
new clang::TextDiagnosticPrinter(stderrRaw, clang::DiagnosticOptions());
inst.createDiagnostics(0, NULL, diagPrinter);
clang::TargetOptions &options = inst.getTargetOpts();
llvm::Triple triple(module->getTargetTriple()); llvm::Triple triple(module->getTargetTriple());
if (triple.getTriple().empty()) if (triple.getTriple().empty())
triple.setTriple(llvm::sys::getHostTriple()); triple.setTriple(llvm::sys::getHostTriple());
options.Triple = triple.getTriple(); options.Triple = triple.getTriple();
clang::TargetInfo* target clang::TargetInfo *target =
= clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(), options); clang::TargetInfo::CreateTargetInfo(inst.getDiagnostics(), options);
inst.setTarget(target); inst.setTarget(target);
inst.createSourceManager(inst.getFileManager()); inst.createSourceManager(inst.getFileManager());
inst.InitializeSourceManager(infilename); inst.InitializeSourceManager(infilename);
clang::PreprocessorOptions& opts = inst.getPreprocessorOpts(); clang::PreprocessorOptions &opts = inst.getPreprocessorOpts();
//Add defs for ISPC and PI //Add defs for ISPC and PI
opts.addMacroDef("ISPC"); opts.addMacroDef("ISPC");
@@ -1417,7 +1421,10 @@ Module::execPreprocessor(const char* infilename, llvm::raw_string_ostream* ostre
} }
} }
inst.createPreprocessor(); inst.createPreprocessor();
clang::LangOptions langOptions;
diagPrinter->BeginSourceFile(langOptions, &inst.getPreprocessor());
clang::DoPrintPreprocessedInput(inst.getPreprocessor(), clang::DoPrintPreprocessedInput(inst.getPreprocessor(),
ostream, inst.getPreprocessorOutputOpts()); ostream, inst.getPreprocessorOutputOpts());
diagPrinter->EndSourceFile();
} }