diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-05-21 04:26:04 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-05-21 04:26:04 +0000 |
| commit | e26224e61c8a3b607c73c52f2cd0344065d7b412 (patch) | |
| tree | 2b0ed18f762db372f9a137ef08375206082ed607 | |
| parent | ce30688b8aa0effd70a7a69a4d1e3d6a2a86efcd (diff) | |
Only ignore extra tokens after #else if we skip it, otherwise warn. Fixes rdar://9475098.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131788 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 4 | ||||
| -rw-r--r-- | test/Preprocessor/if_warning.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index af3fa6e2ad..66e44bbc6d 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -323,7 +323,6 @@ void Preprocessor::SkipExcludedConditionalBlock(SourceLocation IfTokenLoc, // #else directive in a skipping conditional. If not in some other // skipping conditional, and if #else hasn't already been seen, enter it // as a non-skipping conditional. - DiscardUntilEndOfDirective(); // C99 6.10p4. PPConditionalInfo &CondInfo = CurPPLexer->peekConditionalLevel(); // If this is a #else with a #else before it, report the error. @@ -339,7 +338,10 @@ void Preprocessor::SkipExcludedConditionalBlock(SourceLocation IfTokenLoc, // entered, enter the #else block now. if (!CondInfo.WasSkipping && !CondInfo.FoundNonSkip) { CondInfo.FoundNonSkip = true; + CheckEndOfDirective("else"); break; + } else { + DiscardUntilEndOfDirective(); // C99 6.10p4. } } else if (Sub == "lif") { // "elif". PPConditionalInfo &CondInfo = CurPPLexer->peekConditionalLevel(); diff --git a/test/Preprocessor/if_warning.c b/test/Preprocessor/if_warning.c index 345ac95eb4..641ec3b1b9 100644 --- a/test/Preprocessor/if_warning.c +++ b/test/Preprocessor/if_warning.c @@ -20,6 +20,10 @@ extern int x; #endif #endif +// rdar://9475098 +#if 0 +#else 1 // expected-warning {{extra tokens}} +#endif // PR6852 #if 'somesillylongthing' // expected-warning {{character constant too long for its type}} \ |