diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-02-26 19:42:53 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-02-26 19:42:53 +0000 |
| commit | 19943151b8d01768b42218ae36189aecd41951b0 (patch) | |
| tree | a7e772ccdd185308c742dfe9f42dfd7b5893b901 | |
| parent | 7f70dc85d5055c19c8003f43a59135de211ad1b9 (diff) | |
fix rdar://7683173, rejecting an invalid conditional
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97253 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/PPExpressions.cpp | 2 | ||||
| -rw-r--r-- | test/Preprocessor/directive-invalid.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp index 2a6b2a7294..3b620d0934 100644 --- a/lib/Lex/PPExpressions.cpp +++ b/lib/Lex/PPExpressions.cpp @@ -106,7 +106,7 @@ static bool EvaluateDefined(PPValue &Result, Token &PeekTok, DefinedTracker &DT, // Consume identifier. Result.setEnd(PeekTok.getLocation()); - PP.LexNonComment(PeekTok); + PP.LexUnexpandedToken(PeekTok); // If we are in parens, ensure we have a trailing ). if (LParenLoc.isValid()) { diff --git a/test/Preprocessor/directive-invalid.c b/test/Preprocessor/directive-invalid.c new file mode 100644 index 0000000000..86cd253bf2 --- /dev/null +++ b/test/Preprocessor/directive-invalid.c @@ -0,0 +1,7 @@ +// RUN: %clang_cc1 -E -verify %s +// rdar://7683173 + +#define r_paren ) +#if defined( x r_paren // expected-error {{missing ')' after 'defined'}} \ + // expected-note {{to match this '('}} +#endif |