summaryrefslogtreecommitdiff
path: root/patches/IsInRequest-949195.patch
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2013-12-11 22:24:18 +0000
committer <>2014-07-24 09:30:59 +0000
commit59e2936f588aa945e8dcd6c737523c299067e9d0 (patch)
tree97e74980cc54baa19de5faa11f5a50a0121a48ea /patches/IsInRequest-949195.patch
downloadmozjs24-master.tar.gz
Imported from /home/lorry/working-area/delta_mozilla_mozjs24/mozjs-24.2.0.tar.bz2.HEADmozjs-24.2.0master
Diffstat (limited to 'patches/IsInRequest-949195.patch')
-rw-r--r--patches/IsInRequest-949195.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/patches/IsInRequest-949195.patch b/patches/IsInRequest-949195.patch
new file mode 100644
index 0000000..cdf5a4e
--- /dev/null
+++ b/patches/IsInRequest-949195.patch
@@ -0,0 +1,16 @@
+# HG changeset patch
+# Parent cd8909c56cccd12a576d731982a2b98be6fd1a96
+Bug 949195 - Only use IsInRequest when JS_DEBUG.
+
+diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h
+--- a/js/public/RootingAPI.h
++++ b/js/public/RootingAPI.h
+@@ -532,7 +532,7 @@ class MOZ_STACK_CLASS Rooted : public js
+ {
+ void init(JSContext *cxArg) {
+ MOZ_ASSERT(cxArg);
+-#ifdef JS_THREADSAFE
++#if defined(JS_DEBUG) && defined(JS_THREADSAFE)
+ MOZ_ASSERT(js::IsInRequest(cxArg));
+ #endif
+ #if defined(JSGC_ROOT_ANALYSIS) || defined(JSGC_USE_EXACT_ROOTING)