Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (208776 => 208777)
--- trunk/Source/_javascript_Core/ChangeLog 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-11-16 01:35:09 UTC (rev 208777)
@@ -1,3 +1,21 @@
+2016-11-15 Filip Pizlo <[email protected]>
+
+ Unreviewed, revert renaming useConcurrentJIT to useConcurrentJS.
+
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ * heap/Heap.cpp:
+ (JSC::Heap::addToRememberedSet):
+ * jit/JITWorklist.cpp:
+ (JSC::JITWorklist::compileLater):
+ (JSC::JITWorklist::compileNow):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ * runtime/Options.h:
+ * runtime/WriteBarrierInlines.h:
+ (JSC::WriteBarrierBase<T>::set):
+ (JSC::WriteBarrierBase<Unknown>::set):
+
2016-11-15 Geoffrey Garen <[email protected]>
Debugging and other tools should not disable the code cache
Modified: trunk/Source/_javascript_Core/dfg/DFGDriver.cpp (208776 => 208777)
--- trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/dfg/DFGDriver.cpp 2016-11-16 01:35:09 UTC (rev 208777)
@@ -100,7 +100,7 @@
new Plan(codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
plan->callback = callback;
- if (Options::useConcurrentJS()) {
+ if (Options::useConcurrentJIT()) {
Worklist& worklist = ensureGlobalWorklistFor(mode);
if (logCompilationChanges(mode))
dataLog("Deferring DFG compilation of ", *codeBlock, " with queue length ", worklist.queueLength(), ".\n");
Modified: trunk/Source/_javascript_Core/heap/Heap.cpp (208776 => 208777)
--- trunk/Source/_javascript_Core/heap/Heap.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/heap/Heap.cpp 2016-11-16 01:35:09 UTC (rev 208777)
@@ -985,7 +985,7 @@
void Heap::addToRememberedSet(const JSCell* cell)
{
ASSERT(cell);
- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
if (!Heap::isMarkedConcurrently(cell)) {
// During a full collection a store into an unmarked object that had surivived past
// collections will manifest as a store to an unmarked black object. If the object gets
Modified: trunk/Source/_javascript_Core/jit/JITWorklist.cpp (208776 => 208777)
--- trunk/Source/_javascript_Core/jit/JITWorklist.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/jit/JITWorklist.cpp 2016-11-16 01:35:09 UTC (rev 208777)
@@ -229,7 +229,7 @@
return;
}
- if (!Options::useConcurrentJS()) {
+ if (!Options::useConcurrentJIT()) {
Plan::compileNow(codeBlock);
return;
}
@@ -284,7 +284,7 @@
}
if (isPlanned) {
- RELEASE_ASSERT(Options::useConcurrentJS());
+ RELEASE_ASSERT(Options::useConcurrentJIT());
// This is expensive, but probably good enough.
completeAllForVM(*codeBlock->vm());
}
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (208776 => 208777)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2016-11-16 01:35:09 UTC (rev 208777)
@@ -318,7 +318,7 @@
Options::useRegExpJIT() = false;
#endif
#if !ENABLE(CONCURRENT_JS)
- Options::useConcurrentJS() = false;
+ Options::useConcurrentJIT() = false;
#endif
#if !ENABLE(DFG_JIT)
Options::useDFGJIT() = false;
@@ -370,7 +370,7 @@
Options::thresholdForFTLOptimizeAfterWarmUp() = 20;
Options::thresholdForFTLOptimizeSoon() = 20;
Options::maximumEvalCacheableSourceLength() = 150000;
- Options::useConcurrentJS() = false;
+ Options::useConcurrentJIT() = false;
}
if (Options::useMaximalFlushInsertionPhase()) {
Options::useOSREntryToDFG() = false;
Modified: trunk/Source/_javascript_Core/runtime/Options.h (208776 => 208777)
--- trunk/Source/_javascript_Core/runtime/Options.h 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/runtime/Options.h 2016-11-16 01:35:09 UTC (rev 208777)
@@ -233,7 +233,7 @@
v(bool, useObjectAllocationSinking, true, Normal, nullptr) \
v(bool, logExecutableAllocation, false, Normal, nullptr) \
\
- v(bool, useConcurrentJS, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
+ v(bool, useConcurrentJIT, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2, 2) - 1, Normal, nullptr) \
v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(8, 2) - 1, Normal, nullptr) \
v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
@@ -431,7 +431,7 @@
v(enablePolymorphicCallInlining, usePolymorphicCallInlining, SameOption) \
v(enableMovHintRemoval, useMovHintRemoval, SameOption) \
v(enableObjectAllocationSinking, useObjectAllocationSinking, SameOption) \
- v(enableConcurrentJS, useConcurrentJS, SameOption) \
+ v(enableConcurrentJIT, useConcurrentJIT, SameOption) \
v(enableProfiler, useProfiler, SameOption) \
v(enableArchitectureSpecificOptimizations, useArchitectureSpecificOptimizations, SameOption) \
v(enablePolyvariantCallInlining, usePolyvariantCallInlining, SameOption) \
Modified: trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h (208776 => 208777)
--- trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h 2016-11-16 01:35:09 UTC (rev 208777)
@@ -34,7 +34,7 @@
inline void WriteBarrierBase<T>::set(VM& vm, const JSCell* owner, T* value)
{
ASSERT(value);
- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
validateCell(value);
setEarlyValue(vm, owner, value);
}
@@ -56,7 +56,7 @@
inline void WriteBarrierBase<Unknown>::set(VM& vm, const JSCell* owner, JSValue value)
{
- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
m_value = JSValue::encode(value);
vm.heap.writeBarrier(owner, value);
}
