summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-05-13 06:10:29 +0000
committerChris Lattner <sabre@nondot.org>2009-05-13 06:10:29 +0000
commitff96dd0301af133735afcea0085fd67e5b10c7ad (patch)
tree7a8a2c346d9de9bacff9f6c95cab5cffe21c90f2 /clang/lib/Lex
parentc898a68998ba5ea8cc0c0bc315500202671f7db7 (diff)
downloadbcm5719-llvm-ff96dd0301af133735afcea0085fd67e5b10c7ad.tar.gz
bcm5719-llvm-ff96dd0301af133735afcea0085fd67e5b10c7ad.zip
Fix rdar://6880630 - # in _Pragma does not start a preprocessor directive.
llvm-svn: 71643
Diffstat (limited to 'clang/lib/Lex')
-rw-r--r--clang/lib/Lex/Lexer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 3f78be68c13..c2ffd6d4339 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -1631,7 +1631,7 @@ LexNextToken:
// it's actually the start of a preprocessing directive. Callback to
// the preprocessor to handle it.
// FIXME: -fpreprocessed mode??
- if (Result.isAtStartOfLine() && !LexingRawMode) {
+ if (Result.isAtStartOfLine() && !LexingRawMode && !Is_PragmaLexer) {
FormTokenWithChars(Result, CurPtr, tok::hash);
PP->HandleDirective(Result);
@@ -1762,7 +1762,7 @@ LexNextToken:
// it's actually the start of a preprocessing directive. Callback to
// the preprocessor to handle it.
// FIXME: -fpreprocessed mode??
- if (Result.isAtStartOfLine() && !LexingRawMode) {
+ if (Result.isAtStartOfLine() && !LexingRawMode && !Is_PragmaLexer) {
FormTokenWithChars(Result, CurPtr, tok::hash);
PP->HandleDirective(Result);
OpenPOWER on IntegriCloud