diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2013-01-30 19:21:12 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2013-01-30 19:21:12 +0000 |
| commit | 20afc2977cd0a6bacbe6218a633cd59a24463e2f (patch) | |
| tree | 532c3b3a1ff81bba692a04fee45fd87d77c7a3cc | |
| parent | ac3a3e7a402cd349dd2b7d70cd92c5fe702ae831 (diff) | |
Fix r173881 to properly skip invalid UTF-8 characters in raw lexing and -E.
This caused hangs as we processed the same invalid byte over and over.
<rdar://problem/13115651>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173959 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/Lexer.cpp | 1 | ||||
| -rw-r--r-- | test/Lexer/utf8-invalid.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 6a918d6a3a..4b5a3135c3 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -3538,6 +3538,7 @@ LexNextToken: return LexUnicode(Result, CodePoint, CurPtr); if (isLexingRawMode() || PP->isPreprocessedOutput()) { + ++CurPtr; Kind = tok::unknown; break; } diff --git a/test/Lexer/utf8-invalid.c b/test/Lexer/utf8-invalid.c index c4dd318e78..f9d2b59a6b 100644 --- a/test/Lexer/utf8-invalid.c +++ b/test/Lexer/utf8-invalid.c @@ -1,6 +1,12 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -E %s -o /dev/null // Note: this file contains invalid UTF-8 before the variable name in the // next line. Please do not fix! extern int ‚x; // expected-error{{source file is not valid UTF-8}} + +#if 0 +// Don't warn about bad UTF-8 in raw lexing mode. +extern int ‚x; +#endif |