diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-08 18:16:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 18:16:01 +0200 |
| commit | 5ff20954ad3b6f3581f516c2c2f1e414dd2a3daa (patch) | |
| tree | 05e3594dc85fd66d29d122184157901fe7e51837 /js/src/jsfun.h | |
| parent | d2091b32b6ea6cf428179f2084a7f35205dbf214 (diff) | |
| parent | edee6fab0d1774120eca1f343574a305c46359e9 (diff) | |
| download | uxp-5ff20954ad3b6f3581f516c2c2f1e414dd2a3daa.tar.gz | |
Merge pull request #94 from trav90/js-work
Fix Value::isGCThing footgun, stop returning true for NullValue
Diffstat (limited to 'js/src/jsfun.h')
| -rw-r--r-- | js/src/jsfun.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/src/jsfun.h b/js/src/jsfun.h index d45d112a5e..7da831aa2b 100644 --- a/js/src/jsfun.h +++ b/js/src/jsfun.h @@ -830,7 +830,7 @@ inline void JSFunction::setExtendedSlot(size_t which, const js::Value& val) { MOZ_ASSERT(which < mozilla::ArrayLength(toExtended()->extendedSlots)); - MOZ_ASSERT_IF(js::IsMarkedBlack(this) && val.isMarkable(), + MOZ_ASSERT_IF(js::IsMarkedBlack(this) && val.isGCThing(), !JS::GCThingIsMarkedGray(JS::GCCellPtr(val))); toExtended()->extendedSlots[which] = val; } |