diff options
author | Chris Lattner <sabre@nondot.org> | 2009-11-30 04:18:44 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-11-30 04:18:44 +0000 |
commit | 710bb871478ff60ae81c424218c0ec264beb3e96 (patch) | |
tree | 8fa87a6532c170e184a5cc3dcadf39f702cc509c /clang/lib/Rewrite/HTMLRewrite.cpp | |
parent | 031cb0024656d7c8ec8da0a58a2ccfa98746149a (diff) | |
download | llvm-710bb871478ff60ae81c424218c0ec264beb3e96.zip llvm-710bb871478ff60ae81c424218c0ec264beb3e96.tar.gz llvm-710bb871478ff60ae81c424218c0ec264beb3e96.tar.bz2 |
Fix PR5633 by making the preprocessor handle the case where we can
stat a file but where mmaping it fails. In this case, we emit an
error like:
t.c:1:10: fatal error: error opening file '../../foo.h'
instead of "cannot find file".
llvm-svn: 90110
Diffstat (limited to 'clang/lib/Rewrite/HTMLRewrite.cpp')
-rw-r--r-- | clang/lib/Rewrite/HTMLRewrite.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Rewrite/HTMLRewrite.cpp b/clang/lib/Rewrite/HTMLRewrite.cpp index b4bf419..342b0e6 100644 --- a/clang/lib/Rewrite/HTMLRewrite.cpp +++ b/clang/lib/Rewrite/HTMLRewrite.cpp @@ -353,7 +353,8 @@ void html::SyntaxHighlight(Rewriter &R, FileID FID, const Preprocessor &PP) { RewriteBuffer &RB = R.getEditBuffer(FID); const SourceManager &SM = PP.getSourceManager(); - Lexer L(FID, SM, PP.getLangOptions()); + const llvm::MemoryBuffer *FromFile = SM.getBuffer(FID); + Lexer L(FID, FromFile, SM, PP.getLangOptions()); const char *BufferStart = L.getBufferStart(); // Inform the preprocessor that we want to retain comments as tokens, so we @@ -444,7 +445,8 @@ void html::HighlightMacros(Rewriter &R, FileID FID, const Preprocessor& PP) { const SourceManager &SM = PP.getSourceManager(); std::vector<Token> TokenStream; - Lexer L(FID, SM, PP.getLangOptions()); + const llvm::MemoryBuffer *FromFile = SM.getBuffer(FID); + Lexer L(FID, FromFile, SM, PP.getLangOptions()); // Lex all the tokens in raw mode, to avoid entering #includes or expanding // macros. |