Bug 1002277 - TopmostJitActivationCompartment is not defined on non-ion builds. r=bhackett, a=sledru
authorSteve Singer <steve@ssinger.info>
Sun, 27 Apr 2014 17:27:00 +0200
changeset 199051 caf1a925d7dbaf402eb628d2f163998e99966121
parent 199050 efd9a6070711cd7f27bce6f49ed8ac8728c39abe
child 199052 7c6083c5e6c6396197b5bff9a0f95491b90c8ff4
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhackett, sledru
bugs1002277
milestone31.0a2
Bug 1002277 - TopmostJitActivationCompartment is not defined on non-ion builds. r=bhackett, a=sledru
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2766,18 +2766,20 @@ BeginMarkPhase(JSRuntime *rt)
     for (CompartmentsIter c(rt, WithAtoms); !c.done(); c.next()) {
         JS_ASSERT(c->gcLiveArrayBuffers.empty());
         c->marked = false;
         if (ShouldPreserveJITCode(c, currentTime))
             c->zone()->setPreservingCode(true);
     }
 
     if (!rt->gcShouldCleanUpEverything) {
+#ifdef JS_ION
         if (JSCompartment *comp = jit::TopmostJitActivationCompartment(rt))
             comp->zone()->setPreservingCode(true);
+#endif
     }
 
     /*
      * Atoms are not in the cross-compartment map. So if there are any
      * zones that are not being collected, we are not allowed to collect
      * atoms. Otherwise, the non-collected zones could contain pointers
      * to atoms that we would miss.
      *