DaanDeMeyer updated this revision to Diff 387667.
DaanDeMeyer added a comment.
clang-format
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D114003/new/
https://reviews.llvm.org/D114003
Files:
clang/lib/Lex/LiteralSupport.cpp
Index: clang/lib/Lex/LiteralSupport.cpp
===================================================================
--- clang/lib/Lex/LiteralSupport.cpp
+++ clang/lib/Lex/LiteralSupport.cpp
@@ -693,12 +693,6 @@
: SM(SM), LangOpts(LangOpts), Diags(Diags),
ThisTokBegin(TokSpelling.begin()), ThisTokEnd(TokSpelling.end()) {
- // This routine assumes that the range begin/end matches the regex for
integer
- // and FP constants (specifically, the 'pp-number' regex), and assumes that
- // the byte at "*end" is both valid and not part of the regex. Because of
- // this, it doesn't have to check for 'overscan' in various places.
- assert(!isPreprocessingNumberBody(*ThisTokEnd) && "didn't maximally munch?");
-
s = DigitsBegin = ThisTokBegin;
saw_exponent = false;
saw_period = false;
@@ -718,6 +712,16 @@
isAccum = false;
hadError = false;
+ // This routine assumes that the range begin/end matches the regex for
integer
+ // and FP constants (specifically, the 'pp-number' regex), and assumes that
+ // the byte at "*end" is both valid and not part of the regex. Because of
+ // this, it doesn't have to check for 'overscan' in various places.
+ if (isPreprocessingNumberBody(*ThisTokEnd)) {
+ Diags.Report(TokLoc, diag::err_lexing_string);
+ hadError = true;
+ return;
+ }
+
if (*s == '0') { // parse radix
ParseNumberStartingWithZero(TokLoc);
if (hadError)
@@ -1432,7 +1436,12 @@
++begin;
// Skip over the entry quote.
- assert(begin[0] == '\'' && "Invalid token lexed");
+ if (begin[0] != '\'') {
+ PP.Diag(Loc, diag::err_lexing_string);
+ HadError = true;
+ return;
+ }
+
++begin;
// Remove an optional ud-suffix.
Index: clang/lib/Lex/LiteralSupport.cpp
===================================================================
--- clang/lib/Lex/LiteralSupport.cpp
+++ clang/lib/Lex/LiteralSupport.cpp
@@ -693,12 +693,6 @@
: SM(SM), LangOpts(LangOpts), Diags(Diags),
ThisTokBegin(TokSpelling.begin()), ThisTokEnd(TokSpelling.end()) {
- // This routine assumes that the range begin/end matches the regex for integer
- // and FP constants (specifically, the 'pp-number' regex), and assumes that
- // the byte at "*end" is both valid and not part of the regex. Because of
- // this, it doesn't have to check for 'overscan' in various places.
- assert(!isPreprocessingNumberBody(*ThisTokEnd) && "didn't maximally munch?");
-
s = DigitsBegin = ThisTokBegin;
saw_exponent = false;
saw_period = false;
@@ -718,6 +712,16 @@
isAccum = false;
hadError = false;
+ // This routine assumes that the range begin/end matches the regex for integer
+ // and FP constants (specifically, the 'pp-number' regex), and assumes that
+ // the byte at "*end" is both valid and not part of the regex. Because of
+ // this, it doesn't have to check for 'overscan' in various places.
+ if (isPreprocessingNumberBody(*ThisTokEnd)) {
+ Diags.Report(TokLoc, diag::err_lexing_string);
+ hadError = true;
+ return;
+ }
+
if (*s == '0') { // parse radix
ParseNumberStartingWithZero(TokLoc);
if (hadError)
@@ -1432,7 +1436,12 @@
++begin;
// Skip over the entry quote.
- assert(begin[0] == '\'' && "Invalid token lexed");
+ if (begin[0] != '\'') {
+ PP.Diag(Loc, diag::err_lexing_string);
+ HadError = true;
+ return;
+ }
+
++begin;
// Remove an optional ud-suffix.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
