don't inform comment handlers about comments in #if 0 blocks,

doing so invalidates the file guard optimization and is not
in the spirit of "#if 0" because it is supposed to completely
skip everything, even if it isn't lexically valid. Patch by
Abramo Bagnara!

llvm-svn: 95253
This commit is contained in:
Chris Lattner 2010-02-03 21:06:21 +00:00
parent 00f1e6c030
commit 93ddf80eb7
1 changed files with 9 additions and 7 deletions

View File

@ -985,10 +985,11 @@ bool Lexer::SkipBCPLComment(Token &Result, const char *CurPtr) {
if (CurPtr == BufferEnd+1) { --CurPtr; break; }
} while (C != '\n' && C != '\r');
// Found but did not consume the newline.
if (PP && PP->HandleComment(Result,
SourceRange(getSourceLocation(BufferPtr),
getSourceLocation(CurPtr)))) {
// Found but did not consume the newline. Notify comment handlers about the
// comment unless we're in a #if 0 block.
if (PP && !isLexingRawMode() &&
PP->HandleComment(Result, SourceRange(getSourceLocation(BufferPtr),
getSourceLocation(CurPtr)))) {
BufferPtr = CurPtr;
return true; // A token has to be returned.
}
@ -1235,9 +1236,10 @@ bool Lexer::SkipBlockComment(Token &Result, const char *CurPtr) {
C = *CurPtr++;
}
if (PP && PP->HandleComment(Result,
SourceRange(getSourceLocation(BufferPtr),
getSourceLocation(CurPtr)))) {
// Notify comment handlers about the comment unless we're in a #if 0 block.
if (PP && !isLexingRawMode() &&
PP->HandleComment(Result, SourceRange(getSourceLocation(BufferPtr),
getSourceLocation(CurPtr)))) {
BufferPtr = CurPtr;
return true; // A token has to be returned.
}