Bug 962653 - Use mozilla::Atomic for MIRGenerator::cancelBuild_. r=nbp
authorJan de Mooij <jdemooij@mozilla.com>
Thu, 23 Jan 2014 20:50:56 +0100
changeset 180964 f9f11f19eca6b4f53295791334a894997289f642
parent 180963 16805a1975cd3a7a830bb26722ca93eb643fe3b4
child 180965 38c297cc1babe8eb379c706bf49be0585e12ec54
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs962653
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 962653 - Use mozilla::Atomic for MIRGenerator::cancelBuild_. r=nbp
js/src/jit/MIRGenerator.h
--- a/js/src/jit/MIRGenerator.h
+++ b/js/src/jit/MIRGenerator.h
@@ -5,16 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef jit_MIRGenerator_h
 #define jit_MIRGenerator_h
 
 // This file declares the data structures used to build a control-flow graph
 // containing MIR.
 
+#include "mozilla/Atomics.h"
+
 #include <stdarg.h>
 
 #include "jscntxt.h"
 #include "jscompartment.h"
 
 #include "jit/CompileInfo.h"
 #include "jit/IonAllocPolicy.h"
 #include "jit/JitCompartment.h"
@@ -140,17 +142,17 @@ class MIRGenerator
   protected:
     CompileInfo *info_;
     const OptimizationInfo *optimizationInfo_;
     TempAllocator *alloc_;
     JSFunction *fun_;
     uint32_t nslots_;
     MIRGraph *graph_;
     bool error_;
-    size_t cancelBuild_;
+    mozilla::Atomic<uint32_t, mozilla::Relaxed> cancelBuild_;
 
     uint32_t maxAsmJSStackArgBytes_;
     bool performsAsmJSCall_;
     AsmJSHeapAccessVector asmJSHeapAccesses_;
     AsmJSGlobalAccessVector asmJSGlobalAccesses_;
     uint32_t minAsmJSHeapLength_;
 
     // Keep track of whether frame arguments are modified during execution.