Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (244432 => 244433)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-18 20:26:23 UTC (rev 244432)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-18 20:44:47 UTC (rev 244433)
@@ -1,3 +1,19 @@
+2019-04-18 Saam barati <sbar...@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 <sbar...@apple.com>
Remove deprecated JSScript SPI
Modified: trunk/Source/_javascript_Core/dfg/DFGStoreBarrierClusteringPhase.cpp (244432 => 244433)
--- trunk/Source/_javascript_Core/dfg/DFGStoreBarrierClusteringPhase.cpp 2019-04-18 20:26:23 UTC (rev 244432)
+++ trunk/Source/_javascript_Core/dfg/DFGStoreBarrierClusteringPhase.cpp 2019-04-18 20:44:47 UTC (rev 244433)
@@ -140,7 +140,7 @@
CodeOrigin semanticOrigin = iter->semanticOrigin;
NodeType type;
- if (Options::useConcurrentBarriers() && iter == m_neededBarriers.begin())
+ if (iter == m_neededBarriers.begin())
type = FencedStoreBarrier;
else
type = StoreBarrier;
Modified: trunk/Source/_javascript_Core/dfg/DFGStoreBarrierInsertionPhase.cpp (244432 => 244433)
--- trunk/Source/_javascript_Core/dfg/DFGStoreBarrierInsertionPhase.cpp 2019-04-18 20:26:23 UTC (rev 244432)
+++ trunk/Source/_javascript_Core/dfg/DFGStoreBarrierInsertionPhase.cpp 2019-04-18 20:44:47 UTC (rev 244433)
@@ -478,13 +478,7 @@
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()
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (244432 => 244433)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-04-18 20:26:23 UTC (rev 244432)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2019-04-18 20:44:47 UTC (rev 244433)
@@ -1541,8 +1541,6 @@
void barrierStoreLoadFence(VM& vm)
{
- if (!Options::useConcurrentBarriers())
- return;
Jump ok = jumpIfMutatorFenceNotNeeded(vm);
memoryFence();
ok.link(this);
Modified: trunk/Source/_javascript_Core/runtime/Options.h (244432 => 244433)
--- trunk/Source/_javascript_Core/runtime/Options.h 2019-04-18 20:26:23 UTC (rev 244432)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2019-04-18 20:44:47 UTC (rev 244433)
@@ -219,7 +219,6 @@
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) \
