summaryrefslogtreecommitdiffstats
path: root/js/public/Value.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-03-26 18:41:32 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-03-26 18:41:32 +0100
commit1e1525c44c23bde16102a64e685e02a9ab6825cc (patch)
treea2462a2f6278466e93ddedbf71983c325698933a /js/public/Value.h
parente25ad543952b5afc13181aaebef9c5951fc27be0 (diff)
parenteb77e289bbe056b58051db0fa868e95da803aa0a (diff)
downloadUXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar
UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.gz
UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.lz
UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.tar.xz
UXP-1e1525c44c23bde16102a64e685e02a9ab6825cc.zip
Merge commit 'eb77e289bbe056b58051db0fa868e95da803aa0a' into Basilisk-release
Diffstat (limited to 'js/public/Value.h')
-rw-r--r--js/public/Value.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/public/Value.h b/js/public/Value.h
index 01666ed4e..7c4f833e3 100644
--- a/js/public/Value.h
+++ b/js/public/Value.h
@@ -567,8 +567,11 @@ class MOZ_NON_PARAM alignas(8) Value
}
bool isMagic(JSWhyMagic why) const {
- MOZ_ASSERT_IF(isMagic(), data.s.payload.why == why);
- return isMagic();
+ if (!isMagic()) {
+ return false;
+ }
+ MOZ_RELEASE_ASSERT(data.s.payload.why == why);
+ return true;
}
JS::TraceKind traceKind() const {