Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 15:15:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make all cacheable scope objects into delegates (bug 761685, r=luke).

Browse Source 
--HG--
extra : rebase_source : 0fca62a7e3f9fbd83b5133e0d4d12a3f87078583
This commit is contained in:
David Anderson 2012-06-13 18:28:35 -07:00
parent de48b64bf6
commit 7860322bfc
7 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jspropertycache.cpp
View File

@ -169,6 +169,7 @@ PropertyCache::fullTest(JSContext *cx, jsbytecode *pc, JSObject **objp, JSObject
*/
pobj = obj;
JSObject *scopeObj = NULL;
if (JOF_MODE(cs.format) == JOF_NAME) {
uint8_t scopeIndex = entry->scopeIndex;
while (scopeIndex > 0) {
@ -179,7 +180,7 @@ PropertyCache::fullTest(JSContext *cx, jsbytecode *pc, JSObject **objp, JSObject
scopeIndex--;
}
*objp = pobj;
scopeObj = pobj;
}
uint8_t protoIndex = entry->protoIndex;
@ -192,6 +193,8 @@ PropertyCache::fullTest(JSContext *cx, jsbytecode *pc, JSObject **objp, JSObject
}
if (pobj->lastProperty() == entry->pshape) {
if (JOF_MODE(cs.format) == JOF_NAME)
*objp = scopeObj;
#ifdef DEBUG
PropertyName *name = GetNameFromBytecode(cx, pc, op, cs);
JS_ASSERT(pobj->nativeContains(cx, NameToId(name)));

2
js/src/jsscript.cpp
View File

@ -125,7 +125,7 @@ Bindings::add(JSContext *cx, HandleAtom name, BindingKind kind)
id = AtomToId(name);
}
StackBaseShape base(&CallClass, NULL, BaseShape::VAROBJ);
StackBaseShape base(&CallClass, NULL, BaseShape::VAROBJ | BaseShape::DELEGATE);
base.updateGetterSetter(attrs, getter, setter);
UnownedBaseShape *nbase = BaseShape::getUnowned(cx, base);

2
js/src/jsscriptinlines.h
View File

@ -65,7 +65,7 @@ Bindings::initialShape(JSContext *cx) const
JS_ASSERT(gc::GetGCKindSlots(kind) == CallObject::RESERVED_SLOTS);
return EmptyShape::getInitialShape(cx, &CallClass, NULL, NULL, kind,
BaseShape::VAROBJ);
BaseShape::VAROBJ | BaseShape::DELEGATE);
}
bool

2
js/src/vm/GlobalObject.cpp
View File

@ -245,6 +245,8 @@ GlobalObject::create(JSContext *cx, Class *clasp)
if (!obj->setSingletonType(cx) || !obj->setVarObj(cx))
return NULL;
if (!obj->setDelegate(cx))
return NULL;
/* Construct a regexp statics object for this global object. */
JSObject *res = RegExpStatics::create(cx, obj);

12
js/src/vm/ScopeObject-inl.h
View File

@ -25,14 +25,12 @@ ScopeObject::enclosingScope() const
return getReservedSlot(SCOPE_CHAIN_SLOT).toObject();
}
inline bool
ScopeObject::setEnclosingScope(JSContext *cx, HandleObject obj)
inline void
ScopeObject::setEnclosingScope(HandleObject obj)
{
RootedObject self(cx, this);
if (!obj->setDelegate(cx))
return false;
self->setFixedSlot(SCOPE_CHAIN_SLOT, ObjectValue(*obj));
return true;
JS_ASSERT_IF(obj->isCall() || obj->isDeclEnv() || obj->isBlock(),
obj->isDelegate());
setFixedSlot(SCOPE_CHAIN_SLOT, ObjectValue(*obj));
}
inline const Value &

22
js/src/vm/ScopeObject.cpp
View File

@ -107,9 +107,7 @@ CallObject::create(JSContext *cx, JSScript *script, HandleObject enclosing, Hand
return NULL;
}
if (!obj->asScope().setEnclosingScope(cx, enclosing))
return NULL;
obj->asScope().setEnclosingScope(enclosing);
obj->initFixedSlot(CALLEE_SLOT, ObjectOrNullValue(callee));
/*
@ -121,6 +119,8 @@ CallObject::create(JSContext *cx, JSScript *script, HandleObject enclosing, Hand
return NULL;
}
JS_ASSERT(obj->isDelegate());
return &obj->asCall();
}
@ -275,7 +275,8 @@ DeclEnvObject::create(JSContext *cx, StackFrame *fp)
RootedShape emptyDeclEnvShape(cx);
emptyDeclEnvShape = EmptyShape::getInitialShape(cx, &DeclEnvClass, NULL,
&fp->global(), FINALIZE_KIND);
&fp->global(), FINALIZE_KIND,
BaseShape::DELEGATE);
if (!emptyDeclEnvShape)
return NULL;
@ -283,9 +284,7 @@ DeclEnvObject::create(JSContext *cx, StackFrame *fp)
if (!obj)
return NULL;
if (!obj->asScope().setEnclosingScope(cx, fp->scopeChain()))
return NULL;
obj->asScope().setEnclosingScope(fp->scopeChain());
if (!DefineNativeProperty(cx, obj, RootedId(cx, AtomToId(fp->fun()->atom)),
ObjectValue(fp->callee()), NULL, NULL,
@ -315,9 +314,7 @@ WithObject::create(JSContext *cx, HandleObject proto, HandleObject enclosing, ui
if (!obj)
return NULL;
if (!obj->asScope().setEnclosingScope(cx, enclosing))
return NULL;
obj->asScope().setEnclosingScope(enclosing);
obj->setReservedSlot(DEPTH_SLOT, PrivateUint32Value(depth));
JSObject *thisp = proto->thisObject(cx);
@ -595,6 +592,8 @@ ClonedBlockObject::create(JSContext *cx, Handle<StaticBlockObject *> block, Stac
obj->asClonedBlock().setVar(i, *src);
}
JS_ASSERT(obj->isDelegate());
return &obj->asClonedBlock();
}
@ -618,7 +617,8 @@ StaticBlockObject::create(JSContext *cx)
return NULL;
RootedShape emptyBlockShape(cx);
emptyBlockShape = EmptyShape::getInitialShape(cx, &BlockClass, NULL, NULL, FINALIZE_KIND);
emptyBlockShape = EmptyShape::getInitialShape(cx, &BlockClass, NULL, NULL, FINALIZE_KIND,
BaseShape::DELEGATE);
if (!emptyBlockShape)
return NULL;

3
js/src/vm/ScopeObject.h
View File

@ -99,7 +99,7 @@ class ScopeObject : public JSObject
* enclosing scope of a ScopeObject is necessarily non-null.
*/
inline JSObject &enclosingScope() const;
inline bool setEnclosingScope(JSContext *cx, HandleObject obj);
inline void setEnclosingScope(HandleObject obj);
/*
* Get or set an aliased variable contained in this scope. Unaliased
@ -168,7 +168,6 @@ class DeclEnvObject : public ScopeObject
static const gc::AllocKind FINALIZE_KIND = gc::FINALIZE_OBJECT2;
static DeclEnvObject *create(JSContext *cx, StackFrame *fp);
};
class NestedScopeObject : public ScopeObject