Remove useConcurrentBarriers option
authorsbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Apr 2019 20:44:47 +0000 (20:44 +0000)
committersbarati@apple.com <sbarati@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 18 Apr 2019 20:44:47 +0000 (20:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=197066

Reviewed by Michael Saboff.

This isn't a helpful option as it will lead us to crash when using the
concurrent GC.

* dfg/DFGStoreBarrierClusteringPhase.cpp:
* dfg/DFGStoreBarrierInsertionPhase.cpp:
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::barrierStoreLoadFence):
* runtime/Options.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGStoreBarrierClusteringPhase.cpp
Source/JavaScriptCore/dfg/DFGStoreBarrierInsertionPhase.cpp
Source/JavaScriptCore/jit/AssemblyHelpers.h
Source/JavaScriptCore/runtime/Options.h

index cb6ca7e..02169b7 100644 (file)
@@ -1,3 +1,19 @@
+2019-04-18  Saam barati  <sbarati@apple.com>
+
+        Remove useConcurrentBarriers option
+        https://bugs.webkit.org/show_bug.cgi?id=197066
+
+        Reviewed by Michael Saboff.
+
+        This isn't a helpful option as it will lead us to crash when using the
+        concurrent GC.
+
+        * dfg/DFGStoreBarrierClusteringPhase.cpp:
+        * dfg/DFGStoreBarrierInsertionPhase.cpp:
+        * jit/AssemblyHelpers.h:
+        (JSC::AssemblyHelpers::barrierStoreLoadFence):
+        * runtime/Options.h:
+
 2019-04-17  Saam Barati  <sbarati@apple.com>
 
         Remove deprecated JSScript SPI
index 04c7977..0fe01d7 100644 (file)
@@ -140,7 +140,7 @@ private:
                 CodeOrigin semanticOrigin = iter->semanticOrigin;
                 
                 NodeType type;
-                if (Options::useConcurrentBarriers() && iter == m_neededBarriers.begin())
+                if (iter == m_neededBarriers.begin())
                     type = FencedStoreBarrier;
                 else
                     type = StoreBarrier;
index 6af45b0..fa396f4 100644 (file)
@@ -478,13 +478,7 @@ private:
         if (clobbersExitState(m_graph, m_node))
             origin = origin.withInvalidExit();
         
-        NodeType type;
-        if (Options::useConcurrentBarriers())
-            type = FencedStoreBarrier;
-        else
-            type = StoreBarrier;
-        
-        m_insertionSet.insertNode(nodeIndex, SpecNone, type, origin, base);
+        m_insertionSet.insertNode(nodeIndex, SpecNone, FencedStoreBarrier, origin, base);
     }
     
     bool reallyInsertBarriers()
index 9b46fe5..2172e72 100644 (file)
@@ -1541,8 +1541,6 @@ public:
     
     void barrierStoreLoadFence(VM& vm)
     {
-        if (!Options::useConcurrentBarriers())
-            return;
         Jump ok = jumpIfMutatorFenceNotNeeded(vm);
         memoryFence();
         ok.link(this);
index 1d55196..5c8d0cf 100644 (file)
@@ -219,7 +219,6 @@ constexpr bool enableWebAssemblyStreamingApi = false;
     v(bool, testTheFTL, false, Normal, nullptr) \
     v(bool, verboseSanitizeStack, false, Normal, nullptr) \
     v(bool, useGenerationalGC, true, Normal, nullptr) \
-    v(bool, useConcurrentBarriers, true, Normal, nullptr) \
     v(bool, useConcurrentGC, true, Normal, nullptr) \
     v(bool, collectContinuously, false, Normal, nullptr) \
     v(double, collectContinuouslyPeriodMS, 1, Normal, nullptr) \