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

Bug 776583 - Make post barrier verifier pass interpreter tests; r=billm

Browse Source
This commit is contained in:
Terrence Cole
2012-07-16 10:54:56 -07:00
parent a32c9f25eb
commit 0f42161c9e
31 changed files with 451 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsweakmap.cpp
View File

@@ -91,7 +91,7 @@ WeakMapBase::restoreWeakMapList(JSRuntime *rt, WeakMapVector &vector)
} /* namespace js */
typedef WeakMap<HeapPtrObject, HeapValue> ObjectValueMap;
typedef WeakMap<EncapsulatedPtrObject, RelocatableValue> ObjectValueMap;
static ObjectValueMap *
GetObjectMap(JSObject *obj)
@@ -262,6 +262,7 @@ WeakMap_set_impl(JSContext *cx, CallArgs args)
JS_ReportOutOfMemory(cx);
return false;
}
HashTableWriteBarrierPost(cx->compartment, map, key);
args.rval().setUndefined();
return true;
@@ -286,7 +287,7 @@ JS_NondeterministicGetWeakMapKeys(JSContext *cx, JSObject *obj, JSObject **ret)
return false;
ObjectValueMap *map = GetObjectMap(obj);
if (map) {
for (ObjectValueMap::Range r = map->nondeterministicAll(); !r.empty(); r.popFront()) {
for (ObjectValueMap::Base::Range r = map->all(); !r.empty(); r.popFront()) {
RootedObject key(cx, r.front().key);
// Re-wrapping the key (see comment of GetKeyArg)
if (!JS_WrapObject(cx, key.address()))