Skip to content

Commit

Permalink
Backout e7664dbdbfd6 (Bug 1110931) for regressing Octane-Splay perfor…
Browse files Browse the repository at this point in the history
…mance; r=no-benchmark-left-behind
  • Loading branch information
Terrence Cole committed Dec 17, 2014
1 parent 25337cf commit 8a3e72e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions js/src/gc/GCRuntime.h
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ class GCRuntime
*/
bool grayBitsValid;

mozilla::Atomic<uintptr_t> majorGCRequested;
volatile uintptr_t majorGCRequested;
JS::gcreason::Reason majorGCTriggerReason;

bool minorGCRequested;
Expand Down Expand Up @@ -792,7 +792,7 @@ class GCRuntime
* 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.
*/
mozilla::Atomic<uintptr_t> interFrameGC;
volatile uintptr_t interFrameGC;

/* Default budget for incremental GC slice. See SliceBudget in jsgc.h. */
int64_t sliceBudget;
Expand Down Expand Up @@ -836,7 +836,7 @@ class GCRuntime

bool poked;

mozilla::Atomic<js::HeapState> heapState;
volatile js::HeapState heapState;

/*
* ForkJoin workers enter and leave GC independently; this counter
Expand Down

0 comments on commit 8a3e72e

Please sign in to comment.