PR15067: Don't assert when a UCN appears in a C90 file.
Unfortunately, we can't accept the UCN as an extension because we're
required to treat it as two tokens for preprocessing purposes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173622 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 429780e..91c4f66 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -2698,8 +2698,6 @@
uint32_t Lexer::tryReadUCN(const char *&StartPtr, const char *SlashLoc,
Token *Result) {
- assert(LangOpts.CPlusPlus || LangOpts.C99);
-
unsigned CharSize;
char Kind = getCharAndSize(StartPtr, CharSize);
@@ -2711,6 +2709,11 @@
else
return 0;
+ if (!LangOpts.CPlusPlus && !LangOpts.C99) {
+ Diag(SlashLoc, diag::warn_ucn_not_valid_in_c89);
+ return 0;
+ }
+
const char *CurPtr = StartPtr + CharSize;
const char *KindLoc = &CurPtr[-1];
@@ -2737,7 +2740,7 @@
}
}
}
-
+
return 0;
}