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 1129473 - Ensure off-thread parsing sets the is-delegate flag on builtin protos. r=bhackett

Browse Source 
--HG--
extra : rebase_source : 2eab0362e1207c1bc258346d427498f14ddf1b04
This commit is contained in:
Jan de Mooij 2015-02-06 18:17:00 +01:00
parent 734705c818
commit a32154fadf
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsobj.h
View File

@ -353,9 +353,7 @@ class JSObject : public js::gc::Cell
JSObject *getProto() const {
MOZ_ASSERT(!uninlinedIsProxy());
JSObject *proto = getTaggedProto().toObjectOrNull();
MOZ_ASSERT_IF(proto && proto->isNative(), proto->isDelegate());
return proto;
return getTaggedProto().toObjectOrNull();
}
// Normal objects and a subset of proxies have uninteresting [[Prototype]].

19
js/src/vm/HelperThreads.cpp
View File

@ -845,6 +845,15 @@ LeaveParseTaskZone(JSRuntime *rt, ParseTask *task)
rt->clearUsedByExclusiveThread(task->cx->zone());
}
static bool
EnsureConstructor(JSContext *cx, Handle<GlobalObject*> global, JSProtoKey key)
{
if (!GlobalObject::ensureConstructor(cx, global, key))
return false;
return global->getPrototype(key).toObject().setDelegate(cx);
}
JSScript *
GlobalHelperThreadState::finishParseTask(JSContext *maybecx, JSRuntime *rt, void *token)
{
@ -876,11 +885,11 @@ GlobalHelperThreadState::finishParseTask(JSContext *maybecx, JSRuntime *rt, void
// Make sure we have all the constructors we need for the prototype
// remapping below, since we can't GC while that's happening.
Rooted<GlobalObject*> global(cx, &cx->global()->as<GlobalObject>());
if (!GlobalObject::ensureConstructor(cx, global, JSProto_Object) ||
!GlobalObject::ensureConstructor(cx, global, JSProto_Array) ||
!GlobalObject::ensureConstructor(cx, global, JSProto_Function) ||
!GlobalObject::ensureConstructor(cx, global, JSProto_RegExp) ||
!GlobalObject::ensureConstructor(cx, global, JSProto_Iterator))
if (!EnsureConstructor(cx, global, JSProto_Object) ||
!EnsureConstructor(cx, global, JSProto_Array) ||
!EnsureConstructor(cx, global, JSProto_Function) ||
!EnsureConstructor(cx, global, JSProto_RegExp) ||
!EnsureConstructor(cx, global, JSProto_Iterator))
{
LeaveParseTaskZone(rt, parseTask);
return nullptr;

7
js/src/vm/ObjectGroup.cpp
View File

@ -48,6 +48,13 @@ ObjectGroup::finalize(FreeOp *fop)
fop->delete_(maybeUnboxedLayoutDontCheckGeneration());
}
void
ObjectGroup::setProtoUnchecked(TaggedProto proto)
{
proto_ = proto.raw();
MOZ_ASSERT_IF(proto_ && proto_->isNative(), proto_->isDelegate());
}
void
ObjectGroup::setProto(JSContext *cx, TaggedProto proto)
{

4
js/src/vm/ObjectGroup.h
View File

@ -256,9 +256,7 @@ class ObjectGroup : public gc::TenuredCell
HeapPtrObject &singletonRaw() { return singleton_; }
void setProto(JSContext *cx, TaggedProto proto);
void setProtoUnchecked(TaggedProto proto) {
proto_ = proto.raw();
}
void setProtoUnchecked(TaggedProto proto);
void initSingleton(JSObject *singleton) {
singleton_ = singleton;