Backout e7664dbdbfd6 (Bug 1110931) for regressing Octane-Splay performance; r=no-benchmark-left-behind

This commit is contained in:
Terrence Cole 2014-12-17 14:04:16 -08:00
parent 842d6217d1
commit 2131dcb070

View File

@ -697,7 +697,7 @@ class GCRuntime
*/ */
bool grayBitsValid; bool grayBitsValid;
mozilla::Atomic<uintptr_t> majorGCRequested; volatile uintptr_t majorGCRequested;
JS::gcreason::Reason majorGCTriggerReason; JS::gcreason::Reason majorGCTriggerReason;
bool minorGCRequested; bool minorGCRequested;
@ -792,7 +792,7 @@ class GCRuntime
* frame, rather than at the beginning. In this case, the next slice will be * frame, rather than at the beginning. In this case, the next slice will be
* delayed so that we don't get back-to-back slices. * delayed so that we don't get back-to-back slices.
*/ */
mozilla::Atomic<uintptr_t> interFrameGC; volatile uintptr_t interFrameGC;
/* Default budget for incremental GC slice. See SliceBudget in jsgc.h. */ /* Default budget for incremental GC slice. See SliceBudget in jsgc.h. */
int64_t sliceBudget; int64_t sliceBudget;
@ -836,7 +836,7 @@ class GCRuntime
bool poked; bool poked;
mozilla::Atomic<js::HeapState> heapState; volatile js::HeapState heapState;
/* /*
* ForkJoin workers enter and leave GC independently; this counter * ForkJoin workers enter and leave GC independently; this counter