commit 9a14ecbdecd89801d87beae92ad60845374e252a
author Douglas Gregor <dgregor@apple.com> Sat Jul 30 07:08:19 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Sat Jul 30 07:08:19 2011 +0000
tree 1c6bc6f620d1515df588d53ad0936bb400882e99
parent 688761409155b47c39eb5dae1b8c6c8a9f43307a

Fix a thinko in my __is_empty/__is_pod commit.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136561 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/PPMacroExpansion.cpp

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 58ba42e..7046c5f 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -640,12 +640,16 @@
            .Case("is_class", LangOpts.CPlusPlus)
            .Case("is_convertible_to", LangOpts.CPlusPlus)
            .Case("is_empty", 
-                 LangOpts.CPlusPlus && II->getTokenID() != tok::identifier)
+                 LangOpts.CPlusPlus && 
+                 PP.getIdentifierInfo("__is_empty")->getTokenID()
+                                                            != tok::identifier)
            .Case("is_enum", LangOpts.CPlusPlus)
            .Case("is_literal", LangOpts.CPlusPlus)
            .Case("is_standard_layout", LangOpts.CPlusPlus)
            .Case("is_pod", 
-                 LangOpts.CPlusPlus && II->getTokenID() != tok::identifier)
+                 LangOpts.CPlusPlus && 
+                 PP.getIdentifierInfo("__is_pod")->getTokenID()
+                                                            != tok::identifier)
            .Case("is_polymorphic", LangOpts.CPlusPlus)
            .Case("is_trivial", LangOpts.CPlusPlus)
            .Case("is_trivially_copyable", LangOpts.CPlusPlus)