commit 899022b14bc3bde19a949fb042711864ca3a629b
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Jul 09 00:57:56 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Jul 09 00:57:56 2013 +0000
tree 0e09b35d1e5443a0d4729aedfead9139a173d93d
parent d739c4ecf7d7f2222f6f1c8de9e234d1c8a0468c

Generalize hack allowing 'const' in __has_attribute (etc) to allow any token
with identifier info. This covers most identifier-like entities (other than
the ISO646 keywords).


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

lib/Lex/PPMacroExpansion.cpp

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 06f14c2..d21515c 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -1218,9 +1218,7 @@
     if (Tok.is(tok::l_paren)) {
       // Read the identifier
       LexUnexpandedToken(Tok);
-      if (Tok.is(tok::identifier) || Tok.is(tok::kw_const)) {
-        FeatureII = Tok.getIdentifierInfo();
-
+      if ((FeatureII = Tok.getIdentifierInfo())) {
         // Read the ')'.
         LexUnexpandedToken(Tok);
         if (Tok.is(tok::r_paren))