Bug 558144 - un-macroize OBJ_SCOPE, OBJ_SHAPE, LOCKED_OBJ_SET_SLOT, LOCKED_OBJ_GET_SLOT (r=Waldo)

This commit is contained in:
Luke Wagner
2010-04-08 11:22:04 -07:00
parent 43c4247f9a
commit d6c0d01461
24 changed files with 237 additions and 213 deletions

View File

@@ -891,7 +891,7 @@ js_PrototypeHasIndexedProperties(JSContext *cx, JSObject *obj)
*/
if (!obj->isNative())
return JS_TRUE;
if (OBJ_SCOPE(obj)->hadIndexedProperties())
if (obj->scope()->hadIndexedProperties())
return JS_TRUE;
}
return JS_FALSE;
@@ -1303,7 +1303,7 @@ js_MakeArraySlow(JSContext *cx, JSObject *obj)
} else {
/* arrayProto is Array.prototype. */
JS_ASSERT(arrayProto->getClass() == &js_SlowArrayClass);
emptyShape = OBJ_SCOPE(arrayProto)->emptyScope->shape;
emptyShape = arrayProto->scope()->emptyScope->shape;
}
JSScope *scope = JSScope::create(cx, &js_SlowArrayObjectOps, &js_SlowArrayClass, obj,
emptyShape);