From b9c41e262438d85e2b3f0fb7905b69818ff875aa Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 31 Oct 2020 17:31:38 +0100
Subject: [devtools] More gracefully (than a crash) handle stack capture
 failures.

---
 js/src/jsapi.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'js/src')

diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index c0f0e61cc..cd370e42c 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -7040,7 +7040,9 @@ JS::CaptureCurrentStack(JSContext* cx, JS::MutableHandleObject stackp,
 {
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    MOZ_RELEASE_ASSERT(cx->compartment());
+    if (!cx->compartment()) {
+      return false;
+    }
 
     JSCompartment* compartment = cx->compartment();
     Rooted<SavedFrame*> frame(cx);
-- 
cgit v1.2.3


From d7df9b336ae34ff4c4b64f7aa4e0be2579c95ece Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 9 Nov 2020 21:10:53 -0500
Subject: Bug 1328948 - Add is(), as() to Cell.

Tag #1679
---
 js/src/gc/Heap.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'js/src')

diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index 697803380..7f2c5fb4f 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -29,6 +29,7 @@
 #include "js/HeapAPI.h"
 #include "js/RootingAPI.h"
 #include "js/TracingAPI.h"
+#include "js/TraceKind.h"
 
 struct JSRuntime;
 
@@ -273,6 +274,23 @@ struct Cell
 
     static MOZ_ALWAYS_INLINE bool needWriteBarrierPre(JS::Zone* zone);
 
+    template <class T>
+    inline bool is() const {
+        return getTraceKind() == JS::MapTypeToTraceKind<T>::kind;
+    }
+
+    template<class T>
+    inline T* as() {
+        MOZ_ASSERT(is<T>());
+        return static_cast<T*>(this);
+    }
+
+    template <class T>
+    inline const T* as() const {
+        MOZ_ASSERT(is<T>());
+        return static_cast<const T*>(this);
+    }
+
 #ifdef DEBUG
     inline bool isAligned() const;
     void dump(FILE* fp) const;
-- 
cgit v1.2.3