1 files changed, 4 insertions, 0 deletions
diff --git a/clang/Lex/Lexer.cpp b/clang/Lex/Lexer.cpp
index a9905f33916..81ccbca7b83 100644
--- a/clang/Lex/Lexer.cpp
+++ b/clang/Lex/Lexer.cpp
@@ -359,6 +359,10 @@ FinishIdentifier:
     FormTokenWithChars(Result, CurPtr);
     Result.SetKind(tok::identifier);
     
+    // If we are in raw mode, return this identifier raw.  There is no need to
+    // look up identifier information or attempt to macro expand it.
+    if (LexingRawMode) return;
+    
     // Fill in Result.IdentifierInfo, looking up the identifier in the
     // identifier table.
     PP.LookUpIdentifierInfo(Result, IdStart);