rebased to master and resolved the conflicts

leirocks · leirocks · commit 0cdf52193b4f · 2016-03-01T11:43:32.000-08:00
remove volatile since we made sure there's not sync issue any more
diff --git a/lib/Runtime/Base/CompactCounters.h b/lib/Runtime/Base/CompactCounters.h
@@ -12,7 +12,7 @@ namespace Js
     template<class T, typename CountT = T::CounterFields>
     struct CompactCounters
     {
-        volatile uint8 fieldSize;
+        uint8 fieldSize;
 #if DBG
         mutable bool bgThreadCallStarted;
         bool isCleaningUp;
@@ -26,7 +26,6 @@ namespace Js
             WriteBarrierPtr<int32> i32Fields;
         };
 
-
         CompactCounters()
             :fieldSize(1)
 #if DBG
