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

Bug 798678 - Weakmap key preservation test (r=mccr8)

Browse Source
This commit is contained in:
Bill McCloskey
2012-10-17 18:22:54 -07:00
parent e8ad0b34aa
commit cf96ab45b8
3 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsweakmap.cpp
View File

@@ -271,6 +271,7 @@ WeakMap_set(JSContext *cx, unsigned argc, Value *vp)
JS_FRIEND_API(JSBool)
JS_NondeterministicGetWeakMapKeys(JSContext *cx, JSObject *obj, JSObject **ret)
{
obj = UnwrapObject(obj);
if (!obj || !obj->isWeakMap()) {
*ret = NULL;
return true;
@@ -281,7 +282,10 @@ JS_NondeterministicGetWeakMapKeys(JSContext *cx, JSObject *obj, JSObject **ret)
ObjectValueMap *map = GetObjectMap(obj);
if (map) {
for (ObjectValueMap::Base::Range r = map->all(); !r.empty(); r.popFront()) {
if (!js_NewbornArrayPush(cx, arr, ObjectValue(*r.front().key)))
RootedObject key(cx, r.front().key);
if (!JS_WrapObject(cx, key.address()))
return false;
if (!js_NewbornArrayPush(cx, arr, ObjectValue(*key)))
return false;
}
}