commit 795eee96b3c60bbfbdfafba1d8562db07d82b3a9
author Erik Verbruggen <erikjv@me.com> Wed Jul 05 09:44:07 2017 +0000
committer Erik Verbruggen <erikjv@me.com> Wed Jul 05 09:44:07 2017 +0000
tree f8413a04fbfe61d9728cf9798e532e335f321be7
parent d93a35ae40bc44e1bae4af69c6b10ba76846781a

Fix invalid warnings for header guards in preambles

Fixes https://bugs.llvm.org/show_bug.cgi?id=33574

Differential Revision: https://reviews.llvm.org/D34882

llvm-svn: 307134

clang/lib/Lex/Lexer.cpp

diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp
index 012189a..61bcef8 100644
--- a/clang/lib/Lex/Lexer.cpp
+++ b/clang/lib/Lex/Lexer.cpp
@@ -2550,7 +2550,7 @@
     return true;
   }
   
-  if (PP->isRecordingPreamble() && !PP->isInMainFile()) {
+  if (PP->isRecordingPreamble() && PP->isInPrimaryFile()) {
     PP->setRecordedPreambleConditionalStack(ConditionalStack);
     ConditionalStack.clear();
   }