Bug 1194430 - Always mark the global jitcode table during major GCs. (r=djvj)

js/src/jit/Ion.cpp

@@ -644,8 +644,7 @@ JitRuntime::MarkJitcodeGlobalTableUnconditionally(JSTracer* trc)
 /* static */ bool
 JitRuntime::MarkJitcodeGlobalTableIteratively(JSTracer* trc)
 {
-    if (trc->runtime()->spsProfiler.enabled() &&
-        trc->runtime()->hasJitRuntime() &&
+    if (trc->runtime()->hasJitRuntime() &&
         trc->runtime()->jitRuntime()->hasJitcodeGlobalTable())
     {
         return trc->runtime()->jitRuntime()->getJitcodeGlobalTable()->markIteratively(trc);

js/src/jit/JitcodeMap.cpp

@@ -808,12 +808,15 @@ JitcodeGlobalTable::markIteratively(JSTracer* trc)
     // above is checked in JitcodeGlobalTable::lookupForSampler.
 
     MOZ_ASSERT(!trc->runtime()->isHeapMinorCollecting());
-    MOZ_ASSERT(trc->runtime()->spsProfiler.enabled());
 
     AutoSuppressProfilerSampling suppressSampling(trc->runtime());
     uint32_t gen = trc->runtime()->profilerSampleBufferGen();
     uint32_t lapCount = trc->runtime()->profilerSampleBufferLapCount();
 
+    // If the profiler is off, all entries are considered to be expired.
+    if (!trc->runtime()->spsProfiler.enabled())
+        gen = UINT32_MAX;
+
     bool markedAny = false;
     for (Range r(*this); !r.empty(); r.popFront()) {
         JitcodeGlobalEntry* entry = r.front();