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

Bug 514222 - js_GetMutableScope gives the scope a unique shape. r=brendan.

Browse Source
This commit is contained in:
Jason Orendorff
2009-09-02 17:58:25 -05:00
parent 3f528d5cda
commit 4ffa523baa
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsarray.cpp
View File

@@ -1275,11 +1275,24 @@ JSClass js_SlowArrayClass = {
JSBool
js_MakeArraySlow(JSContext *cx, JSObject *obj)
{
JS_ASSERT(OBJ_GET_CLASS(cx, obj) == &js_ArrayClass);
JS_ASSERT(obj->getClass() == &js_ArrayClass);
/* Create a native scope. */
JSScope *scope = JSScope::create(cx, &js_SlowArrayObjectOps,
&js_SlowArrayClass, obj);
/*
* Create a native scope. All slow arrays other than Array.prototype get
* the same initial shape.
*/
uint32 emptyShape;
JSObject *arrayProto = obj->getProto();
if (arrayProto->getClass() == &js_ObjectClass) {
/* obj is Array.prototype. */
emptyShape = js_GenerateShape(cx, false);
} else {
JS_ASSERT(arrayProto->getClass() == &js_SlowArrayClass);
if (!OBJ_SCOPE(arrayProto)->getEmptyScopeShape(cx, &js_SlowArrayClass, &emptyShape))
return JS_FALSE;
}
JSScope *scope = JSScope::create(cx, &js_SlowArrayObjectOps, &js_SlowArrayClass, obj,
emptyShape);
if (!scope)
return JS_FALSE;