Backout db6bdc09068d (Bug 1110931) for regressing svgx by 40%.
authorTerrence Cole <terrence@mozilla.com>
Thu, 08 Jan 2015 15:07:30 -0800
changeset 222858 70f64ef5569e12ebd16e206b5e067f5378bc3ada
parent 222857 6429d270c004f34fe264ee5c7d64f4d552e89a9d
child 222859 33125ece9497300afdc11c4093b890e7e34da1c1
push id10731
push usercbook@mozilla.com
push dateFri, 09 Jan 2015 14:51:37 +0000
treeherderfx-team@e6756043d930 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1110931
milestone37.0a1
backs outdb6bdc09068d653d17c358bf8cd402e8f5032c28
Backout db6bdc09068d (Bug 1110931) for regressing svgx by 40%.
js/src/gc/GCRuntime.h
--- a/js/src/gc/GCRuntime.h
+++ b/js/src/gc/GCRuntime.h
@@ -830,17 +830,17 @@ class GCRuntime
      * stuff. At various times we check this counter and, if it has changed, we
      * run an immediate, non-incremental GC to clean up the dead
      * zones. This should happen very rarely.
      */
     unsigned objectsMarkedInDeadZones;
 
     bool poked;
 
-    mozilla::Atomic<js::HeapState> heapState;
+    volatile js::HeapState heapState;
 
     /*
      * These options control the zealousness of the GC. The fundamental values
      * are nextScheduled and gcDebugCompartmentGC. At every allocation,
      * nextScheduled is decremented. When it reaches zero, we do either a full
      * or a compartmental GC, based on debugCompartmentGC.
      *
      * At this point, if zeal_ is one of the types that trigger periodic