diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-06-15 00:47:13 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-06-15 00:47:13 +0000 |
| commit | 1a8354659a6007bbae3b5d9161a56ecc8f61a219 (patch) | |
| tree | 2d0ff393b0e0bb9d82f17d67ae43a4648658ed7b | |
| parent | e099125e58bd9a4c5c9ad486fa86683d1745fbb7 (diff) | |
Fix PR13065.
This condition (added in r158093) was overly conservative.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158483 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/Lexer.cpp | 2 | ||||
| -rw-r--r-- | test/Preprocessor/comment_save.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 9662f9d909..208951faf3 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -2631,7 +2631,7 @@ LexNextToken: ParsingPreprocessorDirective = false; // Restore comment saving mode, in case it was disabled for directive. - if (!LexingRawMode) + if (PP) SetCommentRetentionState(PP->getCommentRetentionState()); // Since we consumed a newline, we are back at the start of a line. diff --git a/test/Preprocessor/comment_save.c b/test/Preprocessor/comment_save.c index b86004272b..996c14ca97 100644 --- a/test/Preprocessor/comment_save.c +++ b/test/Preprocessor/comment_save.c @@ -6,3 +6,7 @@ /* bar */ // CHECK: /* bar */ +#if FOO +#endif +/* baz */ +// CHECK: /* baz */ |