diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/Lexer.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Lexer/block_cmt_end.c | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index b071a7525f7..e6030ad1d45 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/lib/Lex/Lexer.cpp @@ -777,9 +777,14 @@ bool Lexer::SkipBCPLComment(Token &Result, const char *CurPtr) { break; // Found the newline? Break out! // Otherwise, this is a hard case. Fall back on getAndAdvanceChar to - // properly decode the character. + // properly decode the character. Read it in raw mode to avoid emitting + // diagnostics about things like trigraphs. If we see an escaped newline, + // we'll handle it below. const char *OldPtr = CurPtr; + bool OldRawMode = isLexingRawMode(); + LexingRawMode = true; C = getAndAdvanceChar(CurPtr, Result); + LexingRawMode = OldRawMode; // If we read multiple characters, and one of those characters was a \r or // \n, then we had an escaped newline within the comment. Emit diagnostic diff --git a/clang/test/Lexer/block_cmt_end.c b/clang/test/Lexer/block_cmt_end.c index 347f78f5e8d..1f0eefddf20 100644 --- a/clang/test/Lexer/block_cmt_end.c +++ b/clang/test/Lexer/block_cmt_end.c @@ -28,3 +28,11 @@ next comment ends with a trigraph escaped newline: */ foo /* expected-error {{expected '=', ',', ';', 'asm', or '__attribute__' after declarator}} */ + +// rdar://6060752 - We should not get warnings about trigraphs in comments: +// '????' +/* ???? */ + + + + |
