wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 07:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

1324566 - Inspector support for GlobalNameGetter, error fixed, march 28th 2024, there was backport of this but return false was accidentally leftover.

Browse source 
1324566 - Inspector support for GlobalNameGetter, error fixed, march 28th 2024, there was backport of this but return false was accidentally leftover.
This commit is contained in:
win7-7 2026-01-07 21:16:06 +02:00 • committed by wuggy
commit 458ea586de
1 changed files with 149 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

153
js/src/jit/BaselineInspector.cpp
View file

@ -663,10 +663,155 @@ GlobalShapeForGetPropFunction(ICStub* stub)
if (nstub->isOwnGetter())
return nullptr;
const HeapReceiverGuard& guard = nstub->receiverGuard();
if (Shape* shape = guard.shape()) {
if (shape->getObjectClass()->flags & JSCLASS_IS_GLOBAL)
return shape;
*receiver = ReceiverGuard();
if (reader.matchOp(CacheOp::GuardShape, objId)) {
// The first case.
receiver->shape = stubInfo->getStubField<Shape*>(stub, reader.stubOffset());
return true;
}
if (!reader.matchOp(CacheOp::GuardGroup, objId))
return false;
receiver->group = stubInfo->getStubField<ObjectGroup*>(stub, reader.stubOffset());
if (!reader.matchOp(CacheOp::GuardAndLoadUnboxedExpando, objId)) {
// Second case, just a group guard.
reader.matchOp(CacheOp::GuardNoUnboxedExpando, objId);
return true;
}
// Third case.
ObjOperandId expandoId = reader.objOperandId();
if (!reader.matchOp(CacheOp::GuardShape, expandoId))
return false;
receiver->shape = stubInfo->getStubField<Shape*>(stub, reader.stubOffset());
return true;
}
static bool
AddCacheIRGlobalGetter(ICCacheIR_Monitored* stub, bool innerized,
JSObject** holder_, Shape** holderShape_,
JSFunction** commonGetter, Shape** globalShape_, bool* isOwnProperty,
BaselineInspector::ReceiverVector& receivers,
BaselineInspector::ObjectGroupVector& convertUnboxedGroups,
JSScript* script)
{
// We are matching on the IR generated by tryAttachGlobalNameGetter:
//
// GuardShape objId
// globalId = LoadEnclosingEnvironment objId
// GuardShape globalId
// <holderId = LoadObject <holder>>
// <GuardShape holderId>
// CallNativeGetterResult globalId
CacheIRReader reader(stub->stubInfo());
ObjOperandId objId = ObjOperandId(0);
if (!reader.matchOp(CacheOp::GuardShape, objId))
return false;
Shape* globalLexicalShape = stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
if (!reader.matchOp(CacheOp::LoadEnclosingEnvironment, objId))
return false;
ObjOperandId globalId = reader.objOperandId();
if (!reader.matchOp(CacheOp::GuardShape, globalId))
return false;
Shape* globalShape = stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
MOZ_ASSERT(globalShape->getObjectClass()->flags & JSCLASS_IS_GLOBAL);
JSObject* holder = &script->global();
Shape* holderShape = globalShape;
if (reader.matchOp(CacheOp::LoadObject)) {
ObjOperandId holderId = reader.objOperandId();
holder = stub->stubInfo()->getStubField<JSObject*>(stub, reader.stubOffset()).get();
if (!reader.matchOp(CacheOp::GuardShape, holderId))
return false;
holderShape = stub->stubInfo()->getStubField<Shape*>(stub, reader.stubOffset());
}
// This guard will always fail, try the next stub.
if (holder->as<NativeObject>().lastProperty() != holderShape)
return true;
if (!reader.matchOp(CacheOp::CallNativeGetterResult, globalId))
return false;
size_t offset = reader.stubOffset();
JSFunction* getter =
&stub->stubInfo()->getStubField<JSObject*>(stub, offset)->as<JSFunction>();
ReceiverGuard receiver;
receiver.shape = globalLexicalShape;
if (!AddReceiver(receiver, receivers, convertUnboxedGroups))
return false;
if (!*commonGetter) {
*holder_ = holder;
*holderShape_ = holderShape;
*commonGetter = getter;
*globalShape_ = globalShape;
// This is always false, because the getters never live on the globalLexical.
*isOwnProperty = false;
} else if (*isOwnProperty || holderShape != *holderShape_ || globalShape != *globalShape_) {
return false;
} else {
MOZ_ASSERT(*commonGetter == getter);
}
return true;
}
static bool
AddCacheIRGetPropFunction(ICCacheIR_Monitored* stub, bool innerized,
JSObject** holder, Shape** holderShape,
JSFunction** commonGetter, Shape** globalShape, bool* isOwnProperty,
BaselineInspector::ReceiverVector& receivers,
BaselineInspector::ObjectGroupVector& convertUnboxedGroups,
JSScript* script)
{
// We match either an own getter:
//
// GuardIsObject objId
// [..WindowProxy innerization..]
// <GuardReceiver objId>
// Call(Scripted|Native)GetterResult objId
//
// Or a getter on the prototype:
//
// GuardIsObject objId
// [..WindowProxy innerization..]
// <GuardReceiver objId>
// LoadObject holderId
// GuardShape holderId
// Call(Scripted|Native)GetterResult objId
//
// If |innerized| is true, we replaced a WindowProxy with the Window
// object and we're only interested in Baseline getter stubs that performed
// the same optimization. This means we expect the following ops for the
// [..WindowProxy innerization..] above:
//
// GuardClass objId WindowProxy
// objId = LoadObject <global>
CacheIRReader reader(stub->stubInfo());
ObjOperandId objId = ObjOperandId(0);
if (!reader.matchOp(CacheOp::GuardIsObject, objId)) {
return AddCacheIRGlobalGetter(stub, innerized, holder, holderShape, commonGetter,
globalShape, isOwnProperty, receivers, convertUnboxedGroups,
script);
}
if (innerized) {
if (!reader.matchOp(CacheOp::GuardClass, objId) ||
reader.guardClassKind() != GuardClassKind::WindowProxy)
{
return false;
}
} else if (stub->isGetProp_CallNativeGlobal()) {
ICGetProp_CallNativeGlobal* nstub = stub->toGetProp_CallNativeGlobal();