corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Back out bug 474501; it has a problem with one Mochitest.

Browse Source
This commit is contained in:
Jeff Walden
2009-01-30 20:00:52 -08:00
parent ae53a6b073
commit c3b51bacd6
4 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsobj.cpp
View File

@@ -3407,8 +3407,7 @@ js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
JSBool
js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
JSPropertyOp getter, JSPropertyOp setter, uintN attrs,
uintN flags, intN shortid, JSProperty **propp,
JSPropCacheEntry** entryp /* = NULL */)
uintN flags, intN shortid, JSProperty **propp)
{
JSClass *clasp;
JSScope *scope;
@@ -3504,13 +3503,6 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, jsval value,
js_RemoveScopeProperty(cx, scope, id);
goto bad);
if (entryp) {
JS_ASSERT_NOT_ON_TRACE(cx);
if (!(attrs & JSPROP_SHARED))
js_FillPropertyCache(cx, obj, OBJ_SHAPE(obj), 0, 0, obj, sprop, entryp);
else
PCMETER(JS_PROPERTY_CACHE(cx).nofills++);
}
if (propp)
*propp = (JSProperty *) sprop;
else
@@ -4124,7 +4116,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, jsval *vp,
return JS_TRUE;
}
return SPROP_SET(cx, sprop, obj, pobj, vp);
return !!SPROP_SET(cx, sprop, obj, pobj, vp);
}
/* Restore attrs to the ECMA default for new properties. */