<!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>[190129] trunk/Source</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/190129">190129</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-22 13:01:15 -0700 (Tue, 22 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of ENABLE(GGC)
https://bugs.webkit.org/show_bug.cgi?id=149472
Reviewed by Mark Hahnenberg and Mark Lam.
Source/JavaScriptCore:
Getting rid of this feature flag allows us to remove a lot of yuck.
* bytecode/CodeBlock.h:
(JSC::CodeBlockSet::mark):
(JSC::ScriptExecutable::forEachCodeBlock):
* bytecode/PolymorphicAccess.cpp:
(JSC::AccessCase::generate):
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::reifyInlinedCallFrames):
(JSC::DFG::osrWriteBarrier):
(JSC::DFG::adjustAndJumpToTarget):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::linkBranches):
(JSC::DFG::SpeculativeJIT::compileStoreBarrier):
(JSC::DFG::SpeculativeJIT::writeBarrier):
* dfg/DFGSpeculativeJIT.h:
(JSC::DFG::SpeculativeJIT::masqueradesAsUndefinedWatchpointIsStillValid):
(JSC::DFG::SpeculativeJIT::selectScratchGPR):
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compileBaseValueStoreBarrier):
(JSC::DFG::SpeculativeJIT::compileObjectEquality):
(JSC::DFG::SpeculativeJIT::compile):
(JSC::DFG::SpeculativeJIT::writeBarrier):
(JSC::DFG::SpeculativeJIT::moveTrueTo):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compileBaseValueStoreBarrier):
(JSC::DFG::SpeculativeJIT::compileObjectEquality):
(JSC::DFG::SpeculativeJIT::compile):
(JSC::DFG::SpeculativeJIT::writeBarrier):
(JSC::DFG::SpeculativeJIT::moveTrueTo):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::emitStoreBarrier):
* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::rememberCurrentlyExecutingCodeBlocks):
(JSC::CodeBlockSet::dump):
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::markRoots):
(JSC::Heap::clearRememberedSet):
(JSC::Heap::updateObjectCounts):
(JSC::Heap::flushWriteBarrierBuffer):
(JSC::Heap::shouldDoFullCollection):
(JSC::Heap::addLogicallyEmptyWeakBlock):
* heap/HeapInlines.h:
(JSC::Heap::isWriteBarrierEnabled):
(JSC::Heap::writeBarrier):
(JSC::Heap::reportExtraMemoryAllocated):
(JSC::Heap::reportExtraMemoryVisited):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::clearMarks):
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::resetAllocators):
(JSC::MarkedSpace::visitWeakSets):
* heap/MarkedSpace.h:
(JSC::MarkedSpace::didAllocateInBlock):
(JSC::MarkedSpace::objectCount):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitWriteBarrier):
(JSC::JIT::emitIdentifierCheck):
(JSC::JIT::privateCompilePutByVal):
* llint/LLIntOfflineAsmConfig.h:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
Source/WebCore:
No new tests because no new behavior.
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::commonVM):
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp">trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp">trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapInlinesh">trunk/Source/JavaScriptCore/heap/HeapInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockcpp">trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntOfflineAsmConfigh">trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2015-09-22 Filip Pizlo <fpizlo@apple.com>
+
+ Get rid of ENABLE(GGC)
+ https://bugs.webkit.org/show_bug.cgi?id=149472
+
+ Reviewed by Mark Hahnenberg and Mark Lam.
+
+ Getting rid of this feature flag allows us to remove a lot of yuck.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlockSet::mark):
+ (JSC::ScriptExecutable::forEachCodeBlock):
+ * bytecode/PolymorphicAccess.cpp:
+ (JSC::AccessCase::generate):
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::reifyInlinedCallFrames):
+ (JSC::DFG::osrWriteBarrier):
+ (JSC::DFG::adjustAndJumpToTarget):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::linkBranches):
+ (JSC::DFG::SpeculativeJIT::compileStoreBarrier):
+ (JSC::DFG::SpeculativeJIT::writeBarrier):
+ * dfg/DFGSpeculativeJIT.h:
+ (JSC::DFG::SpeculativeJIT::masqueradesAsUndefinedWatchpointIsStillValid):
+ (JSC::DFG::SpeculativeJIT::selectScratchGPR):
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compileBaseValueStoreBarrier):
+ (JSC::DFG::SpeculativeJIT::compileObjectEquality):
+ (JSC::DFG::SpeculativeJIT::compile):
+ (JSC::DFG::SpeculativeJIT::writeBarrier):
+ (JSC::DFG::SpeculativeJIT::moveTrueTo):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compileBaseValueStoreBarrier):
+ (JSC::DFG::SpeculativeJIT::compileObjectEquality):
+ (JSC::DFG::SpeculativeJIT::compile):
+ (JSC::DFG::SpeculativeJIT::writeBarrier):
+ (JSC::DFG::SpeculativeJIT::moveTrueTo):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitStoreBarrier):
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::rememberCurrentlyExecutingCodeBlocks):
+ (JSC::CodeBlockSet::dump):
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ (JSC::Heap::markRoots):
+ (JSC::Heap::clearRememberedSet):
+ (JSC::Heap::updateObjectCounts):
+ (JSC::Heap::flushWriteBarrierBuffer):
+ (JSC::Heap::shouldDoFullCollection):
+ (JSC::Heap::addLogicallyEmptyWeakBlock):
+ * heap/HeapInlines.h:
+ (JSC::Heap::isWriteBarrierEnabled):
+ (JSC::Heap::writeBarrier):
+ (JSC::Heap::reportExtraMemoryAllocated):
+ (JSC::Heap::reportExtraMemoryVisited):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::clearMarks):
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::resetAllocators):
+ (JSC::MarkedSpace::visitWeakSets):
+ * heap/MarkedSpace.h:
+ (JSC::MarkedSpace::didAllocateInBlock):
+ (JSC::MarkedSpace::objectCount):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitWriteBarrier):
+ (JSC::JIT::emitIdentifierCheck):
+ (JSC::JIT::privateCompilePutByVal):
+ * llint/LLIntOfflineAsmConfig.h:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2015-09-22 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> the toInt32 operation inside DFGSpeculativeJIT.cpp can't throw so we shouldn't emit an exceptionCheck after it.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1256,9 +1256,7 @@
</span><span class="cx"> // a barrier when a CodeBlock needs it.
</span><span class="cx"> codeBlock->clearMarks();
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> m_currentlyExecuting.add(codeBlock);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename Functor> inline void ScriptExecutable::forEachCodeBlock(Functor&& functor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -826,7 +826,6 @@
</span><span class="cx"> if (newStructure()->outOfLineCapacity() != structure()->outOfLineCapacity())
</span><span class="cx"> scratchBuffer = vm.scratchBufferForSize(allocator.desiredScratchBufferSizeForCall());
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (newStructure()->outOfLineCapacity() != structure()->outOfLineCapacity()) {
</span><span class="cx"> CCallHelpers::Call callFlushWriteBarrierBuffer;
</span><span class="cx"> CCallHelpers::Jump ownerIsRememberedOrInEden = jit.jumpIfIsRememberedOrInEden(baseGPR);
</span><span class="lines">@@ -869,7 +868,6 @@
</span><span class="cx"> linkBuffer.link(callFlushWriteBarrierBuffer, operationFlushWriteBarrierBuffer);
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>-#endif // ENABLE(GGC)
</del><span class="cx">
</span><span class="cx"> allocator.restoreReusedRegistersByPopping(jit, numberOfPaddingBytes);
</span><span class="cx"> state.succeed();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOSRExitCompilerCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -226,7 +226,6 @@
</span><span class="cx"> jit.store32(AssemblyHelpers::TrustedImm32(locationBits), AssemblyHelpers::tagFor((VirtualRegister)(JSStack::ArgumentCount)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> static void osrWriteBarrier(CCallHelpers& jit, GPRReg owner, GPRReg scratch)
</span><span class="cx"> {
</span><span class="cx"> AssemblyHelpers::Jump ownerIsRememberedOrInEden = jit.jumpIfIsRememberedOrInEden(owner);
</span><span class="lines">@@ -246,11 +245,9 @@
</span><span class="cx">
</span><span class="cx"> ownerIsRememberedOrInEden.link(&jit);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(GGC)
</del><span class="cx">
</span><span class="cx"> void adjustAndJumpToTarget(CCallHelpers& jit, const OSRExitBase& exit, bool isExitingToOpCatch)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> jit.move(AssemblyHelpers::TrustedImmPtr(jit.codeBlock()->ownerExecutable()), GPRInfo::argumentGPR1);
</span><span class="cx"> osrWriteBarrier(jit, GPRInfo::argumentGPR1, GPRInfo::nonArgGPR0);
</span><span class="cx"> InlineCallFrameSet* inlineCallFrames = jit.codeBlock()->jitCode()->dfgCommon()->inlineCallFrames.get();
</span><span class="lines">@@ -261,7 +258,6 @@
</span><span class="cx"> osrWriteBarrier(jit, GPRInfo::argumentGPR1, GPRInfo::nonArgGPR0);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (exit.m_codeOrigin.inlineCallFrame)
</span><span class="cx"> jit.addPtr(AssemblyHelpers::TrustedImm32(exit.m_codeOrigin.inlineCallFrame->stackOffset * sizeof(EncodedJSValue)), GPRInfo::callFrameRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -6537,7 +6537,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> void SpeculativeJIT::compileStoreBarrier(Node* node)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(node->op() == StoreBarrier);
</span><span class="lines">@@ -6581,13 +6580,6 @@
</span><span class="cx"> storeToWriteBarrierBuffer(ownerGPR, scratch1, scratch2);
</span><span class="cx"> ownerIsRememberedOrInEden.link(&m_jit);
</span><span class="cx"> }
</span><del>-#else
-void SpeculativeJIT::compileStoreBarrier(Node* node)
-{
- DFG_NODE_DO_TO_CHILDREN(m_jit.graph(), node, speculate);
- noResult(node);
-}
-#endif // ENABLE(GGC)
</del><span class="cx">
</span><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -293,13 +293,12 @@
</span><span class="cx"> return masqueradesAsUndefinedWatchpointIsStillValid(m_currentNode->origin.semantic);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> void storeToWriteBarrierBuffer(GPRReg cell, GPRReg scratch1, GPRReg scratch2);
</span><span class="cx">
</span><span class="cx"> void writeBarrier(GPRReg owner, GPRReg scratch1, GPRReg scratch2);
</span><span class="cx">
</span><span class="cx"> void writeBarrier(GPRReg owner, GPRReg value, Edge valueUse, GPRReg scratch1, GPRReg scratch2);
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> void compileStoreBarrier(Node*);
</span><span class="cx">
</span><span class="cx"> static GPRReg selectScratchGPR(GPRReg preserve1 = InvalidGPRReg, GPRReg preserve2 = InvalidGPRReg, GPRReg preserve3 = InvalidGPRReg, GPRReg preserve4 = InvalidGPRReg)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1121,7 +1121,6 @@
</span><span class="cx">
</span><span class="cx"> void SpeculativeJIT::compileBaseValueStoreBarrier(Edge& baseEdge, Edge& valueEdge)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> ASSERT(!isKnownNotCell(valueEdge.node()));
</span><span class="cx">
</span><span class="cx"> SpeculateCellOperand base(this, baseEdge);
</span><span class="lines">@@ -1130,10 +1129,6 @@
</span><span class="cx"> GPRTemporary scratch2(this);
</span><span class="cx">
</span><span class="cx"> writeBarrier(base.gpr(), value.tagGPR(), valueEdge, scratch1.gpr(), scratch2.gpr());
</span><del>-#else
- UNUSED_PARAM(baseEdge);
- UNUSED_PARAM(valueEdge);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SpeculativeJIT::compileObjectEquality(Node* node)
</span><span class="lines">@@ -4761,7 +4756,6 @@
</span><span class="cx"> use(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> void SpeculativeJIT::writeBarrier(GPRReg ownerGPR, GPRReg valueTagGPR, Edge valueUse, GPRReg scratch1, GPRReg scratch2)
</span><span class="cx"> {
</span><span class="cx"> JITCompiler::Jump isNotCell;
</span><span class="lines">@@ -4775,7 +4769,6 @@
</span><span class="cx"> if (!isKnownCell(valueUse.node()))
</span><span class="cx"> isNotCell.link(&m_jit);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(GGC)
</del><span class="cx">
</span><span class="cx"> void SpeculativeJIT::moveTrueTo(GPRReg gpr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1228,7 +1228,6 @@
</span><span class="cx">
</span><span class="cx"> void SpeculativeJIT::compileBaseValueStoreBarrier(Edge& baseEdge, Edge& valueEdge)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> ASSERT(!isKnownNotCell(valueEdge.node()));
</span><span class="cx">
</span><span class="cx"> SpeculateCellOperand base(this, baseEdge);
</span><span class="lines">@@ -1237,10 +1236,6 @@
</span><span class="cx"> GPRTemporary scratch2(this);
</span><span class="cx">
</span><span class="cx"> writeBarrier(base.gpr(), value.gpr(), valueEdge, scratch1.gpr(), scratch2.gpr());
</span><del>-#else
- UNUSED_PARAM(baseEdge);
- UNUSED_PARAM(valueEdge);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SpeculativeJIT::compileObjectEquality(Node* node)
</span><span class="lines">@@ -4815,7 +4810,6 @@
</span><span class="cx"> use(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> void SpeculativeJIT::writeBarrier(GPRReg ownerGPR, GPRReg valueGPR, Edge valueUse, GPRReg scratch1, GPRReg scratch2)
</span><span class="cx"> {
</span><span class="cx"> JITCompiler::Jump isNotCell;
</span><span class="lines">@@ -4829,7 +4823,6 @@
</span><span class="cx"> if (!isKnownCell(valueUse.node()))
</span><span class="cx"> isNotCell.link(&m_jit);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(GGC)
</del><span class="cx">
</span><span class="cx"> void SpeculativeJIT::moveTrueTo(GPRReg gpr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -8198,7 +8198,6 @@
</span><span class="cx">
</span><span class="cx"> void emitStoreBarrier(LValue base)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> LBasicBlock isMarkedAndNotRemembered = FTL_NEW_BLOCK(m_out, ("Store barrier is marked block"));
</span><span class="cx"> LBasicBlock bufferHasSpace = FTL_NEW_BLOCK(m_out, ("Store barrier buffer has space"));
</span><span class="cx"> LBasicBlock bufferIsFull = FTL_NEW_BLOCK(m_out, ("Store barrier buffer is full"));
</span><span class="lines">@@ -8229,9 +8228,6 @@
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span><del>-#else
- UNUSED_PARAM(base);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename... Args>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -148,7 +148,6 @@
</span><span class="cx">
</span><span class="cx"> void CodeBlockSet::rememberCurrentlyExecutingCodeBlocks(Heap* heap)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Remembering ", m_currentlyExecuting.size(), " code blocks.\n");
</span><span class="cx"> for (const RefPtr<CodeBlock>& codeBlock : m_currentlyExecuting)
</span><span class="lines">@@ -158,9 +157,6 @@
</span><span class="cx"> // in them until the next GC, and we'll recompute them at that time.
</span><span class="cx"> m_currentlyExecuting.clear();
</span><span class="cx"> m_remembered.clear();
</span><del>-#else
- UNUSED_PARAM(heap);
-#endif // ENABLE(GGC)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CodeBlockSet::dump(PrintStream& out) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -347,11 +347,7 @@
</span><span class="cx"> , m_lastFullGCLength(0.01)
</span><span class="cx"> , m_lastEdenGCLength(0.01)
</span><span class="cx"> , m_fullActivityCallback(GCActivityCallback::createFullTimer(this))
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> , m_edenActivityCallback(GCActivityCallback::createEdenTimer(this))
</span><del>-#else
- , m_edenActivityCallback(m_fullActivityCallback)
-#endif
</del><span class="cx"> #if USE(CF)
</span><span class="cx"> , m_sweeper(std::make_unique<IncrementalSweeper>(this, CFRunLoopGetCurrent()))
</span><span class="cx"> #else
</span><span class="lines">@@ -523,12 +519,8 @@
</span><span class="cx"> GCPHASE(MarkRoots);
</span><span class="cx"> ASSERT(isValidThreadState(m_vm));
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
</span><span class="cx"> m_slotVisitor.markStack().fillVector(rememberedSet);
</span><del>-#else
- Vector<const JSCell*> rememberedSet;
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> DFG::clearCodeBlockMarks(*m_vm);
</span><span class="lines">@@ -792,13 +784,9 @@
</span><span class="cx">
</span><span class="cx"> void Heap::clearRememberedSet(Vector<const JSCell*>& rememberedSet)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> GCPHASE(ClearRememberedSet);
</span><span class="cx"> for (auto* cell : rememberedSet)
</span><span class="cx"> const_cast<JSCell*>(cell)->setRemembered(false);
</span><del>-#else
- UNUSED_PARAM(rememberedSet);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::updateObjectCounts(double gcStartTime)
</span><span class="lines">@@ -1426,17 +1414,12 @@
</span><span class="cx">
</span><span class="cx"> void Heap::flushWriteBarrierBuffer(JSCell* cell)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> m_writeBarrierBuffer.flush(*this);
</span><span class="cx"> m_writeBarrierBuffer.add(cell);
</span><del>-#else
- UNUSED_PARAM(cell);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Heap::shouldDoFullCollection(HeapOperation requestedCollectionType) const
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (Options::alwaysDoFullCollection())
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1453,10 +1436,6 @@
</span><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><del>-#else
- UNUSED_PARAM(requestedCollectionType);
- return true;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::addLogicallyEmptyWeakBlock(WeakBlock* block)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapInlines.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -95,11 +95,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool Heap::isWriteBarrierEnabled()
</span><span class="cx"> {
</span><del>-#if ENABLE(WRITE_BARRIER_PROFILING) || ENABLE(GGC)
</del><span class="cx"> return true;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Heap::writeBarrier(const JSCell* from, JSValue to)
</span><span class="lines">@@ -107,14 +103,9 @@
</span><span class="cx"> #if ENABLE(WRITE_BARRIER_PROFILING)
</span><span class="cx"> WriteBarrierCounters::countWriteBarrier();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (!to.isCell())
</span><span class="cx"> return;
</span><span class="cx"> writeBarrier(from, to.asCell());
</span><del>-#else
- UNUSED_PARAM(from);
- UNUSED_PARAM(to);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Heap::writeBarrier(const JSCell* from, JSCell* to)
</span><span class="lines">@@ -122,7 +113,6 @@
</span><span class="cx"> #if ENABLE(WRITE_BARRIER_PROFILING)
</span><span class="cx"> WriteBarrierCounters::countWriteBarrier();
</span><span class="cx"> #endif
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (!from || !from->isMarked()) {
</span><span class="cx"> ASSERT(!from || !isMarked(from));
</span><span class="cx"> return;
</span><span class="lines">@@ -132,15 +122,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> addToRememberedSet(from);
</span><del>-#else
- UNUSED_PARAM(from);
- UNUSED_PARAM(to);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Heap::writeBarrier(const JSCell* from)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> ASSERT_GC_OBJECT_LOOKS_VALID(const_cast<JSCell*>(from));
</span><span class="cx"> if (!from || !from->isMarked()) {
</span><span class="cx"> ASSERT(!from || !isMarked(from));
</span><span class="lines">@@ -148,9 +133,6 @@
</span><span class="cx"> }
</span><span class="cx"> ASSERT(isMarked(from));
</span><span class="cx"> addToRememberedSet(from);
</span><del>-#else
- UNUSED_PARAM(from);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void Heap::reportExtraMemoryAllocated(size_t size)
</span><span class="lines">@@ -161,13 +143,9 @@
</span><span class="cx">
</span><span class="cx"> inline void Heap::reportExtraMemoryVisited(JSCell* owner, size_t size)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> // We don't want to double-count the extra memory that was reported in previous collections.
</span><span class="cx"> if (operationInProgress() == EdenCollection && Heap::isRemembered(owner))
</span><span class="cx"> return;
</span><del>-#else
- UNUSED_PARAM(owner);
-#endif
</del><span class="cx">
</span><span class="cx"> size_t* counter = &m_extraMemorySize;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -208,14 +208,10 @@
</span><span class="cx">
</span><span class="cx"> void MarkedBlock::clearMarks()
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (heap()->operationInProgress() == JSC::EdenCollection)
</span><span class="cx"> this->clearMarksWithCollectionType<EdenCollection>();
</span><span class="cx"> else
</span><span class="cx"> this->clearMarksWithCollectionType<FullCollection>();
</span><del>-#else
- this->clearMarksWithCollectionType<FullCollection>();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <HeapOperation collectionType>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -142,9 +142,7 @@
</span><span class="cx"> m_normalSpace.largeAllocator.reset();
</span><span class="cx"> m_destructorSpace.largeAllocator.reset();
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> m_blocksWithNewObjects.clear();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedSpace::visitWeakSets(HeapRootVisitor& heapRootVisitor)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -261,11 +261,7 @@
</span><span class="cx">
</span><span class="cx"> inline void MarkedSpace::didAllocateInBlock(MarkedBlock* block)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> m_blocksWithNewObjects.append(block);
</span><del>-#else
- UNUSED_PARAM(block);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline size_t MarkedSpace::objectCount()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1138,7 +1138,6 @@
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> void JIT::emitWriteBarrier(unsigned owner, unsigned value, WriteBarrierMode mode)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> Jump valueNotCell;
</span><span class="cx"> if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue) {
</span><span class="cx"> emitGetVirtualRegister(value, regT0);
</span><span class="lines">@@ -1158,16 +1157,10 @@
</span><span class="cx"> ownerNotCell.link(this);
</span><span class="cx"> if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue)
</span><span class="cx"> valueNotCell.link(this);
</span><del>-#else
- UNUSED_PARAM(owner);
- UNUSED_PARAM(value);
- UNUSED_PARAM(mode);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitWriteBarrier(JSCell* owner, unsigned value, WriteBarrierMode mode)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> emitGetVirtualRegister(value, regT0);
</span><span class="cx"> Jump valueNotCell;
</span><span class="cx"> if (mode == ShouldFilterValue)
</span><span class="lines">@@ -1177,18 +1170,12 @@
</span><span class="cx">
</span><span class="cx"> if (mode == ShouldFilterValue)
</span><span class="cx"> valueNotCell.link(this);
</span><del>-#else
- UNUSED_PARAM(owner);
- UNUSED_PARAM(value);
- UNUSED_PARAM(mode);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else // USE(JSVALUE64)
</span><span class="cx">
</span><span class="cx"> void JIT::emitWriteBarrier(unsigned owner, unsigned value, WriteBarrierMode mode)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> Jump valueNotCell;
</span><span class="cx"> if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue) {
</span><span class="cx"> emitLoadTag(value, regT0);
</span><span class="lines">@@ -1208,16 +1195,10 @@
</span><span class="cx"> ownerNotCell.link(this);
</span><span class="cx"> if (mode == ShouldFilterValue || mode == ShouldFilterBaseAndValue)
</span><span class="cx"> valueNotCell.link(this);
</span><del>-#else
- UNUSED_PARAM(owner);
- UNUSED_PARAM(value);
- UNUSED_PARAM(mode);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitWriteBarrier(JSCell* owner, unsigned value, WriteBarrierMode mode)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> Jump valueNotCell;
</span><span class="cx"> if (mode == ShouldFilterValue) {
</span><span class="cx"> emitLoadTag(value, regT0);
</span><span class="lines">@@ -1228,27 +1209,18 @@
</span><span class="cx">
</span><span class="cx"> if (mode == ShouldFilterValue)
</span><span class="cx"> valueNotCell.link(this);
</span><del>-#else
- UNUSED_PARAM(owner);
- UNUSED_PARAM(value);
- UNUSED_PARAM(mode);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // USE(JSVALUE64)
</span><span class="cx">
</span><span class="cx"> void JIT::emitWriteBarrier(JSCell* owner)
</span><span class="cx"> {
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (!MarkedBlock::blockFor(owner)->isMarked(owner)) {
</span><span class="cx"> Jump ownerIsRememberedOrInEden = jumpIfIsRememberedOrInEden(owner);
</span><span class="cx"> callOperation(operationUnconditionalWriteBarrier, owner);
</span><span class="cx"> ownerIsRememberedOrInEden.link(this);
</span><span class="cx"> } else
</span><span class="cx"> callOperation(operationUnconditionalWriteBarrier, owner);
</span><del>-#else
- UNUSED_PARAM(owner);
-#endif // ENABLE(GGC)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitIdentifierCheck(RegisterID cell, RegisterID scratch, const Identifier& propertyName, JumpList& slowCases)
</span><span class="lines">@@ -1353,9 +1325,7 @@
</span><span class="cx"> PatchableJump badType;
</span><span class="cx"> JumpList slowCases;
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> bool needsLinkForWriteBarrier = false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> switch (arrayMode) {
</span><span class="cx"> case JITInt32:
</span><span class="lines">@@ -1366,15 +1336,11 @@
</span><span class="cx"> break;
</span><span class="cx"> case JITContiguous:
</span><span class="cx"> slowCases = emitContiguousPutByVal(currentInstruction, badType);
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> needsLinkForWriteBarrier = true;
</span><del>-#endif
</del><span class="cx"> break;
</span><span class="cx"> case JITArrayStorage:
</span><span class="cx"> slowCases = emitArrayStoragePutByVal(currentInstruction, badType);
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> needsLinkForWriteBarrier = true;
</span><del>-#endif
</del><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> TypedArrayType type = typedArrayTypeForJITArrayMode(arrayMode);
</span><span class="lines">@@ -1391,12 +1357,10 @@
</span><span class="cx"> patchBuffer.link(badType, CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
</span><span class="cx"> patchBuffer.link(slowCases, CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(returnAddress.value())).labelAtOffset(byValInfo->returnAddressToSlowPath));
</span><span class="cx"> patchBuffer.link(done, byValInfo->badTypeJump.labelAtOffset(byValInfo->badTypeJumpToDone));
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> if (needsLinkForWriteBarrier) {
</span><span class="cx"> ASSERT(m_calls.last().to == operationUnconditionalWriteBarrier);
</span><span class="cx"> patchBuffer.link(m_calls.last().from, operationUnconditionalWriteBarrier);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool isDirect = m_interpreter->getOpcodeID(currentInstruction->u.opcode) == op_put_by_val_direct;
</span><span class="cx"> if (!isDirect) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntOfflineAsmConfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/llint/LLIntOfflineAsmConfig.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -161,10 +161,4 @@
</span><span class="cx"> #define OFFLINE_ASM_EXECUTION_TRACING 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(GGC)
-#define OFFLINE_ASM_GGC 1
-#else
-#define OFFLINE_ASM_GGC 0
-#endif
-
</del><span class="cx"> #endif // LLIntOfflineAsmConfig_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -494,60 +494,54 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnOperand(cellOperand)
</span><del>- if GGC
- loadisFromInstruction(cellOperand, t1)
- loadConstantOrVariablePayload(t1, CellTag, t2, .writeBarrierDone)
- skipIfIsRememberedOrInEden(t2, t1, t3,
- macro(gcData)
- btbnz gcData, .writeBarrierDone
- push cfr, PC
- # We make two extra slots because cCall2 will poke.
- subp 8, sp
- move t2, a1 # t2 can be a0 on x86
- move cfr, a0
- cCall2Void(_llint_write_barrier_slow)
- addp 8, sp
- pop PC, cfr
- end
- )
- .writeBarrierDone:
- end
</del><ins>+ loadisFromInstruction(cellOperand, t1)
+ loadConstantOrVariablePayload(t1, CellTag, t2, .writeBarrierDone)
+ skipIfIsRememberedOrInEden(t2, t1, t3,
+ macro(gcData)
+ btbnz gcData, .writeBarrierDone
+ push cfr, PC
+ # We make two extra slots because cCall2 will poke.
+ subp 8, sp
+ move t2, a1 # t2 can be a0 on x86
+ move cfr, a0
+ cCall2Void(_llint_write_barrier_slow)
+ addp 8, sp
+ pop PC, cfr
+ end
+ )
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnOperands(cellOperand, valueOperand)
</span><del>- if GGC
- loadisFromInstruction(valueOperand, t1)
- loadConstantOrVariableTag(t1, t0)
- bineq t0, CellTag, .writeBarrierDone
-
- writeBarrierOnOperand(cellOperand)
- .writeBarrierDone:
- end
</del><ins>+ loadisFromInstruction(valueOperand, t1)
+ loadConstantOrVariableTag(t1, t0)
+ bineq t0, CellTag, .writeBarrierDone
+
+ writeBarrierOnOperand(cellOperand)
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnGlobal(valueOperand, loadHelper)
</span><del>- if GGC
- loadisFromInstruction(valueOperand, t1)
- loadConstantOrVariableTag(t1, t0)
- bineq t0, CellTag, .writeBarrierDone
</del><ins>+ loadisFromInstruction(valueOperand, t1)
+ loadConstantOrVariableTag(t1, t0)
+ bineq t0, CellTag, .writeBarrierDone
</ins><span class="cx">
</span><del>- loadHelper(t3)
-
- skipIfIsRememberedOrInEden(t3, t1, t2,
- macro(gcData)
- btbnz gcData, .writeBarrierDone
- push cfr, PC
- # We make two extra slots because cCall2 will poke.
- subp 8, sp
- move cfr, a0
- move t3, a1
- cCall2Void(_llint_write_barrier_slow)
- addp 8, sp
- pop PC, cfr
- end
- )
- .writeBarrierDone:
- end
</del><ins>+ loadHelper(t3)
+
+ skipIfIsRememberedOrInEden(t3, t1, t2,
+ macro(gcData)
+ btbnz gcData, .writeBarrierDone
+ push cfr, PC
+ # We make two extra slots because cCall2 will poke.
+ subp 8, sp
+ move cfr, a0
+ move t3, a1
+ cCall2Void(_llint_write_barrier_slow)
+ addp 8, sp
+ pop PC, cfr
+ end
+ )
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnGlobalObject(valueOperand)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -398,53 +398,47 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnOperand(cellOperand)
</span><del>- if GGC
- loadisFromInstruction(cellOperand, t1)
- loadConstantOrVariableCell(t1, t2, .writeBarrierDone)
- skipIfIsRememberedOrInEden(t2, t1, t3,
- macro(gcData)
- btbnz gcData, .writeBarrierDone
- push PB, PC
- move t2, a1 # t2 can be a0 (not on 64 bits, but better safe than sorry)
- move cfr, a0
- cCall2Void(_llint_write_barrier_slow)
- pop PC, PB
- end
- )
- .writeBarrierDone:
- end
</del><ins>+ loadisFromInstruction(cellOperand, t1)
+ loadConstantOrVariableCell(t1, t2, .writeBarrierDone)
+ skipIfIsRememberedOrInEden(t2, t1, t3,
+ macro(gcData)
+ btbnz gcData, .writeBarrierDone
+ push PB, PC
+ move t2, a1 # t2 can be a0 (not on 64 bits, but better safe than sorry)
+ move cfr, a0
+ cCall2Void(_llint_write_barrier_slow)
+ pop PC, PB
+ end
+ )
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnOperands(cellOperand, valueOperand)
</span><del>- if GGC
- loadisFromInstruction(valueOperand, t1)
- loadConstantOrVariableCell(t1, t0, .writeBarrierDone)
- btpz t0, .writeBarrierDone
-
- writeBarrierOnOperand(cellOperand)
- .writeBarrierDone:
- end
</del><ins>+ loadisFromInstruction(valueOperand, t1)
+ loadConstantOrVariableCell(t1, t0, .writeBarrierDone)
+ btpz t0, .writeBarrierDone
+
+ writeBarrierOnOperand(cellOperand)
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnGlobal(valueOperand, loadHelper)
</span><del>- if GGC
- loadisFromInstruction(valueOperand, t1)
- loadConstantOrVariableCell(t1, t0, .writeBarrierDone)
- btpz t0, .writeBarrierDone
-
- loadHelper(t3)
- skipIfIsRememberedOrInEden(t3, t1, t2,
- macro(gcData)
- btbnz gcData, .writeBarrierDone
- push PB, PC
- move cfr, a0
- move t3, a1
- cCall2Void(_llint_write_barrier_slow)
- pop PC, PB
- end
- )
- .writeBarrierDone:
- end
</del><ins>+ loadisFromInstruction(valueOperand, t1)
+ loadConstantOrVariableCell(t1, t0, .writeBarrierDone)
+ btpz t0, .writeBarrierDone
+
+ loadHelper(t3)
+ skipIfIsRememberedOrInEden(t3, t1, t2,
+ macro(gcData)
+ btbnz gcData, .writeBarrierDone
+ push PB, PC
+ move cfr, a0
+ move t3, a1
+ cCall2Void(_llint_write_barrier_slow)
+ pop PC, PB
+ end
+ )
+.writeBarrierDone:
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro writeBarrierOnGlobalObject(valueOperand)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/WTF/ChangeLog 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-09-22 Filip Pizlo <fpizlo@apple.com>
+
+ Get rid of ENABLE(GGC)
+ https://bugs.webkit.org/show_bug.cgi?id=149472
+
+ Reviewed by Mark Hahnenberg and Mark Lam.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2015-09-21 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Always use the compiler's CAS implementation and get rid of ENABLE(COMPARE_AND_SWAP)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/WTF/wtf/Platform.h 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -781,15 +781,6 @@
</span><span class="cx"> #define ENABLE_FTL_JIT 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* Generational collector for JSC */
-#if !defined(ENABLE_GGC)
-#if CPU(X86_64) || CPU(X86) || CPU(ARM64) || CPU(ARM)
-#define ENABLE_GGC 1
-#else
-#define ENABLE_GGC 0
-#endif /* CPU(X86_64) || CPU(X86) || CPU(ARM64) || CPU(ARM) */
-#endif /* !defined(ENABLE_GGC) */
-
</del><span class="cx"> /* Counts uses of write barriers using sampling counters. Be sure to also
</span><span class="cx"> set ENABLE_SAMPLING_COUNTERS to 1. */
</span><span class="cx"> #if !defined(ENABLE_WRITE_BARRIER_PROFILING)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/WebCore/ChangeLog 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-09-22 Filip Pizlo <fpizlo@apple.com>
+
+ Get rid of ENABLE(GGC)
+ https://bugs.webkit.org/show_bug.cgi?id=149472
+
+ Reviewed by Mark Hahnenberg and Mark Lam.
+
+ No new tests because no new behavior.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonVM):
+
</ins><span class="cx"> 2015-09-22 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it more obvious when using an unaccelerated image buffer, and fix a few callers who do
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (190128 => 190129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-09-22 19:33:07 UTC (rev 190128)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-09-22 20:01:15 UTC (rev 190129)
</span><span class="lines">@@ -206,11 +206,8 @@
</span><span class="cx"> vm->setExclusiveThread(std::this_thread::get_id());
</span><span class="cx"> #else
</span><span class="cx"> vm->heap.setFullActivityCallback(WebSafeFullGCActivityCallback::create(&vm->heap));
</span><del>-#if ENABLE(GGC)
</del><span class="cx"> vm->heap.setEdenActivityCallback(WebSafeEdenGCActivityCallback::create(&vm->heap));
</span><del>-#else
- vm->heap.setEdenActivityCallback(vm->heap.fullActivityCallback());
-#endif
</del><ins>+
</ins><span class="cx"> vm->heap.setIncrementalSweeper(std::make_unique<WebSafeIncrementalSweeper>(&vm->heap));
</span><span class="cx"> vm->heap.machineThreads().addCurrentThread();
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>