Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 2a44daf61d7f (bug 1640479) for build bustages on bug1640479.js. CLOSED TREE

Browse Source
This commit is contained in:
Razvan Maries 2020-05-27 23:20:51 +03:00
parent e7258ec672
commit 5c6bd8bcfd
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jit-test/tests/regexp/bug1640479.js
View File

@ -1,13 +0,0 @@
var failures = 0;
var i = 0;
function foo() {
var e;
var r = RegExp("(?<_" + (i++) + "a>)");
try { e = r.exec("a"); } catch {}
e = r.exec("a");
if (e.groups === undefined) failures++;
}
oomTest(foo);
assertEq(failures, 0);

8
js/src/new-regexp/RegExpAPI.cpp
View File

@ -480,16 +480,16 @@ bool CompilePattern(JSContext* cx, MutableHandleRegExpShared re,
return true;
}
}
// Add one to account for the whole-match capture
uint32_t pairCount = data.capture_count + 1;
re->useRegExpMatch(pairCount);
if (!data.capture_name_map.is_null()) {
RootedNativeObject namedCaptures(cx, data.capture_name_map->inner());
if (!RegExpShared::initializeNamedCaptures(cx, re, namedCaptures)) {
return false;
}
}
// All fallible initialization has succeeded, so we can change state.
// Add one to capture_count to account for the whole-match capture.
uint32_t pairCount = data.capture_count + 1;
re->useRegExpMatch(pairCount);
}
MOZ_ASSERT(re->kind() == RegExpShared::Kind::RegExp);

1
js/src/vm/RegExpObject.cpp
View File

@ -1137,6 +1137,7 @@ void RegExpShared::useRegExpMatch(size_t pairCount) {
/* static */
bool RegExpShared::initializeNamedCaptures(JSContext* cx, HandleRegExpShared re,
HandleNativeObject namedCaptures) {
MOZ_ASSERT(re->kind() == RegExpShared::Kind::RegExp);
MOZ_ASSERT(!re->groupsTemplate_);
MOZ_ASSERT(!re->namedCaptureIndices_);