wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1208002: Optimize creation of RegExpMatch result for 'str.match', r=bhackett

Browse Source
This commit is contained in:
Hannes Verschore 2015-10-02 17:47:11 +02:00
parent d56715d881
commit 15066bcac6
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/src/jsstr.cpp
View File

@ -2386,23 +2386,38 @@ BuildFlatMatchArray(JSContext* cx, HandleString textstr, const FlatMatch& fm, Ca
return true;
}
/* For this non-global match, produce a RegExp.exec-style array. */
RootedObject obj(cx, NewDenseEmptyArray(cx));
if (!obj)
/* Get the templateObject that defines the shape and type of the output object */
JSObject* templateObject = cx->compartment()->regExps.getOrCreateMatchResultTemplateObject(cx);
if (!templateObject)
return false;
RootedValue patternVal(cx, StringValue(fm.pattern()));
RootedValue matchVal(cx, Int32Value(fm.match()));
RootedValue textVal(cx, StringValue(textstr));
if (!DefineElement(cx, obj, 0, patternVal) ||
!DefineProperty(cx, obj, cx->names().index, matchVal) ||
!DefineProperty(cx, obj, cx->names().input, textVal))
{
RootedArrayObject arr(cx, NewDenseFullyAllocatedArrayWithTemplate(cx, 1, templateObject));
if (!arr)
return false;
}
args->rval().setObject(*obj);
/* Store a Value for each pair. */
arr->setDenseInitializedLength(1);
arr->initDenseElement(0, StringValue(fm.pattern()));
/* Set the |index| property. (TemplateObject positions it in slot 0) */
arr->setSlot(0, Int32Value(fm.match()));
/* Set the |input| property. (TemplateObject positions it in slot 1) */
arr->setSlot(1, StringValue(textstr));
#ifdef DEBUG
RootedValue test(cx);
RootedId id(cx, NameToId(cx->names().index));
if (!NativeGetProperty(cx, arr, id, &test))
return false;
MOZ_ASSERT(test == arr->getSlot(0));
id = NameToId(cx->names().input);
if (!NativeGetProperty(cx, arr, id, &test))
return false;
MOZ_ASSERT(test == arr->getSlot(1));
#endif
args->rval().setObject(*arr);
return true;
}