diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-07-12 04:25:32 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-07-12 04:25:32 +0000 |
| commit | 63dae6e5ad23cab32f5e556c1b0dc3e4576edc83 (patch) | |
| tree | 231f43cae24001f7175042d4dc1b7dae68db5e99 | |
| parent | 9fc1873a3da0af8ef91e4f1927f3540f9af2038f (diff) | |
we do in fact have to cache the EOF token returned by the preprocessor.
In the case of backtracking, the cached token lexer will be the only
lexer on the stack, without this the token stack will be empty and EOF
won't be returned.
This fixes PR7072.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108124 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/PPCaching.cpp | 9 | ||||
| -rw-r--r-- | test/Parser/backtrack-crash.cpp | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/Lex/PPCaching.cpp b/lib/Lex/PPCaching.cpp index 6aeb6fa3a2..20e3b3dd9d 100644 --- a/lib/Lex/PPCaching.cpp +++ b/lib/Lex/PPCaching.cpp @@ -60,13 +60,10 @@ void Preprocessor::CachingLex(Token &Result) { return; } - // We should cache the lexed token. - + // Cache the lexed token. EnterCachingLexMode(); - if (Result.isNot(tok::eof)) { - CachedTokens.push_back(Result); - ++CachedLexPos; - } + CachedTokens.push_back(Result); + ++CachedLexPos; } void Preprocessor::EnterCachingLexMode() { diff --git a/test/Parser/backtrack-crash.cpp b/test/Parser/backtrack-crash.cpp new file mode 100644 index 0000000000..cc26873729 --- /dev/null +++ b/test/Parser/backtrack-crash.cpp @@ -0,0 +1,4 @@ +// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic +// PR7072 +()( // expected-error {{expected unqualified-id}} + |