diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:45:54 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-11 17:45:54 +0200 |
| commit | 597fb9fbe387378185431e1900ebe6f05ca09fbf (patch) | |
| tree | 6adbe3cfb37ec4fca51003633bea9334f4822be5 /js/src/vm | |
| parent | eac3e641110ce26cae69a53bb5920c6d725392ec (diff) | |
| parent | ac05ab923af8bc5b0c077fe3a271492af19dbea8 (diff) | |
| download | UXP-597fb9fbe387378185431e1900ebe6f05ca09fbf.tar UXP-597fb9fbe387378185431e1900ebe6f05ca09fbf.tar.gz UXP-597fb9fbe387378185431e1900ebe6f05ca09fbf.tar.lz UXP-597fb9fbe387378185431e1900ebe6f05ca09fbf.tar.xz UXP-597fb9fbe387378185431e1900ebe6f05ca09fbf.zip | |
Rebase on master
Diffstat (limited to 'js/src/vm')
| -rw-r--r-- | js/src/vm/ProxyObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/vm/ProxyObject.cpp b/js/src/vm/ProxyObject.cpp index 49ed5a624..69b4cd952 100644 --- a/js/src/vm/ProxyObject.cpp +++ b/js/src/vm/ProxyObject.cpp @@ -45,7 +45,7 @@ ProxyObject::New(JSContext* cx, const BaseProxyHandler* handler, HandleValue pri // wrappee. Prefer to allocate in the nursery, when possible. NewObjectKind newKind = NurseryAllocatedProxy; if (options.singleton()) { - MOZ_ASSERT(priv.isGCThing() && priv.toGCThing()->isTenured()); + MOZ_ASSERT(priv.isNull() || (priv.isGCThing() && priv.toGCThing()->isTenured())); newKind = SingletonObject; } else if ((priv.isGCThing() && priv.toGCThing()->isTenured()) || !handler->canNurseryAllocate() || |