From 72831e79be1ac8d6cfbbd70af255eaeee2033018 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Mon, 21 Jan 2013 11:00:29 +0000
Subject: [PATCH] Bug 831750 - GC: testConservativeGC jsapi test fails with
 rooting analysis r=terrence a=nonlibxul

---
 js/src/jsapi-tests/testConservativeGC.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/src/jsapi-tests/testConservativeGC.cpp b/js/src/jsapi-tests/testConservativeGC.cpp
index c01f00dea08..b70f73b5d93 100644
--- a/js/src/jsapi-tests/testConservativeGC.cpp
+++ b/js/src/jsapi-tests/testConservativeGC.cpp
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#if !defined(JSGC_ROOT_ANALYSIS) && !defined(JSGC_USE_EXACT_ROOTING)
+
 #include "tests.h"
 #include "jsobj.h"
 #include "vm/String.h"
@@ -10,7 +12,6 @@
 
 BEGIN_TEST(testConservativeGC)
 {
-#ifndef JSGC_USE_EXACT_ROOTING
     js::RootedValue v2(cx);
     EVAL("({foo: 'bar'});", v2.address());
     CHECK(v2.isObject());
@@ -52,7 +53,6 @@ BEGIN_TEST(testConservativeGC)
 
     checkObjectFields((JSObject *)obj2Copy, obj2);
     CHECK(!memcmp(str2Copy, str2, sizeof(str2Copy)));
-#endif /* JSGC_USE_EXACT_ROOTING */
 
     return true;
 }
@@ -86,3 +86,5 @@ BEGIN_TEST(testDerivedValues)
   return true;
 }
 END_TEST(testDerivedValues)
+
+#endif /* !defined(JSGC_ROOT_ANALYSIS) && !defined(JSGC_USE_EXACT_ROOTING) */