<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191058] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191058">191058</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-10-14 11:57:07 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename some JSC option names to be more uniform.
https://bugs.webkit.org/show_bug.cgi?id=150127
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Renaming JSC_enableXXX options to JSC_useXXX, and JSC_showXXX options to JSC_dumpXXX.
Also will renaming a few other miscellaneous to options, to abide by this scheme.
Also renaming some functions to match the option names where relevant.
* API/tests/ExecutionTimeLimitTest.cpp:
(testExecutionTimeLimit):
* assembler/AbstractMacroAssembler.h:
(JSC::optimizeForARMv7IDIVSupported):
(JSC::optimizeForARM64):
(JSC::optimizeForX86):
* assembler/LinkBuffer.cpp:
(JSC::shouldDumpDisassemblyFor):
(JSC::LinkBuffer::finalizeCodeWithoutDisassembly):
(JSC::shouldShowDisassemblyFor): Deleted.
* assembler/LinkBuffer.h:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::jettison):
* bytecode/CodeBlockJettisoningWatchpoint.cpp:
(JSC::CodeBlockJettisoningWatchpoint::fireInternal):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
(JSC::DFG::AdaptiveInferredPropertyValueWatchpoint::fire):
* dfg/DFGAdaptiveStructureWatchpoint.cpp:
(JSC::DFG::AdaptiveStructureWatchpoint::fireInternal):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleInlining):
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::handlePutById):
(JSC::DFG::ByteCodeParser::parse):
* dfg/DFGCommon.h:
(JSC::DFG::leastUpperBound):
(JSC::DFG::shouldDumpDisassembly):
(JSC::DFG::shouldShowDisassembly): Deleted.
* dfg/DFGDriver.cpp:
(JSC::DFG::compileImpl):
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::JITCompiler):
(JSC::DFG::JITCompiler::disassemble):
* dfg/DFGJumpReplacement.cpp:
(JSC::DFG::JumpReplacement::fire):
* dfg/DFGOSREntry.cpp:
(JSC::DFG::prepareOSREntry):
* dfg/DFGOSRExitCompiler.cpp:
* dfg/DFGOSRExitFuzz.h:
(JSC::DFG::doOSRExitFuzzing):
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileArithSqrt):
* dfg/DFGTierUpCheckInjectionPhase.cpp:
(JSC::DFG::TierUpCheckInjectionPhase::run):
* ftl/FTLCompile.cpp:
(JSC::FTL::mmAllocateDataSection):
* ftl/FTLJITCode.cpp:
(JSC::FTL::JITCode::~JITCode):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):
(JSC::FTL::compileFTLOSRExit):
* ftl/FTLState.h:
(JSC::FTL::verboseCompilationEnabled):
(JSC::FTL::shouldDumpDisassembly):
(JSC::FTL::shouldShowDisassembly): Deleted.
* heap/Heap.cpp:
(JSC::Heap::addToRememberedSet):
(JSC::Heap::didFinishCollection):
(JSC::Heap::shouldDoFullCollection):
* heap/Heap.h:
(JSC::Heap::isDeferred):
(JSC::Heap::structureIDTable):
* heap/HeapStatistics.cpp:
(JSC::StorageStatistics::storageCapacity):
(JSC::HeapStatistics::dumpObjectStatistics):
(JSC::HeapStatistics::showObjectStatistics): Deleted.
* heap/HeapStatistics.h:
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::Frame::createArguments):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::callExceptionFuzz):
* jit/ExecutableAllocationFuzz.cpp:
(JSC::doExecutableAllocationFuzzing):
* jit/ExecutableAllocationFuzz.h:
(JSC::doExecutableAllocationFuzzingIfEnabled):
* jit/JIT.cpp:
(JSC::JIT::privateCompile):
* jit/JITCode.cpp:
(JSC::JITCodeWithCodeRef::~JITCodeWithCodeRef):
* jit/PolymorphicCallStubRoutine.cpp:
(JSC::PolymorphicCallNode::unlink):
(JSC::PolymorphicCallNode::clearCallLinkInfo):
(JSC::PolymorphicCallStubRoutine::PolymorphicCallStubRoutine):
* jit/Repatch.cpp:
(JSC::linkFor):
(JSC::unlinkFor):
(JSC::linkVirtualFor):
* jsc.cpp:
(functionEnableExceptionFuzz):
(jscmain):
* llvm/InitializeLLVM.cpp:
(JSC::initializeLLVMImpl):
* runtime/ExceptionFuzz.cpp:
(JSC::doExceptionFuzzing):
* runtime/ExceptionFuzz.h:
(JSC::doExceptionFuzzingIfEnabled):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
(JSC::Options::initialize):
(JSC::Options::dumpOptionsIfNeeded):
(JSC::Options::setOption):
(JSC::Options::dumpAllOptions):
(JSC::Options::dumpAllOptionsInALine):
(JSC::Options::dumpOption):
* runtime/Options.h:
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:
(JSC::VM::exceptionFuzzingBuffer):
* runtime/WriteBarrierInlines.h:
(JSC::WriteBarrierBase<T>::set):
(JSC::WriteBarrierBase<Unknown>::set):
* tests/executableAllocationFuzz.yaml:
* tests/stress/arrowfunction-typeof.js:
* tests/stress/disable-function-dot-arguments.js:
(foo):
* tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js:
(sqrtOnInteger):
* tests/stress/regress-148564.js:
Tools:
* Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz:
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPItestsExecutionTimeLimitTestcpp">trunk/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerLinkBuffercpp">trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerLinkBufferh">trunk/Source/JavaScriptCore/assembler/LinkBuffer.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockJettisoningWatchpointcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAdaptiveInferredPropertyValueWatchpointcpp">trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAdaptiveStructureWatchpointcpp">trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonh">trunk/Source/JavaScriptCore/dfg/DFGCommon.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDrivercpp">trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJITCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGJumpReplacementcpp">trunk/Source/JavaScriptCore/dfg/DFGJumpReplacement.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSREntrycpp">trunk/Source/JavaScriptCore/dfg/DFGOSREntry.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilercpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitFuzzh">trunk/Source/JavaScriptCore/dfg/DFGOSRExitFuzz.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGTierUpCheckInjectionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLJITCodecpp">trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp">trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStateh">trunk/Source/JavaScriptCore/ftl/FTLState.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapStatisticscpp">trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapStatisticsh">trunk/Source/JavaScriptCore/heap/HeapStatistics.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelperscpp">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocationFuzzcpp">trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitExecutableAllocationFuzzh">trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITCodecpp">trunk/Source/JavaScriptCore/jit/JITCode.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitPolymorphicCallStubRoutinecpp">trunk/Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellvmInitializeLLVMcpp">trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionFuzzcpp">trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExceptionFuzzh">trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWriteBarrierInlinesh">trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsexecutableAllocationFuzzyaml">trunk/Source/JavaScriptCore/tests/executableAllocationFuzz.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontypeofjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressdisablefunctiondotargumentsjs">trunk/Source/JavaScriptCore/tests/stress/disable-function-dot-arguments.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressmathsqrtbasicsdisablearchitecturespecificoptimizationsjs">trunk/Source/JavaScriptCore/tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressregress148564js">trunk/Source/JavaScriptCore/tests/stress/regress-148564.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsjscstresstesthelpersjsexecutableallocationfuzz">trunk/Tools/Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPItestsExecutionTimeLimitTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/API/tests/ExecutionTimeLimitTest.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -102,10 +102,10 @@
</span><span class="cx"> int testExecutionTimeLimit()
</span><span class="cx"> {
</span><span class="cx"> static const TierOptions tierOptionsList[] = {
</span><del>- { "LLINT", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=false" },
- { "Baseline", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=false" },
- { "DFG", 0, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=false" },
- { "FTL", 200, "--enableConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=true" },
</del><ins>+ { "LLINT", 0, "--useConcurrentJIT=false --useLLInt=true --useJIT=false" },
+ { "Baseline", 0, "--useConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=false" },
+ { "DFG", 0, "--useConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=false" },
+ { "FTL", 200, "--useConcurrentJIT=false --useLLInt=true --useJIT=true --useDFGJIT=true --useFTLJIT=true" },
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> bool failed = false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1,5 +1,145 @@
</span><span class="cx"> 2015-10-14 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Rename some JSC option names to be more uniform.
+ https://bugs.webkit.org/show_bug.cgi?id=150127
+
+ Reviewed by Geoffrey Garen.
+
+ Renaming JSC_enableXXX options to JSC_useXXX, and JSC_showXXX options to JSC_dumpXXX.
+ Also will renaming a few other miscellaneous to options, to abide by this scheme.
+
+ Also renaming some functions to match the option names where relevant.
+
+ * API/tests/ExecutionTimeLimitTest.cpp:
+ (testExecutionTimeLimit):
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::optimizeForARMv7IDIVSupported):
+ (JSC::optimizeForARM64):
+ (JSC::optimizeForX86):
+ * assembler/LinkBuffer.cpp:
+ (JSC::shouldDumpDisassemblyFor):
+ (JSC::LinkBuffer::finalizeCodeWithoutDisassembly):
+ (JSC::shouldShowDisassemblyFor): Deleted.
+ * assembler/LinkBuffer.h:
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::jettison):
+ * bytecode/CodeBlockJettisoningWatchpoint.cpp:
+ (JSC::CodeBlockJettisoningWatchpoint::fireInternal):
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ * dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp:
+ (JSC::DFG::AdaptiveInferredPropertyValueWatchpoint::fire):
+ * dfg/DFGAdaptiveStructureWatchpoint.cpp:
+ (JSC::DFG::AdaptiveStructureWatchpoint::fireInternal):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleInlining):
+ (JSC::DFG::ByteCodeParser::handleGetById):
+ (JSC::DFG::ByteCodeParser::handlePutById):
+ (JSC::DFG::ByteCodeParser::parse):
+ * dfg/DFGCommon.h:
+ (JSC::DFG::leastUpperBound):
+ (JSC::DFG::shouldDumpDisassembly):
+ (JSC::DFG::shouldShowDisassembly): Deleted.
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::JITCompiler):
+ (JSC::DFG::JITCompiler::disassemble):
+ * dfg/DFGJumpReplacement.cpp:
+ (JSC::DFG::JumpReplacement::fire):
+ * dfg/DFGOSREntry.cpp:
+ (JSC::DFG::prepareOSREntry):
+ * dfg/DFGOSRExitCompiler.cpp:
+ * dfg/DFGOSRExitFuzz.h:
+ (JSC::DFG::doOSRExitFuzzing):
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThreadImpl):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileArithSqrt):
+ * dfg/DFGTierUpCheckInjectionPhase.cpp:
+ (JSC::DFG::TierUpCheckInjectionPhase::run):
+ * ftl/FTLCompile.cpp:
+ (JSC::FTL::mmAllocateDataSection):
+ * ftl/FTLJITCode.cpp:
+ (JSC::FTL::JITCode::~JITCode):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
+ * ftl/FTLOSRExitCompiler.cpp:
+ (JSC::FTL::compileStub):
+ (JSC::FTL::compileFTLOSRExit):
+ * ftl/FTLState.h:
+ (JSC::FTL::verboseCompilationEnabled):
+ (JSC::FTL::shouldDumpDisassembly):
+ (JSC::FTL::shouldShowDisassembly): Deleted.
+ * heap/Heap.cpp:
+ (JSC::Heap::addToRememberedSet):
+ (JSC::Heap::didFinishCollection):
+ (JSC::Heap::shouldDoFullCollection):
+ * heap/Heap.h:
+ (JSC::Heap::isDeferred):
+ (JSC::Heap::structureIDTable):
+ * heap/HeapStatistics.cpp:
+ (JSC::StorageStatistics::storageCapacity):
+ (JSC::HeapStatistics::dumpObjectStatistics):
+ (JSC::HeapStatistics::showObjectStatistics): Deleted.
+ * heap/HeapStatistics.h:
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::Frame::createArguments):
+ * jit/AssemblyHelpers.cpp:
+ (JSC::AssemblyHelpers::callExceptionFuzz):
+ * jit/ExecutableAllocationFuzz.cpp:
+ (JSC::doExecutableAllocationFuzzing):
+ * jit/ExecutableAllocationFuzz.h:
+ (JSC::doExecutableAllocationFuzzingIfEnabled):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompile):
+ * jit/JITCode.cpp:
+ (JSC::JITCodeWithCodeRef::~JITCodeWithCodeRef):
+ * jit/PolymorphicCallStubRoutine.cpp:
+ (JSC::PolymorphicCallNode::unlink):
+ (JSC::PolymorphicCallNode::clearCallLinkInfo):
+ (JSC::PolymorphicCallStubRoutine::PolymorphicCallStubRoutine):
+ * jit/Repatch.cpp:
+ (JSC::linkFor):
+ (JSC::unlinkFor):
+ (JSC::linkVirtualFor):
+ * jsc.cpp:
+ (functionEnableExceptionFuzz):
+ (jscmain):
+ * llvm/InitializeLLVM.cpp:
+ (JSC::initializeLLVMImpl):
+ * runtime/ExceptionFuzz.cpp:
+ (JSC::doExceptionFuzzing):
+ * runtime/ExceptionFuzz.h:
+ (JSC::doExceptionFuzzingIfEnabled):
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ (JSC::Options::initialize):
+ (JSC::Options::dumpOptionsIfNeeded):
+ (JSC::Options::setOption):
+ (JSC::Options::dumpAllOptions):
+ (JSC::Options::dumpAllOptionsInALine):
+ (JSC::Options::dumpOption):
+ * runtime/Options.h:
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+ (JSC::VM::exceptionFuzzingBuffer):
+ * runtime/WriteBarrierInlines.h:
+ (JSC::WriteBarrierBase<T>::set):
+ (JSC::WriteBarrierBase<Unknown>::set):
+ * tests/executableAllocationFuzz.yaml:
+ * tests/stress/arrowfunction-typeof.js:
+ * tests/stress/disable-function-dot-arguments.js:
+ (foo):
+ * tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js:
+ (sqrtOnInteger):
+ * tests/stress/regress-148564.js:
+
+2015-10-14 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Speculative build fix: the CallSiteIndex constructor is explicit and requires an uint32_t.
</span><span class="cx">
</span><span class="cx"> Not Reviewed.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -69,17 +69,17 @@
</span><span class="cx">
</span><span class="cx"> inline bool optimizeForARMv7IDIVSupported()
</span><span class="cx"> {
</span><del>- return isARMv7IDIVSupported() && Options::enableArchitectureSpecificOptimizations();
</del><ins>+ return isARMv7IDIVSupported() && Options::useArchitectureSpecificOptimizations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool optimizeForARM64()
</span><span class="cx"> {
</span><del>- return isARM64() && Options::enableArchitectureSpecificOptimizations();
</del><ins>+ return isARM64() && Options::useArchitectureSpecificOptimizations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool optimizeForX86()
</span><span class="cx"> {
</span><del>- return isX86() && Options::enableArchitectureSpecificOptimizations();
</del><ins>+ return isX86() && Options::useArchitectureSpecificOptimizations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class LinkBuffer;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerLinkBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/assembler/LinkBuffer.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-bool shouldShowDisassemblyFor(CodeBlock* codeBlock)
</del><ins>+bool shouldDumpDisassemblyFor(CodeBlock* codeBlock)
</ins><span class="cx"> {
</span><del>- if (JITCode::isOptimizingJIT(codeBlock->jitType()) && Options::showDFGDisassembly())
</del><ins>+ if (JITCode::isOptimizingJIT(codeBlock->jitType()) && Options::dumpDFGDisassembly())
</ins><span class="cx"> return true;
</span><del>- return Options::showDisassembly();
</del><ins>+ return Options::dumpDisassembly();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LinkBuffer::CodeRef LinkBuffer::finalizeCodeWithoutDisassembly()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerLinkBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/LinkBuffer.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/LinkBuffer.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/assembler/LinkBuffer.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -325,10 +325,10 @@
</span><span class="cx"> ? ((linkBufferReference).finalizeCodeWithDisassembly dataLogFArgumentsForHeading) \
</span><span class="cx"> : (linkBufferReference).finalizeCodeWithoutDisassembly())
</span><span class="cx">
</span><del>-bool shouldShowDisassemblyFor(CodeBlock*);
</del><ins>+bool shouldDumpDisassemblyFor(CodeBlock*);
</ins><span class="cx">
</span><span class="cx"> #define FINALIZE_CODE_FOR(codeBlock, linkBufferReference, dataLogFArgumentsForHeading) \
</span><del>- FINALIZE_CODE_IF(shouldShowDisassemblyFor(codeBlock) || Options::asyncDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</del><ins>+ FINALIZE_CODE_IF(shouldDumpDisassemblyFor(codeBlock) || Options::asyncDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</ins><span class="cx">
</span><span class="cx"> // Use this to finalize code, like so:
</span><span class="cx"> //
</span><span class="lines">@@ -343,14 +343,14 @@
</span><span class="cx"> //
</span><span class="cx"> // ... and so on.
</span><span class="cx"> //
</span><del>-// Note that the dataLogFArgumentsForHeading are only evaluated when showDisassembly
</del><ins>+// Note that the dataLogFArgumentsForHeading are only evaluated when dumpDisassembly
</ins><span class="cx"> // is true, so you can hide expensive disassembly-only computations inside there.
</span><span class="cx">
</span><span class="cx"> #define FINALIZE_CODE(linkBufferReference, dataLogFArgumentsForHeading) \
</span><del>- FINALIZE_CODE_IF(JSC::Options::asyncDisassembly() || JSC::Options::showDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</del><ins>+ FINALIZE_CODE_IF(JSC::Options::asyncDisassembly() || JSC::Options::dumpDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</ins><span class="cx">
</span><span class="cx"> #define FINALIZE_DFG_CODE(linkBufferReference, dataLogFArgumentsForHeading) \
</span><del>- FINALIZE_CODE_IF(JSC::Options::asyncDisassembly() || JSC::Options::showDisassembly() || Options::showDFGDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</del><ins>+ FINALIZE_CODE_IF(JSC::Options::asyncDisassembly() || JSC::Options::dumpDisassembly() || Options::dumpDFGDisassembly(), linkBufferReference, dataLogFArgumentsForHeading)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -3142,7 +3142,7 @@
</span><span class="cx"> RELEASE_ASSERT(reason != Profiler::NotJettisoned);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- if (DFG::shouldShowDisassembly()) {
</del><ins>+ if (DFG::shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog("Jettisoning ", *this);
</span><span class="cx"> if (mode == CountReoptimization)
</span><span class="cx"> dataLog(" and counting reoptimization");
</span><span class="lines">@@ -3153,7 +3153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (reason == Profiler::JettisonDueToWeakReference) {
</span><del>- if (DFG::shouldShowDisassembly()) {
</del><ins>+ if (DFG::shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog(*this, " will be jettisoned because of the following dead references:\n");
</span><span class="cx"> DFG::CommonData* dfgCommon = m_jitCode->dfgCommon();
</span><span class="cx"> for (unsigned i = 0; i < dfgCommon->transitions.size(); ++i) {
</span><span class="lines">@@ -3195,7 +3195,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (DFG::shouldShowDisassembly())
</del><ins>+ if (DFG::shouldDumpDisassembly())
</ins><span class="cx"> dataLog(" Did invalidate ", *this, "\n");
</span><span class="cx">
</span><span class="cx"> // Count the reoptimization if that's what the user wanted.
</span><span class="lines">@@ -3203,7 +3203,7 @@
</span><span class="cx"> // FIXME: Maybe this should call alternative().
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=123677
</span><span class="cx"> baselineAlternative()->countReoptimization();
</span><del>- if (DFG::shouldShowDisassembly())
</del><ins>+ if (DFG::shouldDumpDisassembly())
</ins><span class="cx"> dataLog(" Did count reoptimization for ", *this, "\n");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3225,7 +3225,7 @@
</span><span class="cx"> m_globalObject->vm(), alternative(), codeType(), specializationKind());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- if (DFG::shouldShowDisassembly())
</del><ins>+ if (DFG::shouldDumpDisassembly())
</ins><span class="cx"> dataLog(" Did install baseline version of ", *this, "\n");
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockJettisoningWatchpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> void CodeBlockJettisoningWatchpoint::fireInternal(const FireDetail& detail)
</span><span class="cx"> {
</span><del>- if (DFG::shouldShowDisassembly())
</del><ins>+ if (DFG::shouldDumpDisassembly())
</ins><span class="cx"> dataLog("Firing watchpoint ", RawPointer(this), " on ", *m_codeBlock, "\n");
</span><span class="cx">
</span><span class="cx"> m_codeBlock->jettison(Profiler::JettisonDueToUnprofiledWatchpoint, CountReoptimization, &detail);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> // op_will_call / op_did_call pairs before and after a call, which are not
</span><span class="cx"> // compatible with tail calls (we have no way of emitting op_did_call).
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=148819
</span><del>- , m_inTailPosition(Options::enableTailCalls() && constructorKind() == ConstructorKind::None && isStrictMode() && !m_shouldEmitProfileHooks)
</del><ins>+ , m_inTailPosition(Options::useTailCalls() && constructorKind() == ConstructorKind::None && isStrictMode() && !m_shouldEmitProfileHooks)
</ins><span class="cx"> {
</span><span class="cx"> for (auto& constantRegister : m_linkTimeConstantRegisters)
</span><span class="cx"> constantRegister = nullptr;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAdaptiveInferredPropertyValueWatchpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGAdaptiveInferredPropertyValueWatchpoint.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (DFG::shouldShowDisassembly()) {
</del><ins>+ if (DFG::shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog(
</span><span class="cx"> "Firing watchpoint ", RawPointer(this), " (", m_key, ") on ", *m_codeBlock, "\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAdaptiveStructureWatchpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGAdaptiveStructureWatchpoint.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (DFG::shouldShowDisassembly()) {
</del><ins>+ if (DFG::shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog(
</span><span class="cx"> "Firing watchpoint ", RawPointer(this), " (", m_key, ") on ", *m_codeBlock, "\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1763,7 +1763,7 @@
</span><span class="cx"> // the DFG. And by polyvariant profiling we mean polyvariant profiling of *this* call. Note that
</span><span class="cx"> // we could improve that aspect of this by doing polymorphic inlining but having the profiling
</span><span class="cx"> // also.
</span><del>- if (!isFTL(m_graph.m_plan.mode) || !Options::enablePolymorphicCallInlining()
</del><ins>+ if (!isFTL(m_graph.m_plan.mode) || !Options::usePolymorphicCallInlining()
</ins><span class="cx"> || InlineCallFrame::isVarargs(kind)) {
</span><span class="cx"> if (verbose) {
</span><span class="cx"> dataLog("Bailing inlining (hard).\n");
</span><span class="lines">@@ -2743,7 +2743,7 @@
</span><span class="cx"> {
</span><span class="cx"> NodeType getById = getByIdStatus.makesCalls() ? GetByIdFlush : GetById;
</span><span class="cx">
</span><del>- if (!getByIdStatus.isSimple() || !getByIdStatus.numVariants() || !Options::enableAccessInlining()) {
</del><ins>+ if (!getByIdStatus.isSimple() || !getByIdStatus.numVariants() || !Options::useAccessInlining()) {
</ins><span class="cx"> set(VirtualRegister(destinationOperand),
</span><span class="cx"> addToGraph(getById, OpInfo(identifierNumber), OpInfo(prediction), base));
</span><span class="cx"> return;
</span><span class="lines">@@ -2751,7 +2751,7 @@
</span><span class="cx">
</span><span class="cx"> if (getByIdStatus.numVariants() > 1) {
</span><span class="cx"> if (getByIdStatus.makesCalls() || !isFTL(m_graph.m_plan.mode)
</span><del>- || !Options::enablePolymorphicAccessInlining()) {
</del><ins>+ || !Options::usePolymorphicAccessInlining()) {
</ins><span class="cx"> set(VirtualRegister(destinationOperand),
</span><span class="cx"> addToGraph(getById, OpInfo(identifierNumber), OpInfo(prediction), base));
</span><span class="cx"> return;
</span><span class="lines">@@ -2866,7 +2866,7 @@
</span><span class="cx"> Node* base, unsigned identifierNumber, Node* value,
</span><span class="cx"> const PutByIdStatus& putByIdStatus, bool isDirect)
</span><span class="cx"> {
</span><del>- if (!putByIdStatus.isSimple() || !putByIdStatus.numVariants() || !Options::enableAccessInlining()) {
</del><ins>+ if (!putByIdStatus.isSimple() || !putByIdStatus.numVariants() || !Options::useAccessInlining()) {
</ins><span class="cx"> if (!putByIdStatus.isSet())
</span><span class="cx"> addToGraph(ForceOSRExit);
</span><span class="cx"> emitPutById(base, identifierNumber, value, putByIdStatus, isDirect);
</span><span class="lines">@@ -2875,7 +2875,7 @@
</span><span class="cx">
</span><span class="cx"> if (putByIdStatus.numVariants() > 1) {
</span><span class="cx"> if (!isFTL(m_graph.m_plan.mode) || putByIdStatus.makesCalls()
</span><del>- || !Options::enablePolymorphicAccessInlining()) {
</del><ins>+ || !Options::usePolymorphicAccessInlining()) {
</ins><span class="cx"> emitPutById(base, identifierNumber, value, putByIdStatus, isDirect);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -4830,10 +4830,10 @@
</span><span class="cx">
</span><span class="cx"> m_dfgCodeBlock = m_graph.m_plan.profiledDFGCodeBlock;
</span><span class="cx"> if (isFTL(m_graph.m_plan.mode) && m_dfgCodeBlock
</span><del>- && Options::enablePolyvariantDevirtualization()) {
- if (Options::enablePolyvariantCallInlining())
</del><ins>+ && Options::usePolyvariantDevirtualization()) {
+ if (Options::usePolyvariantCallInlining())
</ins><span class="cx"> CallLinkStatus::computeDFGStatuses(m_dfgCodeBlock, m_callContextMap);
</span><del>- if (Options::enablePolyvariantByIdInlining())
</del><ins>+ if (Options::usePolyvariantByIdInlining())
</ins><span class="cx"> m_dfgCodeBlock->getStubInfoMap(m_dfgStubInfos);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommon.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommon.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -366,10 +366,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Unconditionally disable DFG disassembly support if the DFG is not compiled in.
</span><del>-inline bool shouldShowDisassembly(CompilationMode mode = DFGMode)
</del><ins>+inline bool shouldDumpDisassembly(CompilationMode mode = DFGMode)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- return Options::showDisassembly() || Options::showDFGDisassembly() || (isFTL(mode) && Options::showFTLDisassembly());
</del><ins>+ return Options::dumpDisassembly() || Options::dumpDFGDisassembly() || (isFTL(mode) && Options::dumpFTLDisassembly());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(mode);
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDrivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> new Plan(codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
</span><span class="cx">
</span><span class="cx"> plan->callback = callback;
</span><del>- if (Options::enableConcurrentJIT()) {
</del><ins>+ if (Options::useConcurrentJIT()) {
</ins><span class="cx"> Worklist* worklist = ensureGlobalWorklistFor(mode);
</span><span class="cx"> if (logCompilationChanges(mode))
</span><span class="cx"> dataLog("Deferring DFG compilation of ", *codeBlock, " with queue length ", worklist->queueLength(), ".\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> , m_jitCode(adoptRef(new JITCode()))
</span><span class="cx"> , m_blockHeads(dfg.numBlocks())
</span><span class="cx"> {
</span><del>- if (shouldShowDisassembly() || m_graph.m_vm.m_perBytecodeProfiler)
</del><ins>+ if (shouldDumpDisassembly() || m_graph.m_vm.m_perBytecodeProfiler)
</ins><span class="cx"> m_disassembler = std::make_unique<Disassembler>(dfg);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx">
</span><span class="cx"> void JITCompiler::disassemble(LinkBuffer& linkBuffer)
</span><span class="cx"> {
</span><del>- if (shouldShowDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly()) {
</ins><span class="cx"> m_disassembler->dump(linkBuffer);
</span><span class="cx"> linkBuffer.didAlreadyDisassemble();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGJumpReplacementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGJumpReplacement.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGJumpReplacement.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGJumpReplacement.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> void JumpReplacement::fire()
</span><span class="cx"> {
</span><del>- if (Options::showDisassembly())
</del><ins>+ if (Options::dumpDisassembly())
</ins><span class="cx"> dataLogF("Firing jump replacement watchpoint from %p, to %p.\n", m_source.dataLocation(), m_destination.dataLocation());
</span><span class="cx"> MacroAssembler::replaceWithJump(m_source, m_destination);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSREntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSREntry.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> ASSERT(codeBlock->alternative()->jitType() == JITCode::BaselineJIT);
</span><span class="cx"> ASSERT(!codeBlock->jitCodeMap());
</span><span class="cx">
</span><del>- if (!Options::enableOSREntryToDFG())
</del><ins>+ if (!Options::useOSREntryToDFG())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (Options::verboseOSR()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> LinkBuffer patchBuffer(*vm, jit, codeBlock);
</span><span class="cx"> exit.m_code = FINALIZE_CODE_IF(
</span><del>- shouldShowDisassembly() || Options::verboseOSR(),
</del><ins>+ shouldDumpDisassembly() || Options::verboseOSR(),
</ins><span class="cx"> patchBuffer,
</span><span class="cx"> ("DFG OSR exit #%u (%s, %s) from %s, with operands = %s",
</span><span class="cx"> exitIndex, toCString(exit.m_codeOrigin).data(),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitFuzzh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitFuzz.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitFuzz.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitFuzz.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool doOSRExitFuzzing()
</span><span class="cx"> {
</span><del>- if (!Options::enableOSRExitFuzz())
</del><ins>+ if (!Options::useOSRExitFuzz())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> g_numberOfStaticOSRExitFuzzChecks++;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> performLiveCatchVariablePreservationPhase(dfg);
</span><span class="cx">
</span><del>- if (Options::enableMaximalFlushInsertionPhase())
</del><ins>+ if (Options::useMaximalFlushInsertionPhase())
</ins><span class="cx"> performMaximalFlushInsertion(dfg);
</span><span class="cx">
</span><span class="cx"> performCPSRethreading(dfg);
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> performCleanUp(dfg);
</span><span class="cx"> performCPSRethreading(dfg);
</span><span class="cx"> performDCE(dfg);
</span><del>- if (Options::enableCopyBarrierOptimization())
</del><ins>+ if (Options::useCopyBarrierOptimization())
</ins><span class="cx"> performCopyBarrierOptimization(dfg);
</span><span class="cx"> performPhantomInsertion(dfg);
</span><span class="cx"> performStackLayout(dfg);
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> performCleanUp(dfg); // Reduce the graph size a lot.
</span><span class="cx"> changed = false;
</span><span class="cx"> changed |= performStrengthReduction(dfg);
</span><del>- if (Options::enableObjectAllocationSinking()) {
</del><ins>+ if (Options::useObjectAllocationSinking()) {
</ins><span class="cx"> changed |= performCriticalEdgeBreaking(dfg);
</span><span class="cx"> changed |= performObjectAllocationSinking(dfg);
</span><span class="cx"> }
</span><span class="lines">@@ -436,11 +436,11 @@
</span><span class="cx"> performLivenessAnalysis(dfg);
</span><span class="cx"> performCFA(dfg);
</span><span class="cx"> performGlobalStoreBarrierInsertion(dfg);
</span><del>- if (Options::enableMovHintRemoval())
</del><ins>+ if (Options::useMovHintRemoval())
</ins><span class="cx"> performMovHintRemoval(dfg);
</span><span class="cx"> performCleanUp(dfg);
</span><span class="cx"> performDCE(dfg); // We rely on this to kill dead code that won't be recognized as dead by LLVM.
</span><del>- if (Options::enableCopyBarrierOptimization())
</del><ins>+ if (Options::useCopyBarrierOptimization())
</ins><span class="cx"> performCopyBarrierOptimization(dfg);
</span><span class="cx"> performStackLayout(dfg);
</span><span class="cx"> performLivenessAnalysis(dfg);
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx"> return FailPath;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- dumpAndVerifyGraph(dfg, "Graph just before FTL lowering:", shouldShowDisassembly(mode));
</del><ins>+ dumpAndVerifyGraph(dfg, "Graph just before FTL lowering:", shouldDumpDisassembly(mode));
</ins><span class="cx">
</span><span class="cx"> bool haveLLVM;
</span><span class="cx"> Safepoint::Result safepointResult;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -3734,7 +3734,7 @@
</span><span class="cx"> SpeculateDoubleOperand op1(this, node->child1());
</span><span class="cx"> FPRReg op1FPR = op1.fpr();
</span><span class="cx">
</span><del>- if (!MacroAssembler::supportsFloatingPointSqrt() || !Options::enableArchitectureSpecificOptimizations()) {
</del><ins>+ if (!MacroAssembler::supportsFloatingPointSqrt() || !Options::useArchitectureSpecificOptimizations()) {
</ins><span class="cx"> flushRegisters();
</span><span class="cx"> FPRResult result(this);
</span><span class="cx"> callOperation(sqrt, result.fpr(), op1FPR);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGTierUpCheckInjectionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> if (level == FTL::CannotCompile)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!Options::enableOSREntryToFTL())
</del><ins>+ if (!Options::useOSREntryToFTL())
</ins><span class="cx"> level = FTL::CanCompile;
</span><span class="cx">
</span><span class="cx"> // First we find all the loops that contain a LoopHint for which we cannot OSR enter.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -844,7 +844,7 @@
</span><span class="cx"> llvm->RunPassManager(modulePasses, module);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (shouldShowDisassembly() || verboseCompilationEnabled())
</del><ins>+ if (shouldDumpDisassembly() || verboseCompilationEnabled())
</ins><span class="cx"> state.dumpState(module, "after optimization");
</span><span class="cx">
</span><span class="cx"> // FIXME: Need to add support for the case where JIT memory allocation failed.
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> if (state.allocationFailed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (shouldShowDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly()) {
</ins><span class="cx"> for (unsigned i = 0; i < state.jitCode->handles().size(); ++i) {
</span><span class="cx"> ExecutableMemoryHandle* handle = state.jitCode->handles()[i].get();
</span><span class="cx"> dataLog(
</span><span class="lines">@@ -888,14 +888,14 @@
</span><span class="cx"> std::unique_ptr<RegisterAtOffsetList> registerOffsets = parseUnwindInfo(
</span><span class="cx"> state.unwindDataSection, state.unwindDataSectionSize,
</span><span class="cx"> state.generatedFunction);
</span><del>- if (shouldShowDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog("Unwind info for ", CodeBlockWithJITType(state.graph.m_codeBlock, JITCode::FTLJIT), ":\n");
</span><span class="cx"> dataLog(" ", *registerOffsets, "\n");
</span><span class="cx"> }
</span><span class="cx"> state.graph.m_codeBlock->setCalleeSaveRegisters(WTF::move(registerOffsets));
</span><span class="cx">
</span><span class="cx"> if (state.stackmapsSection && state.stackmapsSection->size()) {
</span><del>- if (shouldShowDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog(
</span><span class="cx"> "Generated LLVM stackmaps section for ",
</span><span class="cx"> CodeBlockWithJITType(state.graph.m_codeBlock, JITCode::FTLJIT), ":\n");
</span><span class="lines">@@ -907,7 +907,7 @@
</span><span class="cx"> ArrayBuffer::create(state.stackmapsSection->base(), state.stackmapsSection->size()));
</span><span class="cx"> state.jitCode->stackmaps.parse(stackmapsData.get());
</span><span class="cx">
</span><del>- if (shouldShowDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog(" Structured data:\n");
</span><span class="cx"> state.jitCode->stackmaps.dumpMultiline(WTF::dataFile(), " ");
</span><span class="cx"> }
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx"> if (state.allocationFailed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (shouldShowDisassembly() || Options::asyncDisassembly()) {
</del><ins>+ if (shouldDumpDisassembly() || Options::asyncDisassembly()) {
</ins><span class="cx"> for (unsigned i = 0; i < state.jitCode->handles().size(); ++i) {
</span><span class="cx"> if (state.codeSectionNames[i] != SECTION_NAME("text"))
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ftl/FTLJITCode.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> JITCode::~JITCode()
</span><span class="cx"> {
</span><del>- if (FTL::shouldShowDisassembly()) {
</del><ins>+ if (FTL::shouldDumpDisassembly()) {
</ins><span class="cx"> dataLog("Destroying FTL JIT code at ");
</span><span class="cx"> CommaPrinter comma;
</span><span class="cx"> for (auto& handle : m_handles)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -8623,7 +8623,7 @@
</span><span class="cx">
</span><span class="cx"> void callCheck()
</span><span class="cx"> {
</span><del>- if (Options::enableExceptionFuzz())
</del><ins>+ if (Options::useExceptionFuzz())
</ins><span class="cx"> m_out.call(m_out.operation(operationExceptionFuzz), m_callFrame);
</span><span class="cx">
</span><span class="cx"> LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("Exception check continuation"));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx">
</span><span class="cx"> LinkBuffer patchBuffer(*vm, jit, codeBlock);
</span><span class="cx"> exit.m_code = FINALIZE_CODE_IF(
</span><del>- shouldShowDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit(),
</del><ins>+ shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit(),
</ins><span class="cx"> patchBuffer,
</span><span class="cx"> ("FTL OSR exit #%u (%s, %s) from %s, with operands = %s, and record = %s",
</span><span class="cx"> exitID, toCString(exit.m_codeOrigin).data(),
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> {
</span><span class="cx"> SamplingRegion samplingRegion("FTL OSR Exit Compilation");
</span><span class="cx">
</span><del>- if (shouldShowDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit())
</del><ins>+ if (shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit())
</ins><span class="cx"> dataLog("Compiling OSR exit with exitID = ", exitID, "\n");
</span><span class="cx">
</span><span class="cx"> CodeBlock* codeBlock = exec->codeBlock();
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> JITCode* jitCode = codeBlock->jitCode()->ftl();
</span><span class="cx"> OSRExit& exit = jitCode->osrExit[exitID];
</span><span class="cx">
</span><del>- if (shouldShowDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit()) {
</del><ins>+ if (shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit()) {
</ins><span class="cx"> dataLog(" Owning block: ", pointerDump(codeBlock), "\n");
</span><span class="cx"> dataLog(" Origin: ", exit.m_codeOrigin, "\n");
</span><span class="cx"> if (exit.m_codeOriginForExitProfile != exit.m_codeOrigin)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLState.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLState.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/ftl/FTLState.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> return DFG::verboseCompilationEnabled(DFG::FTLMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool shouldShowDisassembly()
</del><ins>+inline bool shouldDumpDisassembly()
</ins><span class="cx"> {
</span><del>- return DFG::shouldShowDisassembly(DFG::FTLMode);
</del><ins>+ return DFG::shouldDumpDisassembly(DFG::FTLMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class State {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> void Heap::addToRememberedSet(const JSCell* cell)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell);
</span><del>- ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> ASSERT(cell->cellState() == CellState::OldBlack);
</span><span class="cx"> // Indicate that this object is grey and that it's one of the following:
</span><span class="cx"> // - A re-greyed object during a concurrent collection.
</span><span class="lines">@@ -1317,11 +1317,11 @@
</span><span class="cx"> if (Options::useZombieMode())
</span><span class="cx"> zombifyDeadObjects();
</span><span class="cx">
</span><del>- if (Options::objectsAreImmortal())
</del><ins>+ if (Options::useImmortalObjects())
</ins><span class="cx"> markDeadObjects();
</span><span class="cx">
</span><del>- if (Options::showObjectStatistics())
- HeapStatistics::showObjectStatistics(this);
</del><ins>+ if (Options::dumpObjectStatistics())
+ HeapStatistics::dumpObjectStatistics(this);
</ins><span class="cx">
</span><span class="cx"> if (Options::logGC() == GCLogging::Verbose)
</span><span class="cx"> GCLogging::dumpObjectGraph(this);
</span><span class="lines">@@ -1479,7 +1479,7 @@
</span><span class="cx">
</span><span class="cx"> bool Heap::shouldDoFullCollection(HeapOperation requestedCollectionType) const
</span><span class="cx"> {
</span><del>- if (Options::alwaysDoFullCollection())
</del><ins>+ if (!Options::useGenerationalGC())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> switch (requestedCollectionType) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx">
</span><span class="cx"> void addReference(JSCell*, ArrayBuffer*);
</span><span class="cx">
</span><del>- bool isDeferred() const { return !!m_deferralDepth || Options::disableGC(); }
</del><ins>+ bool isDeferred() const { return !!m_deferralDepth || !Options::useGC(); }
</ins><span class="cx">
</span><span class="cx"> StructureIDTable& structureIDTable() { return m_structureIDTable; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapStatisticscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/heap/HeapStatistics.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> return m_storageCapacity;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HeapStatistics::showObjectStatistics(Heap* heap)
</del><ins>+void HeapStatistics::dumpObjectStatistics(Heap* heap)
</ins><span class="cx"> {
</span><span class="cx"> dataLogF("\n=== Heap Statistics: ===\n");
</span><span class="cx"> dataLogF("size: %ldkB\n", static_cast<long>(heap->m_sizeAfterLastCollect / KB));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapStatistics.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapStatistics.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/heap/HeapStatistics.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> static void initialize();
</span><span class="cx"> static void recordGCPauseTime(double start, double end);
</span><span class="cx">
</span><del>- static void showObjectStatistics(Heap*);
</del><ins>+ static void dumpObjectStatistics(Heap*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void logStatistics();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> CallFrame* physicalFrame = m_callFrame;
</span><span class="cx"> ClonedArguments* arguments;
</span><span class="cx"> ArgumentsMode mode;
</span><del>- if (Options::enableFunctionDotArguments())
</del><ins>+ if (Options::useFunctionDotArguments())
</ins><span class="cx"> mode = ArgumentsMode::Cloned;
</span><span class="cx"> else
</span><span class="cx"> mode = ArgumentsMode::FakeValues;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> void AssemblyHelpers::callExceptionFuzz()
</span><span class="cx"> {
</span><del>- if (!Options::enableExceptionFuzz())
</del><ins>+ if (!Options::useExceptionFuzz())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> EncodedJSValue* buffer = vm()->exceptionFuzzingBuffer(sizeof(EncodedJSValue) * (GPRInfo::numberOfRegisters + FPRInfo::numberOfRegisters));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocationFuzzcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> ExecutableAllocationFuzzResult doExecutableAllocationFuzzing()
</span><span class="cx"> {
</span><del>- ASSERT(Options::enableExecutableAllocationFuzz());
</del><ins>+ ASSERT(Options::useExecutableAllocationFuzz());
</ins><span class="cx">
</span><span class="cx"> unsigned oldValue;
</span><span class="cx"> unsigned newValue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitExecutableAllocationFuzzh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/ExecutableAllocationFuzz.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> inline ExecutableAllocationFuzzResult doExecutableAllocationFuzzingIfEnabled()
</span><span class="cx"> {
</span><del>- if (LIKELY(!Options::enableExecutableAllocationFuzz()))
</del><ins>+ if (LIKELY(!Options::useExecutableAllocationFuzz()))
</ins><span class="cx"> return AllowNormalExecutableAllocation;
</span><span class="cx">
</span><span class="cx"> return doExecutableAllocationFuzzing();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> if (m_vm->typeProfiler())
</span><span class="cx"> m_vm->typeProfilerLog()->processLogEntries(ASCIILiteral("Preparing for JIT compilation."));
</span><span class="cx">
</span><del>- if (Options::showDisassembly() || m_vm->m_perBytecodeProfiler)
</del><ins>+ if (Options::dumpDisassembly() || m_vm->m_perBytecodeProfiler)
</ins><span class="cx"> m_disassembler = std::make_unique<JITDisassembler>(m_codeBlock);
</span><span class="cx"> if (m_vm->m_perBytecodeProfiler) {
</span><span class="cx"> m_compilation = adoptRef(
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> if (m_codeBlock->codeType() == FunctionCode)
</span><span class="cx"> withArityCheck = patchBuffer.locationOf(arityCheck);
</span><span class="cx">
</span><del>- if (Options::showDisassembly()) {
</del><ins>+ if (Options::dumpDisassembly()) {
</ins><span class="cx"> m_disassembler->dump(patchBuffer);
</span><span class="cx"> patchBuffer.didAlreadyDisassemble();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITCodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITCode.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITCode.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/JITCode.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> JITCodeWithCodeRef::~JITCodeWithCodeRef()
</span><span class="cx"> {
</span><del>- if ((Options::showDisassembly() || (isOptimizingJIT(jitType()) && Options::showDFGDisassembly()))
</del><ins>+ if ((Options::dumpDisassembly() || (isOptimizingJIT(jitType()) && Options::dumpDFGDisassembly()))
</ins><span class="cx"> && m_ref.executableMemory())
</span><span class="cx"> dataLog("Destroying JIT code at ", pointerDump(m_ref.executableMemory()), "\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitPolymorphicCallStubRoutinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/PolymorphicCallStubRoutine.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> void PolymorphicCallNode::unlink(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> if (m_callLinkInfo) {
</span><del>- if (Options::showDisassembly())
</del><ins>+ if (Options::dumpDisassembly())
</ins><span class="cx"> dataLog("Unlinking polymorphic call at ", m_callLinkInfo->callReturnLocation(), ", ", m_callLinkInfo->codeOrigin(), "\n");
</span><span class="cx">
</span><span class="cx"> m_callLinkInfo->unlink(vm);
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> void PolymorphicCallNode::clearCallLinkInfo()
</span><span class="cx"> {
</span><del>- if (Options::showDisassembly())
</del><ins>+ if (Options::dumpDisassembly())
</ins><span class="cx"> dataLog("Clearing call link info for polymorphic call at ", m_callLinkInfo->callReturnLocation(), ", ", m_callLinkInfo->codeOrigin(), "\n");
</span><span class="cx">
</span><span class="cx"> m_callLinkInfo = nullptr;
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (PolymorphicCallCase callCase : cases) {
</span><span class="cx"> m_variants.append(WriteBarrier<JSCell>(vm, owner, callCase.variant().rawCalleeCell()));
</span><del>- if (shouldShowDisassemblyFor(callerFrame->codeBlock()))
</del><ins>+ if (shouldDumpDisassemblyFor(callerFrame->codeBlock()))
</ins><span class="cx"> dataLog("Linking polymorphic call in ", *callerFrame->codeBlock(), " at ", callerFrame->codeOrigin(), " to ", callCase.variant(), ", codeBlock = ", pointerDump(callCase.codeBlock()), "\n");
</span><span class="cx"> if (CodeBlock* codeBlock = callCase.codeBlock())
</span><span class="cx"> codeBlock->linkIncomingPolymorphicCall(callerFrame, m_callNodes.add(&info));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> ASSERT(!callLinkInfo.isLinked());
</span><span class="cx"> callLinkInfo.setCallee(exec->callerFrame()->vm(), callLinkInfo.hotPathBegin(), callerCodeBlock, callee);
</span><span class="cx"> callLinkInfo.setLastSeenCallee(exec->callerFrame()->vm(), callerCodeBlock, callee);
</span><del>- if (shouldShowDisassemblyFor(callerCodeBlock))
</del><ins>+ if (shouldDumpDisassemblyFor(callerCodeBlock))
</ins><span class="cx"> dataLog("Linking call in ", *callerCodeBlock, " at ", callLinkInfo.codeOrigin(), " to ", pointerDump(calleeCodeBlock), ", entrypoint at ", codePtr, "\n");
</span><span class="cx"> MacroAssembler::repatchNearCall(callLinkInfo.hotPathOther(), CodeLocationLabel(codePtr));
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx">
</span><span class="cx"> void unlinkFor(VM& vm, CallLinkInfo& callLinkInfo)
</span><span class="cx"> {
</span><del>- if (Options::showDisassembly())
</del><ins>+ if (Options::dumpDisassembly())
</ins><span class="cx"> dataLog("Unlinking call from ", callLinkInfo.callReturnLocation(), "\n");
</span><span class="cx">
</span><span class="cx"> revertCall(&vm, callLinkInfo, vm.getCTIStub(linkCallThunkGenerator));
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> CodeBlock* callerCodeBlock = exec->callerFrame()->codeBlock();
</span><span class="cx"> VM* vm = callerCodeBlock->vm();
</span><span class="cx">
</span><del>- if (shouldShowDisassemblyFor(callerCodeBlock))
</del><ins>+ if (shouldDumpDisassemblyFor(callerCodeBlock))
</ins><span class="cx"> dataLog("Linking virtual call at ", *callerCodeBlock, " ", exec->callerFrame()->codeOrigin(), "\n");
</span><span class="cx">
</span><span class="cx"> MacroAssemblerCodeRef virtualThunk = virtualThunkFor(vm, callLinkInfo);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1489,7 +1489,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionEnableExceptionFuzz(ExecState*)
</span><span class="cx"> {
</span><del>- Options::enableExceptionFuzz() = true;
</del><ins>+ Options::useExceptionFuzz() = true;
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1962,13 +1962,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><del>- if (Options::enableExceptionFuzz())
</del><ins>+ if (Options::useExceptionFuzz())
</ins><span class="cx"> printf("JSC EXCEPTION FUZZ: encountered %u checks.\n", numberOfExceptionFuzzChecks());
</span><span class="cx"> bool fireAtEnabled =
</span><span class="cx"> Options::fireExecutableAllocationFuzzAt() || Options::fireExecutableAllocationFuzzAtOrAfter();
</span><del>- if (Options::enableExecutableAllocationFuzz() && (!fireAtEnabled || Options::verboseExecutableAllocationFuzz()))
</del><ins>+ if (Options::useExecutableAllocationFuzz() && (!fireAtEnabled || Options::verboseExecutableAllocationFuzz()))
</ins><span class="cx"> printf("JSC EXECUTABLE ALLOCATION FUZZ: encountered %u checks.\n", numberOfExecutableAllocationFuzzChecks());
</span><del>- if (Options::enableOSRExitFuzz()) {
</del><ins>+ if (Options::useOSRExitFuzz()) {
</ins><span class="cx"> printf("JSC OSR EXIT FUZZ: encountered %u static checks.\n", numberOfStaticOSRExitFuzzChecks());
</span><span class="cx"> printf("JSC OSR EXIT FUZZ: encountered %u dynamic checks.\n", numberOfOSRExitFuzzChecks());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellvmInitializeLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/llvm/InitializeLLVM.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -41,23 +41,23 @@
</span><span class="cx"> {
</span><span class="cx"> const bool verbose =
</span><span class="cx"> Options::verboseFTLCompilation()
</span><del>- || Options::showFTLDisassembly()
</del><ins>+ || Options::dumpFTLDisassembly()
</ins><span class="cx"> || Options::verboseFTLFailure()
</span><span class="cx"> || Options::verboseCompilation()
</span><del>- || Options::showDFGDisassembly()
- || Options::showDisassembly();
</del><ins>+ || Options::dumpDFGDisassembly()
+ || Options::dumpDisassembly();
</ins><span class="cx">
</span><span class="cx"> LLVMInitializerFunction initializer = getLLVMInitializerFunction(verbose);
</span><span class="cx"> if (!initializer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool enableFastISel = Options::enableLLVMFastISel();
</del><ins>+ bool enableFastISel = Options::useLLVMFastISel();
</ins><span class="cx"> llvm = initializer(WTFLogAlwaysAndCrash, &enableFastISel);
</span><span class="cx"> if (!llvm) {
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("LLVM initilization failed.\n");
</span><span class="cx"> }
</span><del>- if (Options::enableLLVMFastISel() && !enableFastISel) {
</del><ins>+ if (Options::useLLVMFastISel() && !enableFastISel) {
</ins><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Fast ISel requested but LLVM not new enough.\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionFuzzcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> // Call this only if you know that exception fuzzing is enabled.
</span><span class="cx"> void doExceptionFuzzing(ExecState* exec, const char* where, void* returnPC)
</span><span class="cx"> {
</span><del>- ASSERT(Options::enableExceptionFuzz());
</del><ins>+ ASSERT(Options::useExceptionFuzz());
</ins><span class="cx">
</span><span class="cx"> DeferGCForAWhile deferGC(exec->vm().heap);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExceptionFuzzh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/ExceptionFuzz.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> // This is what you should call if you don't know if fuzzing is enabled.
</span><span class="cx"> ALWAYS_INLINE void doExceptionFuzzingIfEnabled(ExecState* exec, const char* where, void* returnPC)
</span><span class="cx"> {
</span><del>- if (LIKELY(!Options::enableExceptionFuzz()))
</del><ins>+ if (LIKELY(!Options::useExceptionFuzz()))
</ins><span class="cx"> return;
</span><span class="cx"> doExceptionFuzzing(exec, where, returnPC);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> JSConsole* consoleObject = JSConsole::create(vm, m_consoleStructure.get());
</span><span class="cx"> putDirectWithoutTransition(vm, Identifier::fromString(exec, "console"), consoleObject, DontEnum);
</span><span class="cx">
</span><del>- if (UNLIKELY(Options::enableDollarVM())) {
</del><ins>+ if (UNLIKELY(Options::useDollarVM())) {
</ins><span class="cx"> JSDollarVMPrototype* dollarVMPrototype = JSDollarVMPrototype::create(vm, this, JSDollarVMPrototype::createStructure(vm, this, m_objectPrototype.get()));
</span><span class="cx"> m_dollarVMStructure.set(vm, this, JSDollarVM::createStructure(vm, this, dollarVMPrototype));
</span><span class="cx"> JSDollarVM* dollarVM = JSDollarVM::create(vm, m_dollarVMStructure.get());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> Options::useRegExpJIT() = false;
</span><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(CONCURRENT_JIT)
</span><del>- Options::enableConcurrentJIT() = false;
</del><ins>+ Options::useConcurrentJIT() = false;
</ins><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(DFG_JIT)
</span><span class="cx"> Options::useDFGJIT() = false;
</span><span class="lines">@@ -276,9 +276,9 @@
</span><span class="cx"> if (!MacroAssemblerX86::supportsFloatingPoint())
</span><span class="cx"> Options::useJIT() = false;
</span><span class="cx"> #endif
</span><del>- if (Options::showDisassembly()
- || Options::showDFGDisassembly()
- || Options::showFTLDisassembly()
</del><ins>+ if (Options::dumpDisassembly()
+ || Options::dumpDFGDisassembly()
+ || Options::dumpFTLDisassembly()
</ins><span class="cx"> || Options::dumpBytecodeAtDFGTime()
</span><span class="cx"> || Options::dumpGraphAtEachPhase()
</span><span class="cx"> || Options::verboseCompilation()
</span><span class="lines">@@ -306,11 +306,11 @@
</span><span class="cx"> Options::thresholdForFTLOptimizeAfterWarmUp() = 20;
</span><span class="cx"> Options::thresholdForFTLOptimizeSoon() = 20;
</span><span class="cx"> Options::maximumEvalCacheableSourceLength() = 150000;
</span><del>- Options::enableConcurrentJIT() = false;
</del><ins>+ Options::useConcurrentJIT() = false;
</ins><span class="cx"> }
</span><del>- if (Options::enableMaximalFlushInsertionPhase()) {
- Options::enableOSREntryToDFG() = false;
- Options::enableOSREntryToFTL() = false;
</del><ins>+ if (Options::useMaximalFlushInsertionPhase()) {
+ Options::useOSREntryToDFG() = false;
+ Options::useOSREntryToFTL() = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Compute the maximum value of the reoptimization retry counter. This is simply
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // It *probably* makes sense for other platforms to enable this.
</span><span class="cx"> #if PLATFORM(IOS) && CPU(ARM64)
</span><del>- enableLLVMFastISel() = true;
</del><ins>+ useLLVMFastISel() = true;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Allow environment vars to override options if applicable.
</span><span class="lines">@@ -396,8 +396,8 @@
</span><span class="cx">
</span><span class="cx"> void Options::dumpOptionsIfNeeded()
</span><span class="cx"> {
</span><del>- if (Options::showOptions()) {
- DumpLevel level = static_cast<DumpLevel>(Options::showOptions());
</del><ins>+ if (Options::dumpOptions()) {
+ DumpLevel level = static_cast<DumpLevel>(Options::dumpOptions());
</ins><span class="cx"> if (level > DumpLevel::Verbose)
</span><span class="cx"> level = DumpLevel::Verbose;
</span><span class="cx">
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringBuilder builder;
</span><del>- dumpAllOptions(builder, level, title, nullptr, " ", "\n", ShowDefaults);
</del><ins>+ dumpAllOptions(builder, level, title, nullptr, " ", "\n", DumpDefaults);
</ins><span class="cx"> dataLog(builder.toString());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Options::dumpAllOptions(StringBuilder& builder, DumpLevel level, const char* title,
</span><del>- const char* separator, const char* optionHeader, const char* optionFooter, ShowDefaultsOption showDefaultsOption)
</del><ins>+ const char* separator, const char* optionHeader, const char* optionFooter, DumpDefaultsOption dumpDefaultsOption)
</ins><span class="cx"> {
</span><span class="cx"> if (title) {
</span><span class="cx"> builder.append(title);
</span><span class="lines">@@ -538,24 +538,24 @@
</span><span class="cx"> for (int id = 0; id < numberOfOptions; id++) {
</span><span class="cx"> if (separator && id)
</span><span class="cx"> builder.append(separator);
</span><del>- dumpOption(builder, level, static_cast<OptionID>(id), optionHeader, optionFooter, showDefaultsOption);
</del><ins>+ dumpOption(builder, level, static_cast<OptionID>(id), optionHeader, optionFooter, dumpDefaultsOption);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Options::dumpAllOptionsInALine(StringBuilder& builder)
</span><span class="cx"> {
</span><del>- dumpAllOptions(builder, DumpLevel::All, nullptr, " ", nullptr, nullptr, DontShowDefaults);
</del><ins>+ dumpAllOptions(builder, DumpLevel::All, nullptr, " ", nullptr, nullptr, DontDumpDefaults);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Options::dumpAllOptions(FILE* stream, DumpLevel level, const char* title)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><del>- dumpAllOptions(builder, level, title, nullptr, " ", "\n", ShowDefaults);
</del><ins>+ dumpAllOptions(builder, level, title, nullptr, " ", "\n", DumpDefaults);
</ins><span class="cx"> fprintf(stream, "%s", builder.toString().ascii().data());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Options::dumpOption(StringBuilder& builder, DumpLevel level, OptionID id,
</span><del>- const char* header, const char* footer, ShowDefaultsOption showDefaultsOption)
</del><ins>+ const char* header, const char* footer, DumpDefaultsOption dumpDefaultsOption)
</ins><span class="cx"> {
</span><span class="cx"> if (id >= numberOfOptions)
</span><span class="cx"> return; // Illegal option.
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> builder.append('=');
</span><span class="cx"> option.dump(builder);
</span><span class="cx">
</span><del>- if (wasOverridden && (showDefaultsOption == ShowDefaults)) {
</del><ins>+ if (wasOverridden && (dumpDefaultsOption == DumpDefaults)) {
</ins><span class="cx"> builder.append(" (default: ");
</span><span class="cx"> option.defaultOption().dump(builder);
</span><span class="cx"> builder.append(")");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> typedef const char* optionString;
</span><span class="cx">
</span><span class="cx"> #define JSC_OPTIONS(v) \
</span><del>- v(unsigned, showOptions, 0, "shows JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
</del><ins>+ v(unsigned, dumpOptions, 0, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useLLInt, true, "allows the LLINT to be used if true") \
</span><span class="cx"> v(bool, useJIT, true, "allows the baseline JIT to be used if true") \
</span><span class="lines">@@ -130,15 +130,15 @@
</span><span class="cx"> v(bool, forceDebuggerBytecodeGeneration, false, nullptr) \
</span><span class="cx"> v(bool, forceProfilerBytecodeGeneration, false, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableFunctionDotArguments, true, nullptr) \
- v(bool, enableTailCalls, false, nullptr) \
</del><ins>+ v(bool, useFunctionDotArguments, true, nullptr) \
+ v(bool, useTailCalls, false, nullptr) \
</ins><span class="cx"> \
</span><del>- /* showDisassembly implies showDFGDisassembly. */ \
- v(bool, showDisassembly, false, "dumps disassembly of all JIT compiled code upon compilation") \
</del><ins>+ /* dumpDisassembly implies dumpDFGDisassembly. */ \
+ v(bool, dumpDisassembly, false, "dumps disassembly of all JIT compiled code upon compilation") \
</ins><span class="cx"> v(bool, asyncDisassembly, false, nullptr) \
</span><del>- v(bool, showDFGDisassembly, false, "dumps disassembly of DFG function upon compilation") \
- v(bool, showFTLDisassembly, false, "dumps disassembly of FTL function upon compilation") \
- v(bool, showAllDFGNodes, false, nullptr) \
</del><ins>+ v(bool, dumpDFGDisassembly, false, "dumps disassembly of DFG function upon compilation") \
+ v(bool, dumpFTLDisassembly, false, "dumps disassembly of FTL function upon compilation") \
+ v(bool, dumpAllDFGNodes, false, nullptr) \
</ins><span class="cx"> v(optionRange, bytecodeRangeToDFGCompile, 0, "bytecode size range to allow DFG compilation on, e.g. 1:100") \
</span><span class="cx"> v(optionString, dfgWhitelist, nullptr, "file with list of function signatures to allow DFG compilation on") \
</span><span class="cx"> v(bool, dumpSourceAtDFGTime, false, "dumps source code of JS function being DFG compiled") \
</span><span class="lines">@@ -166,15 +166,15 @@
</span><span class="cx"> v(bool, alwaysComputeHash, false, nullptr) \
</span><span class="cx"> v(bool, testTheFTL, false, nullptr) \
</span><span class="cx"> v(bool, verboseSanitizeStack, false, nullptr) \
</span><del>- v(bool, alwaysDoFullCollection, false, nullptr) \
</del><ins>+ v(bool, useGenerationalGC, true, nullptr) \
</ins><span class="cx"> v(bool, eagerlyUpdateTopCallFrame, false, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableOSREntryToDFG, true, nullptr) \
- v(bool, enableOSREntryToFTL, true, nullptr) \
</del><ins>+ v(bool, useOSREntryToDFG, true, nullptr) \
+ v(bool, useOSREntryToFTL, true, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, useFTLJIT, true, "allows the FTL JIT to be used if true") \
</span><span class="cx"> v(bool, useFTLTBAA, true, nullptr) \
</span><del>- v(bool, enableLLVMFastISel, false, nullptr) \
</del><ins>+ v(bool, useLLVMFastISel, false, nullptr) \
</ins><span class="cx"> v(bool, useLLVMSmallCodeModel, false, nullptr) \
</span><span class="cx"> v(bool, dumpLLVMIR, false, nullptr) \
</span><span class="cx"> v(bool, validateFTLOSRExitLiveness, false, nullptr) \
</span><span class="lines">@@ -190,33 +190,33 @@
</span><span class="cx"> v(bool, ftlCrashesIfCantInitializeLLVM, false, nullptr) \
</span><span class="cx"> v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED, nullptr) \
</span><span class="cx"> v(bool, assumeAllRegsInFTLICAreLive, false, nullptr) \
</span><del>- v(bool, enableAccessInlining, true, nullptr) \
</del><ins>+ v(bool, useAccessInlining, true, nullptr) \
</ins><span class="cx"> v(unsigned, maxAccessVariantListSize, 8, nullptr) \
</span><del>- v(bool, enablePolyvariantDevirtualization, true, nullptr) \
- v(bool, enablePolymorphicAccessInlining, true, nullptr) \
- v(bool, enablePolymorphicCallInlining, true, nullptr) \
</del><ins>+ v(bool, usePolyvariantDevirtualization, true, nullptr) \
+ v(bool, usePolymorphicAccessInlining, true, nullptr) \
+ v(bool, usePolymorphicCallInlining, true, nullptr) \
</ins><span class="cx"> v(unsigned, maxPolymorphicCallVariantListSize, 15, nullptr) \
</span><span class="cx"> v(unsigned, maxPolymorphicCallVariantListSizeForTopTier, 5, nullptr) \
</span><span class="cx"> v(unsigned, maxPolymorphicCallVariantsForInlining, 5, nullptr) \
</span><span class="cx"> v(unsigned, frequentCallThreshold, 2, nullptr) \
</span><span class="cx"> v(double, minimumCallToKnownRate, 0.51, nullptr) \
</span><span class="cx"> v(bool, createPreHeaders, true, nullptr) \
</span><del>- v(bool, enableMovHintRemoval, true, nullptr) \
- v(bool, enableObjectAllocationSinking, true, nullptr) \
- v(bool, enableCopyBarrierOptimization, true, nullptr) \
</del><ins>+ v(bool, useMovHintRemoval, true, nullptr) \
+ v(bool, useObjectAllocationSinking, true, nullptr) \
+ v(bool, useCopyBarrierOptimization, true, nullptr) \
</ins><span class="cx"> \
</span><del>- v(bool, enableConcurrentJIT, true, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
</del><ins>+ v(bool, useConcurrentJIT, true, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
</ins><span class="cx"> v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2, 2) - 1, nullptr) \
</span><span class="cx"> v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(8, 2) - 1, nullptr) \
</span><span class="cx"> v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), nullptr) \
</span><span class="cx"> v(int32, priorityDeltaOfFTLCompilerThreads, computePriorityDeltaOfWorkerThreads(-2, 0), nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableProfiler, false, nullptr) \
</del><ins>+ v(bool, useProfiler, false, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, forceUDis86Disassembler, false, nullptr) \
</span><span class="cx"> v(bool, forceLLVMDisassembler, false, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableArchitectureSpecificOptimizations, true, nullptr) \
</del><ins>+ v(bool, useArchitectureSpecificOptimizations, true, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, breakOnThrow, false, nullptr) \
</span><span class="cx"> \
</span><span class="lines">@@ -240,10 +240,10 @@
</span><span class="cx"> \
</span><span class="cx"> v(unsigned, maximumVarargsForInlining, 100, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enablePolyvariantCallInlining, true, nullptr) \
- v(bool, enablePolyvariantByIdInlining, true, nullptr) \
</del><ins>+ v(bool, usePolyvariantCallInlining, true, nullptr) \
+ v(bool, usePolyvariantByIdInlining, true, nullptr) \
</ins><span class="cx"> \
</span><del>- v(bool, enableMaximalFlushInsertionPhase, false, "Setting to true enables the DFG's MaximalFlushInsertionPhase to run.") \
</del><ins>+ v(bool, useMaximalFlushInsertionPhase, false, "Setting to true allows the DFG's MaximalFlushInsertionPhase to run.") \
</ins><span class="cx"> \
</span><span class="cx"> v(unsigned, maximumBinaryStringSwitchCaseLength, 50, nullptr) \
</span><span class="cx"> v(unsigned, maximumBinaryStringSwitchTotalLength, 2000, nullptr) \
</span><span class="lines">@@ -306,35 +306,35 @@
</span><span class="cx"> v(unsigned, forcedWeakRandomSeed, 0, nullptr) \
</span><span class="cx"> \
</span><span class="cx"> v(bool, useZombieMode, false, "debugging option to scribble over dead objects with 0xdeadbeef") \
</span><del>- v(bool, objectsAreImmortal, false, "debugging option to keep all objects alive forever") \
- v(bool, showObjectStatistics, false, nullptr) \
</del><ins>+ v(bool, useImmortalObjects, false, "debugging option to keep all objects alive forever") \
+ v(bool, dumpObjectStatistics, false, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(gcLogLevel, logGC, GCLogging::None, "debugging option to log GC activity (0 = None, 1 = Basic, 2 = Verbose)") \
</span><del>- v(bool, disableGC, false, nullptr) \
</del><ins>+ v(bool, useGC, true, nullptr) \
</ins><span class="cx"> v(unsigned, gcMaxHeapSize, 0, nullptr) \
</span><span class="cx"> v(unsigned, forceRAMSize, 0, nullptr) \
</span><span class="cx"> v(bool, recordGCPauseTimes, false, nullptr) \
</span><span class="cx"> v(bool, logHeapStatisticsAtExit, false, nullptr) \
</span><del>- v(bool, enableTypeProfiler, false, nullptr) \
- v(bool, enableControlFlowProfiler, false, nullptr) \
</del><ins>+ v(bool, useTypeProfiler, false, nullptr) \
+ v(bool, useControlFlowProfiler, false, nullptr) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, verifyHeap, false, nullptr) \
</span><span class="cx"> v(unsigned, numberOfGCCyclesToRecordForVerification, 3, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableExceptionFuzz, false, nullptr) \
</del><ins>+ v(bool, useExceptionFuzz, false, nullptr) \
</ins><span class="cx"> v(unsigned, fireExceptionFuzzAt, 0, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableExecutableAllocationFuzz, false, nullptr) \
</del><ins>+ v(bool, useExecutableAllocationFuzz, false, nullptr) \
</ins><span class="cx"> v(unsigned, fireExecutableAllocationFuzzAt, 0, nullptr) \
</span><span class="cx"> v(unsigned, fireExecutableAllocationFuzzAtOrAfter, 0, nullptr) \
</span><span class="cx"> v(bool, verboseExecutableAllocationFuzz, false, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableOSRExitFuzz, false, nullptr) \
</del><ins>+ v(bool, useOSRExitFuzz, false, nullptr) \
</ins><span class="cx"> v(unsigned, fireOSRExitFuzzAtStatic, 0, nullptr) \
</span><span class="cx"> v(unsigned, fireOSRExitFuzzAt, 0, nullptr) \
</span><span class="cx"> v(unsigned, fireOSRExitFuzzAtOrAfter, 0, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, enableDollarVM, false, "installs the $vm debugging tool in global objects") \
</del><ins>+ v(bool, useDollarVM, false, "installs the $vm debugging tool in global objects") \
</ins><span class="cx"> v(optionString, functionOverrides, nullptr, "file with debugging overrides for function bodies") \
</span><span class="cx"> \
</span><span class="cx"> v(unsigned, watchdog, 0, "watchdog timeout (0 = Disabled, N = a timeout period of N milliseconds)") \
</span><span class="lines">@@ -419,15 +419,15 @@
</span><span class="cx">
</span><span class="cx"> Options();
</span><span class="cx">
</span><del>- enum ShowDefaultsOption {
- DontShowDefaults,
- ShowDefaults
</del><ins>+ enum DumpDefaultsOption {
+ DontDumpDefaults,
+ DumpDefaults
</ins><span class="cx"> };
</span><span class="cx"> static void dumpOptionsIfNeeded();
</span><span class="cx"> static void dumpAllOptions(StringBuilder&, DumpLevel, const char* title,
</span><del>- const char* separator, const char* optionHeader, const char* optionFooter, ShowDefaultsOption);
</del><ins>+ const char* separator, const char* optionHeader, const char* optionFooter, DumpDefaultsOption);
</ins><span class="cx"> static void dumpOption(StringBuilder&, DumpLevel, OptionID,
</span><del>- const char* optionHeader, const char* optionFooter, ShowDefaultsOption);
</del><ins>+ const char* optionHeader, const char* optionFooter, DumpDefaultsOption);
</ins><span class="cx">
</span><span class="cx"> // Declare the singleton instance of the options store:
</span><span class="cx"> JS_EXPORTDATA static Entry s_options[numberOfOptions];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> LLInt::Data::performAssertions(*this);
</span><span class="cx">
</span><del>- if (Options::enableProfiler()) {
</del><ins>+ if (Options::useProfiler()) {
</ins><span class="cx"> m_perBytecodeProfiler = std::make_unique<Profiler::Database>(*this);
</span><span class="cx">
</span><span class="cx"> StringPrintStream pathOut;
</span><span class="lines">@@ -303,9 +303,9 @@
</span><span class="cx"> // won't use this.
</span><span class="cx"> m_typedArrayController = adoptRef(new SimpleTypedArrayController());
</span><span class="cx">
</span><del>- if (Options::enableTypeProfiler())
</del><ins>+ if (Options::useTypeProfiler())
</ins><span class="cx"> enableTypeProfiler();
</span><del>- if (Options::enableControlFlowProfiler())
</del><ins>+ if (Options::useControlFlowProfiler())
</ins><span class="cx"> enableControlFlowProfiler();
</span><span class="cx">
</span><span class="cx"> if (Options::watchdog()) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue* exceptionFuzzingBuffer(size_t size)
</span><span class="cx"> {
</span><del>- ASSERT(Options::enableExceptionFuzz());
</del><ins>+ ASSERT(Options::useExceptionFuzz());
</ins><span class="cx"> if (!m_exceptionFuzzBuffer)
</span><span class="cx"> m_exceptionFuzzBuffer = MallocPtr<EncodedJSValue>::malloc(size);
</span><span class="cx"> return m_exceptionFuzzBuffer.get();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWriteBarrierInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> inline void WriteBarrierBase<T>::set(VM& vm, const JSCell* owner, T* value)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> validateCell(value);
</span><span class="cx"> setEarlyValue(vm, owner, value);
</span><span class="cx"> }
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> inline void WriteBarrierBase<Unknown>::set(VM& vm, const JSCell* owner, JSValue value)
</span><span class="cx"> {
</span><del>- ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> m_value = JSValue::encode(value);
</span><span class="cx"> vm.heap.writeBarrier(owner, value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsexecutableAllocationFuzzyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/executableAllocationFuzz.yaml (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/executableAllocationFuzz.yaml 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/tests/executableAllocationFuzz.yaml 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -27,5 +27,5 @@
</span><span class="cx"> skip
</span><span class="cx"> else
</span><span class="cx"> runExecutableAllocationFuzz("default")
</span><del>- runExecutableAllocationFuzz("no-cjit", "--enableConcurrentJIT=false")
</del><ins>+ runExecutableAllocationFuzz("no-cjit", "--useConcurrentJIT=false")
</ins><span class="cx"> end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontypeofjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> testCase(typeof af2, "function", "Error: Not correct type of the arrow function #2");
</span><span class="cx">
</span><span class="cx"> //Fixme: Some bug in inlining typeof with following run parameters ftl-no-cjit-no-inline-validate
</span><del>-// --useFTLJIT\=true --enableFunctionDotArguments\=true --enableConcurrentJIT=false --thresholdForJITAfterWarmUp=100 --validateGraph=true --maximumInliningDepth=1
</del><ins>+// --useFTLJIT\=true --useFunctionDotArguments\=true --useConcurrentJIT=false --thresholdForJITAfterWarmUp=100 --validateGraph=true --maximumInliningDepth=1
</ins><span class="cx"> //
</span><span class="cx"> // for (var i = 0; i < 10000; ++i) {
</span><span class="cx"> // if (typeof (function () {}) !== 'function')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressdisablefunctiondotargumentsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/disable-function-dot-arguments.js (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/disable-function-dot-arguments.js 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/tests/stress/disable-function-dot-arguments.js 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-//@ run("function-dot-arguments", "--enableFunctionDotArguments=false")
</del><ins>+//@ run("function-dot-arguments", "--useFunctionDotArguments=false")
</ins><span class="cx">
</span><span class="cx"> function foo() {
</span><span class="cx"> var a = bar.arguments;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmathsqrtbasicsdisablearchitecturespecificoptimizationsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/tests/stress/math-sqrt-basics-disable-architecture-specific-optimizations.js 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-//@ run("no-architecture-specific-optimizations", "--enableArchitectureSpecificOptimizations=false", *NO_CJIT_OPTIONS)
-//@ run("no-architecture-specific-optimizations-ftl", "--enableArchitectureSpecificOptimizations=false", *FTL_OPTIONS)
</del><ins>+//@ run("no-architecture-specific-optimizations", "--useArchitectureSpecificOptimizations=false", *NO_CJIT_OPTIONS)
+//@ run("no-architecture-specific-optimizations-ftl", "--useArchitectureSpecificOptimizations=false", *FTL_OPTIONS)
</ins><span class="cx">
</span><span class="cx"> // Basic cases of Math.sqrt().
</span><span class="cx"> function sqrtOnInteger(radicand) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressregress148564js"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/regress-148564.js (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/regress-148564.js 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Source/JavaScriptCore/tests/stress/regress-148564.js 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> // In order to manifest, the bug being tested requires all these conditions to be true:
</span><span class="cx"> // 1. A put operation must not being optimized by the DFG into a PutByOffset.
</span><span class="cx"> // It needs to be a PutById node instead so that it will use the inline cache.
</span><del>-// This is satisfied by using the --enableAccessInlining=false option above.
</del><ins>+// This is satisfied by using the --useAccessInlining=false option above.
</ins><span class="cx"> //
</span><span class="cx"> // 2. The PutById's execution must go through its transition stub.
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Tools/ChangeLog 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-14 Mark Lam <mark.lam@apple.com>
+
+ Rename some JSC option names to be more uniform.
+ https://bugs.webkit.org/show_bug.cgi?id=150127
+
+ Reviewed by Geoffrey Garen.
+
+ * Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz:
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2015-10-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Change the bundle app cache APIs to take a page
</span></span></pre></div>
<a id="trunkToolsScriptsjscstresstesthelpersjsexecutableallocationfuzz"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Tools/Scripts/jsc-stress-test-helpers/js-executable-allocation-fuzz 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> die "Ignoring garbage arguments; only the first non-option argument is used as the command string.";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-open (my $testInput, "$commandString --enableExecutableAllocationFuzz=true |") or fail("Cannot execute initial command when getting check count");
</del><ins>+open (my $testInput, "$commandString --useExecutableAllocationFuzz=true |") or fail("Cannot execute initial command when getting check count");
</ins><span class="cx"> while (my $inputLine = <$testInput>) {
</span><span class="cx"> chomp($inputLine);
</span><span class="cx"> my $handled = 0;
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> if ($verbose) {
</span><span class="cx"> print "iteration($iteration) target($target) one-shot: Running.\n";
</span><span class="cx"> }
</span><del>- my $result = system("$commandString --enableExecutableAllocationFuzz=true --fireExecutableAllocationFuzzAt=$target");
</del><ins>+ my $result = system("$commandString --useExecutableAllocationFuzz=true --fireExecutableAllocationFuzzAt=$target");
</ins><span class="cx"> if ($result != 0) {
</span><span class="cx"> fail("Cannot execute command on iteration $iteration, status $? for target $target");
</span><span class="cx"> }
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> if ($verbose) {
</span><span class="cx"> print "iteration($iteration) target($target) at-or-after: Running.\n";
</span><span class="cx"> }
</span><del>- my $result = system("$commandString --enableExecutableAllocationFuzz=true --fireExecutableAllocationFuzzAtOrAfter=$target");
</del><ins>+ my $result = system("$commandString --useExecutableAllocationFuzz=true --fireExecutableAllocationFuzzAtOrAfter=$target");
</ins><span class="cx"> if ($result != 0) {
</span><span class="cx"> fail("Cannot execute command on iteration $iteration, status $? for target $target");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (191057 => 191058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2015-10-14 18:49:43 UTC (rev 191057)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2015-10-14 18:57:07 UTC (rev 191058)
</span><span class="lines">@@ -361,9 +361,9 @@
</span><span class="cx">
</span><span class="cx"> $numFailures = 0
</span><span class="cx">
</span><del>-BASE_OPTIONS = ["--useFTLJIT=false", "--enableFunctionDotArguments=true"]
</del><ins>+BASE_OPTIONS = ["--useFTLJIT=false", "--useFunctionDotArguments=true"]
</ins><span class="cx"> EAGER_OPTIONS = ["--thresholdForJITAfterWarmUp=10", "--thresholdForJITSoon=10", "--thresholdForOptimizeAfterWarmUp=20", "--thresholdForOptimizeAfterLongWarmUp=20", "--thresholdForOptimizeSoon=20", "--thresholdForFTLOptimizeAfterWarmUp=20", "--thresholdForFTLOptimizeSoon=20", "--maximumEvalCacheableSourceLength=150000"]
</span><del>-NO_CJIT_OPTIONS = ["--enableConcurrentJIT=false", "--thresholdForJITAfterWarmUp=100"]
</del><ins>+NO_CJIT_OPTIONS = ["--useConcurrentJIT=false", "--thresholdForJITAfterWarmUp=100"]
</ins><span class="cx"> FTL_OPTIONS = ["--useFTLJIT=true", "--ftlCrashesIfCantInitializeLLVM=true"]
</span><span class="cx">
</span><span class="cx"> $runlist = []
</span><span class="lines">@@ -779,7 +779,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runNoCJITNoASO
</span><del>- run("no-cjit-no-aso", "--enableArchitectureSpecificOptimizations=false", *NO_CJIT_OPTIONS)
</del><ins>+ run("no-cjit-no-aso", "--useArchitectureSpecificOptimizations=false", *NO_CJIT_OPTIONS)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJITNoSimpleOpt
</span><span class="lines">@@ -787,11 +787,11 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runNoCJITNoAccessInlining
</span><del>- run("no-cjit-no-access-inlining", "--enableAccessInlining=false", *NO_CJIT_OPTIONS)
</del><ins>+ run("no-cjit-no-access-inlining", "--useAccessInlining=false", *NO_CJIT_OPTIONS)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJITNoAccessInlining
</span><del>- run("ftl-no-cjit-no-access-inlining", "--enableAccessInlining=false", *(FTL_OPTIONS + NO_CJIT_OPTIONS)) if $enableFTL
</del><ins>+ run("ftl-no-cjit-no-access-inlining", "--useAccessInlining=false", *(FTL_OPTIONS + NO_CJIT_OPTIONS)) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runFTLNoCJITSmallPool
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def runDFGMaximalFlushPhase
</span><del>- run("dfg-maximal-flush-validate-no-cjit", "--validateGraph=true", "--enableMaximalFlushInsertionPhase=true", *NO_CJIT_OPTIONS)
</del><ins>+ run("dfg-maximal-flush-validate-no-cjit", "--validateGraph=true", "--useMaximalFlushInsertionPhase=true", *NO_CJIT_OPTIONS)
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultRun
</span><span class="lines">@@ -903,9 +903,9 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if $enableFTL
</span><del>- run("ftl-no-cjit-type-profiler", "--enableTypeProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</del><ins>+ run("ftl-no-cjit-type-profiler", "--useTypeProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</ins><span class="cx"> else
</span><del>- run("no-cjit-type-profiler", "--enableTypeProfiler=true", *NO_CJIT_OPTIONS)
</del><ins>+ run("no-cjit-type-profiler", "--useTypeProfiler=true", *NO_CJIT_OPTIONS)
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -915,9 +915,9 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> if $enableFTL
</span><del>- run("ftl-no-cjit-type-profiler", "--enableControlFlowProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</del><ins>+ run("ftl-no-cjit-type-profiler", "--useControlFlowProfiler=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
</ins><span class="cx"> else
</span><del>- run("no-cjit-type-profiler", "--enableControlFlowProfiler=true", *NO_CJIT_OPTIONS)
</del><ins>+ run("no-cjit-type-profiler", "--useControlFlowProfiler=true", *NO_CJIT_OPTIONS)
</ins><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>