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 1015618 - Fix a performance regression in MapObject with GGC enabled; r=jonco

Browse Source 
--HG--
extra : rebase_source : 6aa90251f05619642e4a4c9774e13b5cf2e286f7
This commit is contained in:
Terrence Cole 2014-05-29 09:50:28 -07:00
parent 789cbfa98c
commit d368714df5
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/builtin/MapObject.cpp
View File

@ -1131,23 +1131,27 @@ class OrderedHashTableRef : public gc::BufferableRef
};
#endif
static void
WriteBarrierPost(JSRuntime *rt, ValueMap *map, const HashableValue &key)
inline static void
WriteBarrierPost(JSRuntime *rt, ValueMap *map, const Value &key)
{
#ifdef JSGC_GENERATIONAL
typedef OrderedHashMap<Value, Value, UnbarrieredHashPolicy, RuntimeAllocPolicy> UnbarrieredMap;
rt->gc.storeBuffer.putGeneric(OrderedHashTableRef<UnbarrieredMap>(
reinterpret_cast<UnbarrieredMap *>(map), key.get()));
if (MOZ_UNLIKELY(key.isObject() && IsInsideNursery(&key.toObject()))) {
rt->gc.storeBuffer.putGeneric(OrderedHashTableRef<UnbarrieredMap>(
reinterpret_cast<UnbarrieredMap *>(map), key));
}
#endif
}
static void
WriteBarrierPost(JSRuntime *rt, ValueSet *set, const HashableValue &key)
inline static void
WriteBarrierPost(JSRuntime *rt, ValueSet *set, const Value &key)
{
#ifdef JSGC_GENERATIONAL
typedef OrderedHashSet<Value, UnbarrieredHashPolicy, RuntimeAllocPolicy> UnbarrieredSet;
rt->gc.storeBuffer.putGeneric(OrderedHashTableRef<UnbarrieredSet>(
reinterpret_cast<UnbarrieredSet *>(set), key.get()));
if (MOZ_UNLIKELY(key.isObject() && IsInsideNursery(&key.toObject()))) {
rt->gc.storeBuffer.putGeneric(OrderedHashTableRef<UnbarrieredSet>(
reinterpret_cast<UnbarrieredSet *>(set), key));
}
#endif
}
@ -1213,7 +1217,7 @@ MapObject::construct(JSContext *cx, unsigned argc, Value *vp)
js_ReportOutOfMemory(cx);
return false;
}
WriteBarrierPost(cx->runtime(), map, hkey);
WriteBarrierPost(cx->runtime(), map, key);
}
}
@ -1310,7 +1314,7 @@ MapObject::set_impl(JSContext *cx, CallArgs args)
js_ReportOutOfMemory(cx);
return false;
}
WriteBarrierPost(cx->runtime(), &map, key);
WriteBarrierPost(cx->runtime(), &map, key.get());
args.rval().setUndefined();
return true;
}
@ -1703,7 +1707,7 @@ SetObject::construct(JSContext *cx, unsigned argc, Value *vp)
js_ReportOutOfMemory(cx);
return false;
}
WriteBarrierPost(cx->runtime(), set, key);
WriteBarrierPost(cx->runtime(), set, keyVal);
}
}
@ -1772,7 +1776,7 @@ SetObject::add_impl(JSContext *cx, CallArgs args)
js_ReportOutOfMemory(cx);
return false;
}
WriteBarrierPost(cx->runtime(), &set, key);
WriteBarrierPost(cx->runtime(), &set, key.get());
args.rval().setUndefined();
return true;
}

2
js/src/builtin/MapObject.h
View File

@ -60,6 +60,8 @@ class AutoHashableValueRooter : private AutoGCRooter
return value;
}
Value get() const { return value.get(); }
friend void AutoGCRooter::trace(JSTracer *trc);
void trace(JSTracer *trc);