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

[js] Simplify with-env handling in FetchName

Browse source
This commit is contained in:
Moonchild 2024-09-04 15:21:08 +02:00 • committed by roytam1
commit 8f31479968
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/src/vm/Interpreter-inl.h
View file

@ -188,21 +188,19 @@ FetchName(JSContext* cx, HandleObject obj, HandleObject obj2, HandlePropertyName
}
/* Take the slow path if shape was not found in a native object. */
if (!obj->isNative() || !obj2->isNative()) {
if (!obj->isNative() || !obj2->isNative() ||
obj->is<WithEnvironmentObject>()) {
Rooted<jsid> id(cx, NameToId(name));
if (!GetProperty(cx, obj, obj, id, vp))
return false;
} else {
RootedShape shape(cx, prop.shape());
RootedObject normalized(cx, obj);
if (normalized->is<WithEnvironmentObject>() && !shape->hasDefaultGetter())
normalized = &normalized->as<WithEnvironmentObject>().object();
if (shape->isDataDescriptor() && shape->hasDefaultGetter()) {
/* Fast path for Object instance properties. */
MOZ_ASSERT(shape->hasSlot());
vp.set(obj2->as<NativeObject>().getSlot(shape->slot()));
} else {
if (!NativeGetExistingProperty(cx, normalized, obj2.as<NativeObject>(), shape, vp))
if (!NativeGetExistingProperty(cx, obj, obj2.as<NativeObject>(), shape, vp))
return false;
}
}