From: David Blaikie <dblaikie@gmail.com>
Date: Fri, 15 Jun 2012 00:47:13 +0000 (+0000)
Subject: Fix PR13065.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a8354659a6007bbae3b5d9161a56ecc8f61a219;p=clang

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
---

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 */