Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: src/regexp/regexp-ast.h

Issue 1776013003: [regexp] fix bogus assertion in CharacterRange constructor. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/regexp/jsregexp.cc ('k') | test/cctest/test-regexp.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/regexp/regexp-ast.h
diff --git a/src/regexp/regexp-ast.h b/src/regexp/regexp-ast.h
index fbe9c750790efde25299766265c647d2d43ddbcc..0e718d3b4d15ecda1e6d56b3bc326ae5539a80e3 100644
--- a/src/regexp/regexp-ast.h
+++ b/src/regexp/regexp-ast.h
@@ -78,10 +78,6 @@ class CharacterRange {
CharacterRange() : from_(0), to_(0) {}
// For compatibility with the CHECK_OK macro
CharacterRange(void* null) { DCHECK_NULL(null); } // NOLINT
- CharacterRange(uc32 from, uc32 to) : from_(from), to_(to) {
- DCHECK(0 <= from && to <= String::kMaxCodePoint);
- DCHECK(static_cast<uint32_t>(from) <= static_cast<uint32_t>(to));
- }
static void AddClassEscape(uc16 type, ZoneList<CharacterRange>* ranges,
Zone* zone);
static Vector<const int> GetWordBounds();
@@ -89,6 +85,8 @@ class CharacterRange {
return CharacterRange(value, value);
}
static inline CharacterRange Range(uc32 from, uc32 to) {
+ DCHECK(0 <= from && to <= String::kMaxCodePoint);
+ DCHECK(static_cast<uint32_t>(from) <= static_cast<uint32_t>(to));
return CharacterRange(from, to);
}
static inline CharacterRange Everything() {
@@ -127,6 +125,8 @@ class CharacterRange {
static const int kPayloadMask = (1 << 24) - 1;
private:
+ CharacterRange(uc32 from, uc32 to) : from_(from), to_(to) {}
+
uc32 from_;
uc32 to_;
};
« no previous file with comments | « src/regexp/jsregexp.cc ('k') | test/cctest/test-regexp.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698