From 99a2f8bdd6c7b9ae10fbbd8f145ceec6e2a095df Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Fri, 23 Aug 2013 16:43:38 +0100
Subject: [PATCH] Bug 907135 - Disable verification of OSI point registers in
 rooting analysis builds r=nbp

---
 js/src/jit/IonTypes.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/js/src/jit/IonTypes.h b/js/src/jit/IonTypes.h
index 69678896e6a0..53f8c8265a22 100644
--- a/js/src/jit/IonTypes.h
+++ b/js/src/jit/IonTypes.h
@@ -207,7 +207,10 @@ IsNullOrUndefined(MIRType type)
 
 // Make sure registers are not modified between an instruction and
 // its OsiPoint.
-#  ifdef JS_ION
+//
+// Skip this check in rooting analysis builds, which poison unrooted
+// pointers on the stack.
+#  if defined(JS_ION) && !defined(JSGC_ROOT_ANALYSIS)
 #    define CHECK_OSIPOINT_REGISTERS 1
 #  endif
 #endif