commit d4bf760d057f1e8724ab7be340a2d42adae0900a
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 11 18:01:42 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 11 18:01:42 2013 +0000
tree 0a25eeac5a51b382e457168eefdcd2ee74ab20f2
parent f96df9083937e198721f0e1dbd21d882bb4413ae

Add -Wc99-compat warning for C11 unicode string and character literals.


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

lib/Lex/Lexer.cpp

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index e6cc8b9..ed4666a 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -1629,9 +1629,10 @@
   if (!isLexingRawMode() &&
       (Kind == tok::utf8_string_literal ||
        Kind == tok::utf16_string_literal ||
-       Kind == tok::utf32_string_literal) &&
-      getLangOpts().CPlusPlus)
-    Diag(BufferPtr, diag::warn_cxx98_compat_unicode_literal);
+       Kind == tok::utf32_string_literal))
+    Diag(BufferPtr, getLangOpts().CPlusPlus
+           ? diag::warn_cxx98_compat_unicode_literal
+           : diag::warn_c99_compat_unicode_literal);
 
   char C = getAndAdvanceChar(CurPtr, Result);
   while (C != '"') {
@@ -1795,9 +1796,10 @@
   const char *NulCharacter = 0; // Does this character contain the \0 character?
 
   if (!isLexingRawMode() &&
-      (Kind == tok::utf16_char_constant || Kind == tok::utf32_char_constant) &&
-      getLangOpts().CPlusPlus)
-    Diag(BufferPtr, diag::warn_cxx98_compat_unicode_literal);
+      (Kind == tok::utf16_char_constant || Kind == tok::utf32_char_constant))
+    Diag(BufferPtr, getLangOpts().CPlusPlus
+           ? diag::warn_cxx98_compat_unicode_literal
+           : diag::warn_c99_compat_unicode_literal);
 
   char C = getAndAdvanceChar(CurPtr, Result);
   if (C == '\'') {