From 8a3e72e9b5927667e3825f52cf19f626f7922e96 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Wed, 17 Dec 2014 14:04:16 -0800
Subject: [PATCH] Backout e7664dbdbfd6 (Bug 1110931) for regressing
 Octane-Splay performance; r=no-benchmark-left-behind

---
 js/src/gc/GCRuntime.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/gc/GCRuntime.h b/js/src/gc/GCRuntime.h
index 829b181463e31d..05f50e8cc05005 100644
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -697,7 +697,7 @@ class GCRuntime
      */
     bool grayBitsValid;
 
-    mozilla::Atomic<uintptr_t> majorGCRequested;
+    volatile uintptr_t majorGCRequested;
     JS::gcreason::Reason majorGCTriggerReason;
 
     bool minorGCRequested;
@@ -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;
@@ -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