From cccbdbf0dbc14f769432a917b0eaec6041ff8a07 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Mon, 28 Jan 2013 17:49:02 +0000 Subject: [PATCH] PR15067 (again): Don't warn about UCNs in C90 if we're raw-lexing. Fixes a crash. Thanks, Richard. llvm-svn: 173701 --- clang/lib/Lex/Lexer.cpp | 3 ++- clang/test/Lexer/c90.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index 91c4f66..3e3aaae 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/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/clang/test/Lexer/c90.c b/clang/test/Lexer/c90.c index 826d910..649173d 100644 --- a/clang/test/Lexer/c90.c +++ b/clang/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 ';'}} -- 2.7.4