1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index 82c4d926ae..c945843459 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -326,8 +326,9 @@ void TokenLexer::Lex(Token &Tok) {
   }
   
   // Handle recursive expansion!
-  if (Tok.getIdentifierInfo() && !DisableMacroExpansion)
-    return PP.HandleIdentifier(Tok);
+  if (Tok.getIdentifierInfo() && !DisableMacroExpansion &&
+      Tok.getIdentifierInfo()->isHandleIdentifierCase())
+    PP.HandleIdentifier(Tok);
 
   // Otherwise, return a normal token.
 }