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 1236519 - Ensure JSFunction::isDerivedClassConstructor properly handles lazy self-hosted functions. r=till a=bustage

Browse Source
This commit is contained in:
Eric Faust 2016-01-13 10:33:38 -08:00
parent 0506fad16e
commit 4106614ca3
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/jsfun.cpp
View File

@ -1294,6 +1294,30 @@ JSFunction::infallibleIsDefaultClassConstructor(JSContext* cx) const
return isDefault;
}
bool
JSFunction::isDerivedClassConstructor()
{
bool derived;
if (isInterpretedLazy()) {
// There is only one plausible lazy self-hosted derived
// constructor.
if (isSelfHostedBuiltin()) {
JSAtom* name = &getExtendedSlot(LAZY_FUNCTION_NAME_SLOT).toString()->asAtom();
// This function is called from places without access to a
// JSContext. Trace some plumbing to get what we want.
derived = name == compartment()->runtimeFromAnyThread()->
commonNames->DefaultDerivedClassConstructor;
} else {
derived = lazyScript()->isDerivedClassConstructor();
}
} else {
derived = nonLazyScript()->isDerivedClassConstructor();
}
MOZ_ASSERT_IF(derived, isClassConstructor());
return derived;
}
bool
JSFunction::getLength(JSContext* cx, uint16_t* length)
{

10
js/src/jsfun.h
View File

@ -538,15 +538,7 @@ class JSFunction : public js::NativeObject
u.n.jitinfo = data;
}
bool isDerivedClassConstructor() {
bool derived;
if (isInterpretedLazy())
derived = lazyScript()->isDerivedClassConstructor();
else
derived = nonLazyScript()->isDerivedClassConstructor();
MOZ_ASSERT_IF(derived, isClassConstructor());
return derived;
}
bool isDerivedClassConstructor();
static unsigned offsetOfNativeOrScript() {
static_assert(offsetof(U, n.native) == offsetof(U, i.s.script_),