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 570169 - Part 3, cope with E4X and compiler-internal objects. r=gal. (Part 2 is to follow; my apologies for crummy numbering.)

Browse Source
This commit is contained in:
Jason Orendorff 2010-06-16 16:13:50 -05:00
parent 3dd0b2f480
commit 9988b38a60
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/jsobj.cpp
View File

@ -6279,9 +6279,29 @@ js_ReportGetterOnlyAssignment(JSContext *cx)
}
JSCompartment *
JSObject::getCompartment(JSContext *cx) {
JSObject::getCompartment(JSContext *cx)
{
JSObject *obj = getGlobal();
JS_ASSERT(obj->getClass()->flags & JSCLASS_IS_GLOBAL);
JSClass *clasp = obj->getClass();
if (!(clasp->flags & JSCLASS_IS_GLOBAL)) {
// The magic AnyName object is runtime-wide.
if (clasp == &js_AnyNameClass)
return cx->runtime->defaultCompartment;
// The magic function namespace object is runtime-wide.
if (clasp == &js_NamespaceClass.base &&
obj->getNameURI() == ATOM_KEY(cx->runtime->atomState.lazy.functionNamespaceURIAtom)) {
return cx->runtime->defaultCompartment;
}
// Compile-time Function, Block, and RegExp objects are not parented.
if (clasp == &js_FunctionClass || clasp == &js_BlockClass || clasp == &js_RegExpClass) {
// This is a bogus answer, but it'll do for now.
return cx->runtime->defaultCompartment;
}
JS_NOT_REACHED("non-global object at end of scope chain");
}
jsval v = obj->getReservedSlot(JSRESERVED_GLOBAL_COMPARTMENT);
return (JSCompartment *) JSVAL_TO_PRIVATE(v);
}
@ -6373,10 +6393,10 @@ dumpValue(jsval val)
(void *) fun);
} else if (JSVAL_IS_OBJECT(val)) {
JSObject *obj = JSVAL_TO_OBJECT(val);
JSClass *cls = obj->getClass();
JSClass *clasp = obj->getClass();
fprintf(stderr, "<%s%s at %p>",
cls->name,
cls == &js_ObjectClass ? "" : " object",
clasp->name,
clasp == &js_ObjectClass ? "" : " object",
(void *) obj);
} else if (JSVAL_IS_INT(val)) {
fprintf(stderr, "%d", JSVAL_TO_INT(val));

6
js/src/jstracer.cpp
View File

@ -13964,10 +13964,10 @@ TraceRecorder::traverseScopeChain(JSObject *obj, LIns *obj_ins, JSObject *target
for (;;) {
if (searchObj != globalObj) {
JSClass* cls = searchObj->getClass();
if (cls == &js_BlockClass) {
JSClass* clasp = searchObj->getClass();
if (clasp == &js_BlockClass) {
foundBlockObj = true;
} else if (cls == &js_CallClass &&
} else if (clasp == &js_CallClass &&
JSFUN_HEAVYWEIGHT_TEST(js_GetCallObjectFunction(searchObj)->flags)) {
foundCallObj = true;
}