PR15067 (again): Don't warn about UCNs in C90 if we're raw-lexing.

Fixes a crash. Thanks, Richard.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173701 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 91c4f66403863a23a72e251fb21706154bff6607..3e3aaae5f5f3cd3fb45524677bc98470b993967c 100644 (file)
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -2710,7 +2710,8 @@ uint32_t Lexer::tryReadUCN(const char *&StartPtr, const char *SlashLoc,
     return 0;
 
   if (!LangOpts.CPlusPlus && !LangOpts.C99) {
-    Diag(SlashLoc, diag::warn_ucn_not_valid_in_c89);
+    if (Result && !isLexingRawMode())
+      Diag(SlashLoc, diag::warn_ucn_not_valid_in_c89);
     return 0;
   }
 

diff --git a/test/Lexer/c90.c b/test/Lexer/c90.c
index 826d910b29e18025d0057379dc84513b0b8059dc..649173d71dfbcb893301900f1ec985bc103f3d16 100644 (file)
--- a/test/Lexer/c90.c
+++ b/test/Lexer/c90.c
@@ -41,3 +41,6 @@ int test4() {
 }
 
 #define MY_UCN \u00FC // expected-warning {{universal character names are only valid in C99 or C++; treating as '\' followed by identifier}}
+#define NOT_A_UCN \h // no-warning
+
+extern int idWithUCN\u00FC; // expected-warning {{universal character names are only valid in C99 or C++; treating as '\' followed by identifier}} expected-error {{expected ';'}}