Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1462448: Use nursery allocation for baseline string-split and avoid extra heap-slot init for Latin1 strings. r=jandem

Browse Source 
--HG--
extra : rebase_source : 72e0dee87f5516dccd9bff5d8a382078cb329f7a
This commit is contained in:
André Bargull 2018-05-17 12:43:44 -07:00
parent 8e29e7d8f2
commit ffd9baf5df
2 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/builtin/String.cpp
View File

@ -3136,13 +3136,26 @@ CharSplitHelper(JSContext* cx, HandleLinearString str, uint32_t limit, HandleObj
RootedArrayObject splits(cx, NewFullyAllocatedStringArray(cx, group, resultlen));
if (!splits)
return nullptr;
splits->ensureDenseInitializedLength(cx, 0, resultlen);
for (size_t i = 0; i < resultlen; ++i) {
JSString* sub = staticStrings.getUnitStringForElement(cx, str, i);
if (!sub)
return nullptr;
splits->initDenseElement(i, StringValue(sub));
if (str->hasLatin1Chars()) {
splits->setDenseInitializedLength(resultlen);
JS::AutoCheckCannotGC nogc;
const Latin1Char* latin1Chars = str->latin1Chars(nogc);
for (size_t i = 0; i < resultlen; ++i) {
Latin1Char c = latin1Chars[i];
MOZ_ASSERT(staticStrings.hasUnit(c));
splits->initDenseElement(i, StringValue(staticStrings.getUnit(c)));
}
} else {
splits->ensureDenseInitializedLength(cx, 0, resultlen);
for (size_t i = 0; i < resultlen; ++i) {
JSString* sub = staticStrings.getUnitStringForElement(cx, str, i);
if (!sub)
return nullptr;
splits->initDenseElement(i, StringValue(sub));
}
}
return splits;

69
js/src/jit/BaselineIC.cpp
View File

@ -1863,21 +1863,6 @@ GetTemplateObjectForNative(JSContext* cx, HandleFunction target, const CallArgs&
}
}
if (native == js::intrinsic_StringSplitString && args.length() == 2 && args[0].isString() &&
args[1].isString())
{
ObjectGroup* group = ObjectGroup::callingAllocationSiteGroup(cx, JSProto_Array);
if (!group)
return false;
if (group->maybePreliminaryObjectsDontCheckGeneration()) {
*skipAttach = true;
return true;
}
res.set(NewFullyAllocatedArrayForCallingAllocationSite(cx, 0, TenuredObject));
return !!res;
}
if (native == StringConstructor) {
RootedString emptyString(cx, cx->runtime()->emptyString);
res.set(StringObject::create(cx, emptyString, /* proto = */ nullptr, TenuredObject));
@ -2219,10 +2204,14 @@ TryAttachCallStub(JSContext* cx, ICCall_Fallback* stub, HandleScript script, jsb
}
static bool
CopyArray(JSContext* cx, HandleArrayObject arr, MutableHandleValue result)
CopyStringSplitArray(JSContext* cx, HandleArrayObject arr, MutableHandleValue result)
{
uint32_t length = arr->length();
ArrayObject* nobj = NewFullyAllocatedArrayTryReuseGroup(cx, arr, length, TenuredObject);
MOZ_ASSERT(arr->isTenured(), "ConstStringSplit needs a tenured template object");
uint32_t length = arr->getDenseInitializedLength();
MOZ_ASSERT(length == arr->length(), "template object is a fully initialized array");
ArrayObject* nobj = NewFullyAllocatedArrayTryReuseGroup(cx, arr, length);
if (!nobj)
return false;
nobj->initDenseElements(arr, 0, length);
@ -2241,34 +2230,35 @@ TryAttachConstStringSplit(JSContext* cx, ICCall_Fallback* stub, HandleScript scr
Value* args = vp + 2;
// String.prototype.split will not yield a constructable.
if (JSOp(*pc) == JSOP_NEW)
return true;
if (!IsOptimizableConstStringSplit(callee, argc, args))
return true;
MOZ_ASSERT(callee.isObject());
MOZ_ASSERT(callee.toObject().is<JSFunction>());
RootedString str(cx, args[0].toString());
RootedString sep(cx, args[1].toString());
RootedObject obj(cx, &res.toObject());
RootedValue arr(cx);
RootedArrayObject obj(cx, &res.toObject().as<ArrayObject>());
uint32_t initLength = obj->getDenseInitializedLength();
MOZ_ASSERT(initLength == obj->length(), "string-split result is a fully initialized array");
// Copy the array before storing in stub.
if (!CopyArray(cx, obj.as<ArrayObject>(), &arr))
RootedArrayObject arrObj(cx);
arrObj = NewFullyAllocatedArrayTryReuseGroup(cx, obj, initLength, TenuredObject);
if (!arrObj)
return false;
arrObj->ensureDenseInitializedLength(cx, 0, initLength);
// Atomize all elements of the array.
RootedArrayObject arrObj(cx, &arr.toObject().as<ArrayObject>());
uint32_t initLength = arrObj->length();
for (uint32_t i = 0; i < initLength; i++) {
JSAtom* str = js::AtomizeString(cx, arrObj->getDenseElement(i).toString());
if (!str)
return false;
if (initLength > 0) {
// Mimic NewFullyAllocatedStringArray() and directly inform TI about
// the element type.
AddTypePropertyId(cx, arrObj, JSID_VOID, TypeSet::StringType());
arrObj->setDenseElementWithType(cx, i, StringValue(str));
for (uint32_t i = 0; i < initLength; i++) {
JSAtom* str = js::AtomizeString(cx, obj->getDenseElement(i).toString());
if (!str)
return false;
arrObj->initDenseElement(i, StringValue(str));
}
}
ICTypeMonitor_Fallback* typeMonitorFallback = stub->getFallbackMonitorStub(cx, script);
@ -2401,7 +2391,7 @@ DoCallFallback(JSContext* cx, BaselineFrame* frame, ICCall_Fallback* stub_, uint
stub->discardStubs(cx);
canAttachStub = stub->state().canAttachStub();
if (!handled && canAttachStub) {
if (!handled && canAttachStub && !constructing) {
// If 'callee' is a potential Call_ConstStringSplit, try to attach an
// optimized ConstStringSplit stub. Note that vp[0] now holds the return value
// instead of the callee, so we pass the callee as well.
@ -3156,8 +3146,9 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
return true;
}
typedef bool (*CopyArrayFn)(JSContext*, HandleArrayObject, MutableHandleValue);
static const VMFunction CopyArrayInfo = FunctionInfo<CopyArrayFn>(CopyArray, "CopyArray");
typedef bool (*CopyStringSplitArrayFn)(JSContext*, HandleArrayObject, MutableHandleValue);
static const VMFunction CopyStringSplitArrayInfo =
FunctionInfo<CopyStringSplitArrayFn>(CopyStringSplitArray, "CopyStringSplitArray");
bool
ICCall_ConstStringSplit::Compiler::generateStubCode(MacroAssembler& masm)
@ -3243,7 +3234,7 @@ ICCall_ConstStringSplit::Compiler::generateStubCode(MacroAssembler& masm)
masm.loadPtr(Address(ICStubReg, offsetOfTemplateObject()), paramReg);
masm.push(paramReg);
if (!callVM(CopyArrayInfo, masm))
if (!callVM(CopyStringSplitArrayInfo, masm))
return false;
leaveStubFrame(masm);
regs.add(paramReg);