Backed out changeset 31929d871cad (bug 1002277) for devtools-chrome-3 orange
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 29 Apr 2014 10:14:19 +0200
changeset 181085 b9f981ab229c00e86aa19864c2c6ccdefd2f9a7a
parent 181084 b7be54db9ede942479967add1cda702624cc7384
child 181086 4cca5e45f4f9c795b8b7983df8df48538bfb3273
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs1002277
milestone32.0a1
backs out31929d871cadab67add1aaaf5b1703beacb32406
Backed out changeset 31929d871cad (bug 1002277) for devtools-chrome-3 orange
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2766,20 +2766,18 @@ 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.
      *