aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mozjs60/add-exposeToActiveJS.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/mozjs60/add-exposeToActiveJS.patch')
-rw-r--r--testing/mozjs60/add-exposeToActiveJS.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/testing/mozjs60/add-exposeToActiveJS.patch b/testing/mozjs60/add-exposeToActiveJS.patch
new file mode 100644
index 0000000000..7736e4ce68
--- /dev/null
+++ b/testing/mozjs60/add-exposeToActiveJS.patch
@@ -0,0 +1,24 @@
+Upstream: Yes
+Reason: Required for GJS
+# HG changeset patch
+# User Philip Chimento <philip.chimento@gmail.com>
+# Date 1527544053 25200
+# Mon May 28 14:47:33 2018 -0700
+# Node ID a50e7374d0952b893f843e9d21d13d5b7ec8564c
+# Parent a466172aed4bc2afc21169b749b8068a4b98c93f
+Bug 1464912 - Add exposeToActiveJS specialization for JSString. r=sfink
+
+diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
+--- a/js/public/RootingAPI.h
++++ b/js/public/RootingAPI.h
+@@ -719,6 +719,10 @@ struct BarrierMethods<JSString*>
+ static void postBarrier(JSString** vp, JSString* prev, JSString* next) {
+ JS::HeapStringPostBarrier(vp, prev, next);
+ }
++ static void exposeToJS(JSString* v) {
++ if (v)
++ js::gc::ExposeGCThingToActiveJS(JS::GCCellPtr(v));
++ }
+ };
+
+ // Provide hash codes for Cell kinds that may be relocated and, thus, not have