From: Ted Kremenek Date: Fri, 21 Nov 2008 20:51:15 +0000 (+0000) Subject: When creating the raw tokens for PTHLexer, make sure the token representing the file... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5a8f0bde67505851e0fa264e1ec4de8de8f5bc2;p=clang When creating the raw tokens for PTHLexer, make sure the token representing the file to include is checked for being an identifier. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59842 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp index da877493a0..e755edb55e 100644 --- a/lib/Lex/PPLexerChange.cpp +++ b/lib/Lex/PPLexerChange.cpp @@ -74,7 +74,7 @@ void Preprocessor::EnterSourceFile(unsigned FileID, if (MaxIncludeStackDepth < IncludeMacroStack.size()) MaxIncludeStackDepth = IncludeMacroStack.size(); -#if 1 +#if 0 Lexer *TheLexer = new Lexer(SourceLocation::getFileLoc(FileID, 0), *this); EnterSourceFileWithLexer(TheLexer, CurDir); #else @@ -122,6 +122,9 @@ void Preprocessor::EnterSourceFile(unsigned FileID, L.ParsingPreprocessorDirective = true; L.LexIncludeFilename(Tok); L.ParsingPreprocessorDirective = false; + + if (Tok.is(tok::identifier)) + Tok.setIdentifierInfo(LookUpIdentifierInfo(Tok)); } } }