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

Backed out changeset 3adf62f886d9 (bug 650161)

Browse Source
This commit is contained in:
Ed Morley
2014-08-14 12:52:41 +01:00
parent 0d77915717
commit d84861ec54
28 changed files with 69 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jsproxy.cpp
View File

@@ -2834,7 +2834,7 @@ ProxyObject::trace(JSTracer *trc, JSObject *obj)
#ifdef DEBUG
if (trc->runtime()->gc.isStrictProxyCheckingEnabled() && proxy->is<WrapperObject>()) {
JSObject *referent = MaybeForwarded(&proxy->private_().toObject());
JSObject *referent = &proxy->private_().toObject();
if (referent->compartment() != proxy->compartment()) {
/*
* Assert that this proxy is tracked in the wrapper map. We maintain
@@ -2842,7 +2842,6 @@ ProxyObject::trace(JSTracer *trc, JSObject *obj)
*/
Value key = ObjectValue(*referent);
WrapperMap::Ptr p = proxy->compartment()->lookupWrapper(key);
JS_ASSERT(p);
JS_ASSERT(*p->value().unsafeGet() == ObjectValue(*proxy));
}
}