From ff9877cfe46e0c62e5e69af99445c7ca4738fbd5 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Thu, 21 Mar 2019 21:28:10 +0100
Subject: Force expected crashes on unexpected magic values.

---
 js/public/Value.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'js')

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 {
-- 
cgit v1.2.3