Author: Kadir Cetinkaya Date: 2022-10-05T10:37:32+02:00 New Revision: feea7ef23cb1bef92d363cc613052f8f3a878fc2
URL: https://github.com/llvm/llvm-project/commit/feea7ef23cb1bef92d363cc613052f8f3a878fc2 DIFF: https://github.com/llvm/llvm-project/commit/feea7ef23cb1bef92d363cc613052f8f3a878fc2.diff LOG: Revert "[clang][Lex] Fix a crash on malformed string literals" This reverts commit 36a200208facf58d454c9b7253c956c2f2a8b946. Added: Modified: clang/lib/Lex/LiteralSupport.cpp clang/test/Lexer/char-escapes-delimited.c clang/unittests/Lex/LexerTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Lex/LiteralSupport.cpp b/clang/lib/Lex/LiteralSupport.cpp index 160240e49dd70..1a48a68c28b62 100644 --- a/clang/lib/Lex/LiteralSupport.cpp +++ b/clang/lib/Lex/LiteralSupport.cpp @@ -545,6 +545,7 @@ static bool ProcessNamedUCNEscape(const char *ThisTokBegin, diag::err_delimited_escape_missing_brace) << StringRef(&ThisTokBuf[-1], 1); } + ThisTokBuf++; return false; } ThisTokBuf++; diff --git a/clang/test/Lexer/char-escapes-delimited.c b/clang/test/Lexer/char-escapes-delimited.c index 43ade65a58309..65e3dc740e3b4 100644 --- a/clang/test/Lexer/char-escapes-delimited.c +++ b/clang/test/Lexer/char-escapes-delimited.c @@ -94,7 +94,7 @@ void named(void) { unsigned h = U'\N{LOTUS}'; // ext-warning {{extension}} cxx2b-warning {{C++2b}} unsigned i = u'\N{GREEK CAPITAL LETTER DELTA}'; // ext-warning {{extension}} cxx2b-warning {{C++2b}} - char j = '\NN'; // expected-error {{expected '{' after '\N' escape sequence}} expected-warning {{multi-character character constant}} + char j = '\NN'; // expected-error {{expected '{' after '\N' escape sequence}} unsigned k = u'\N{LOTUS'; // expected-error {{incomplete universal character name}} } diff --git a/clang/unittests/Lex/LexerTest.cpp b/clang/unittests/Lex/LexerTest.cpp index aefe5f1ab35a3..0ad644ce71465 100644 --- a/clang/unittests/Lex/LexerTest.cpp +++ b/clang/unittests/Lex/LexerTest.cpp @@ -18,7 +18,6 @@ #include "clang/Basic/TokenKinds.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/HeaderSearchOptions.h" -#include "clang/Lex/LiteralSupport.h" #include "clang/Lex/MacroArgs.h" #include "clang/Lex/MacroInfo.h" #include "clang/Lex/ModuleLoader.h" @@ -660,11 +659,4 @@ TEST_F(LexerTest, RawAndNormalLexSameForLineComments) { } EXPECT_TRUE(ToksView.empty()); } - -TEST_F(LexerTest, BrokenStringLiteral) { - const llvm::StringLiteral Source = R"cpp("\N")cpp"; - // Make sure this isn't crashing. - StringLiteralParser P(Lex(Source), *PP); - EXPECT_TRUE(P.hadError); -} } // anonymous namespace _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits