<!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>[166834] trunk/Source/WebCore</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/166834">166834</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-05 12:31:58 -0700 (Sat, 05 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use preallocated stack reference to store adjacentBacktrackingStart
https://bugs.webkit.org/show_bug.cgi?id=131237
Patch by Yusuke Suzuki <utatane.tea@gmail.com> on 2014-04-05
Reviewed by Benjamin Poulain.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateDirectAdjacentTreeWalker):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateAdjacentBacktrackingTail):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateBacktrackingTailsIfNeeded):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateWalkToPreviousAdjacent): Deleted.
(WebCore::SelectorCompiler::SelectorCodeGenerator::linkFailures): Deleted.
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateDescendantBacktrackingTail): Deleted.
* cssjit/StackAllocator.h:
(WebCore::StackAllocator::allocateUninitialized):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecssjitStackAllocatorh">trunk/Source/WebCore/cssjit/StackAllocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166833 => 166834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-05 13:52:11 UTC (rev 166833)
+++ trunk/Source/WebCore/ChangeLog 2014-04-05 19:31:58 UTC (rev 166834)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-05 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Use preallocated stack reference to store adjacentBacktrackingStart
+ https://bugs.webkit.org/show_bug.cgi?id=131237
+
+ Reviewed by Benjamin Poulain.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::computeBacktrackingInformation):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateDirectAdjacentTreeWalker):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateAdjacentBacktrackingTail):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateBacktrackingTailsIfNeeded):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateWalkToPreviousAdjacent): Deleted.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::linkFailures): Deleted.
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateDescendantBacktrackingTail): Deleted.
+ * cssjit/StackAllocator.h:
+ (WebCore::StackAllocator::allocateUninitialized):
+
</ins><span class="cx"> 2014-04-05 Jeongeun Kim <je_julie.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> bad values from HTMLImageElement x and y attributes (CSSOM-View)
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (166833 => 166834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-05 13:52:11 UTC (rev 166833)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-05 19:31:58 UTC (rev 166834)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> void markParentElementIfResolvingStyle(JSC::FunctionPtr);
</span><span class="cx">
</span><span class="cx"> void linkFailures(Assembler::JumpList& globalFailureCases, BacktrackingAction, Assembler::JumpList& localFailureCases);
</span><del>- void generateAdjacentBacktrackingTail(Assembler::JumpList& failureCases);
</del><ins>+ void generateAdjacentBacktrackingTail();
</ins><span class="cx"> void generateDescendantBacktrackingTail();
</span><span class="cx"> void generateBacktrackingTailsIfNeeded(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><span class="cx">
</span><span class="lines">@@ -195,6 +195,7 @@
</span><span class="cx"> SelectorContext m_selectorContext;
</span><span class="cx"> FunctionType m_functionType;
</span><span class="cx"> SelectorFragmentList m_selectorFragments;
</span><ins>+ bool m_needsAdjacentBacktrackingStart;
</ins><span class="cx">
</span><span class="cx"> StackAllocator::StackReference m_checkingContextStackReference;
</span><span class="cx">
</span><span class="lines">@@ -326,6 +327,7 @@
</span><span class="cx"> : m_stackAllocator(m_assembler)
</span><span class="cx"> , m_selectorContext(selectorContext)
</span><span class="cx"> , m_functionType(FunctionType::SimpleSelectorChecker)
</span><ins>+ , m_needsAdjacentBacktrackingStart(false)
</ins><span class="cx"> #if CSS_SELECTOR_JIT_DEBUGGING
</span><span class="cx"> , m_originalSelector(rootSelector)
</span><span class="cx"> #endif
</span><span class="lines">@@ -634,8 +636,10 @@
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::IndirectAdjacentEntryPoint;
</span><span class="cx"> if (fragment.relationToLeftFragment != FragmentRelation::Descendant && fragment.relationToRightFragment == FragmentRelation::Child && isFirstAncestor(ancestorPositionSinceDescendantRelation))
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::SaveDescendantBacktrackingStart;
</span><del>- if (fragment.relationToLeftFragment == FragmentRelation::DirectAdjacent && fragment.relationToRightFragment == FragmentRelation::DirectAdjacent && isFirstAdjacent(adjacentPositionSinceIndirectAdjacentTreeWalk))
</del><ins>+ if (fragment.relationToLeftFragment == FragmentRelation::DirectAdjacent && fragment.relationToRightFragment == FragmentRelation::DirectAdjacent && isFirstAdjacent(adjacentPositionSinceIndirectAdjacentTreeWalk)) {
</ins><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::SaveAdjacentBacktrackingStart;
</span><ins>+ m_needsAdjacentBacktrackingStart = true;
+ }
</ins><span class="cx"> if (fragment.relationToLeftFragment != FragmentRelation::DirectAdjacent && needsAdjacentTail) {
</span><span class="cx"> ASSERT(fragment.relationToRightFragment == FragmentRelation::DirectAdjacent);
</span><span class="cx"> fragment.backtrackingFlags |= BacktrackingFlag::DirectAdjacentTail;
</span><span class="lines">@@ -663,6 +667,9 @@
</span><span class="cx"> if (m_functionType == FunctionType::SelectorCheckerWithCheckingContext)
</span><span class="cx"> m_checkingContextStackReference = m_stackAllocator.push(checkingContextRegister);
</span><span class="cx">
</span><ins>+ if (m_needsAdjacentBacktrackingStart)
+ m_adjacentBacktrackingStart = m_stackAllocator.allocateUninitialized();
+
</ins><span class="cx"> Assembler::JumpList failureCases;
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < m_selectorFragments.size(); ++i) {
</span><span class="lines">@@ -690,26 +697,31 @@
</span><span class="cx"> m_registerAllocator.deallocateRegister(elementAddressRegister);
</span><span class="cx">
</span><span class="cx"> if (m_functionType == FunctionType::SimpleSelectorChecker) {
</span><del>- // Success.
- m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
- if (!reservedCalleeSavedRegisters)
</del><ins>+ if (!m_needsAdjacentBacktrackingStart && !reservedCalleeSavedRegisters) {
+ // Success.
+ m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
</ins><span class="cx"> m_assembler.ret();
</span><span class="cx">
</span><del>- // Failure.
- if (!failureCases.empty()) {
- Assembler::Jump skipFailureCase;
- if (reservedCalleeSavedRegisters)
- skipFailureCase = m_assembler.jump();
</del><ins>+ // Failure.
+ if (!failureCases.empty()) {
+ failureCases.link(&m_assembler);
+ m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
+ m_assembler.ret();
+ }
+ } else {
+ // Success.
+ m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
</ins><span class="cx">
</span><del>- failureCases.link(&m_assembler);
- m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
</del><ins>+ // Failure.
+ if (!failureCases.empty()) {
+ Assembler::Jump skipFailureCase = m_assembler.jump();
+ failureCases.link(&m_assembler);
+ m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
+ skipFailureCase.link(&m_assembler);
+ }
</ins><span class="cx">
</span><del>- if (!reservedCalleeSavedRegisters)
- m_assembler.ret();
- else
- skipFailureCase.link(&m_assembler);
- }
- if (reservedCalleeSavedRegisters) {
</del><ins>+ if (m_needsAdjacentBacktrackingStart)
+ m_stackAllocator.popAndDiscardUpTo(m_adjacentBacktrackingStart);
</ins><span class="cx"> m_registerAllocator.restoreCalleeSavedRegisters(m_stackAllocator);
</span><span class="cx"> m_assembler.ret();
</span><span class="cx"> }
</span><span class="lines">@@ -830,8 +842,10 @@
</span><span class="cx"> generateElementMatching(matchingFailureCases, fragment);
</span><span class="cx"> linkFailures(failureCases, fragment.matchingBacktrackingAction, matchingFailureCases);
</span><span class="cx">
</span><del>- if (fragment.backtrackingFlags & BacktrackingFlag::SaveAdjacentBacktrackingStart)
- m_adjacentBacktrackingStart = m_stackAllocator.push(elementAddressRegister);
</del><ins>+ if (fragment.backtrackingFlags & BacktrackingFlag::SaveAdjacentBacktrackingStart) {
+ unsigned offsetToAdjacentBacktrackingStart = m_stackAllocator.offsetToStackReference(m_adjacentBacktrackingStart);
+ m_assembler.storePtr(elementAddressRegister, Assembler::Address(Assembler::stackPointerRegister, offsetToAdjacentBacktrackingStart));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateIndirectAdjacentTreeWalker(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="lines">@@ -925,26 +939,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectorCodeGenerator::generateAdjacentBacktrackingTail(Assembler::JumpList& successCases)
</del><ins>+void SelectorCodeGenerator::generateAdjacentBacktrackingTail()
</ins><span class="cx"> {
</span><del>- StackAllocator successStack = m_stackAllocator;
- StackAllocator recoveryStack = m_stackAllocator;
- StackAllocator failureStack = m_stackAllocator;
-
- successStack.popAndDiscard(m_adjacentBacktrackingStart);
- successCases.append(m_assembler.jump());
-
</del><span class="cx"> // Recovering tail.
</span><span class="cx"> m_adjacentBacktrackingFailureCases.link(&m_assembler);
</span><span class="cx"> m_adjacentBacktrackingFailureCases.clear();
</span><del>- recoveryStack.pop(m_adjacentBacktrackingStart, elementAddressRegister);
</del><ins>+ unsigned offsetToAdjacentBacktrackingStart = m_stackAllocator.offsetToStackReference(m_adjacentBacktrackingStart);
+ m_assembler.loadPtr(Assembler::Address(Assembler::stackPointerRegister, offsetToAdjacentBacktrackingStart), elementAddressRegister);
</ins><span class="cx"> m_assembler.jump(m_indirectAdjacentEntryPoint);
</span><span class="cx">
</span><span class="cx"> // Total failure tail.
</span><span class="cx"> m_clearAdjacentBacktrackingFailureCases.link(&m_assembler);
</span><del>- failureStack.popAndDiscard(m_adjacentBacktrackingStart);
-
- m_stackAllocator.merge(std::move(successStack), std::move(recoveryStack), std::move(failureStack));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SelectorCodeGenerator::generateDescendantBacktrackingTail()
</span><span class="lines">@@ -959,15 +964,15 @@
</span><span class="cx"> void SelectorCodeGenerator::generateBacktrackingTailsIfNeeded(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="cx"> {
</span><span class="cx"> if (fragment.backtrackingFlags & BacktrackingFlag::DirectAdjacentTail && fragment.backtrackingFlags & BacktrackingFlag::DescendantTail) {
</span><del>- Assembler::JumpList successCases;
- generateAdjacentBacktrackingTail(successCases);
</del><ins>+ Assembler::Jump normalCase = m_assembler.jump();
+ generateAdjacentBacktrackingTail();
</ins><span class="cx"> generateDescendantBacktrackingTail();
</span><del>- successCases.link(&m_assembler);
</del><ins>+ normalCase.link(&m_assembler);
</ins><span class="cx"> } else if (fragment.backtrackingFlags & BacktrackingFlag::DirectAdjacentTail) {
</span><del>- Assembler::JumpList successCases;
- generateAdjacentBacktrackingTail(successCases);
</del><ins>+ Assembler::Jump normalCase = m_assembler.jump();
+ generateAdjacentBacktrackingTail();
</ins><span class="cx"> failureCases.append(m_assembler.jump());
</span><del>- successCases.link(&m_assembler);
</del><ins>+ normalCase.link(&m_assembler);
</ins><span class="cx"> } else if (fragment.backtrackingFlags & BacktrackingFlag::DescendantTail) {
</span><span class="cx"> Assembler::Jump normalCase = m_assembler.jump();
</span><span class="cx"> generateDescendantBacktrackingTail();
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitStackAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/StackAllocator.h (166833 => 166834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/StackAllocator.h 2014-04-05 13:52:11 UTC (rev 166833)
+++ trunk/Source/WebCore/cssjit/StackAllocator.h 2014-04-05 19:31:58 UTC (rev 166834)
</span><span class="lines">@@ -60,6 +60,14 @@
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ StackReference allocateUninitialized()
+ {
+ RELEASE_ASSERT(!m_hasFunctionCallPadding);
+ m_assembler.addPtrNoFlags(JSC::MacroAssembler::TrustedImm32(-8), JSC::MacroAssembler::stackPointerRegister);
+ m_offsetFromTop += 8;
+ return StackReference(m_offsetFromTop);
+ }
+
</ins><span class="cx"> StackReference push(JSC::MacroAssembler::RegisterID registerID)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span></span></pre>
</div>
</div>
</body>
</html>