<!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>[164911] 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/164911">164911</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-28 22:13:09 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Caller saved registers can be accidentally discarded when clearing the local stack
https://bugs.webkit.org/show_bug.cgi?id=129532
Reviewed by Andreas Kling.
Source/WebCore:
Tests: fast/selectors/tree-modifying-case-insensitive-selectors.html
fast/selectors/tree-modifying-selectors.html
StackAllocator::discard() no longer make sense now that we can use caller saved regsiter.
We should instead discard everything up to the beginning of the local stack.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
* cssjit/StackAllocator.h:
(WebCore::StackAllocator::popAndDiscardUpTo):
LayoutTests:
* fast/selectors/tree-modifying-case-insensitive-selectors.html: Added.
* fast/selectors/tree-modifying-selectors.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastselectorstreemodifyingcaseinsensitiveselectorsexpectedtxt">trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorstreemodifyingcaseinsensitiveselectorshtml">trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors.html</a></li>
<li><a href="#trunkLayoutTestsfastselectorstreemodifyingselectorsexpectedtxt">trunk/LayoutTests/fast/selectors/tree-modifying-selectors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastselectorstreemodifyingselectorshtml">trunk/LayoutTests/fast/selectors/tree-modifying-selectors.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164910 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-01 05:36:01 UTC (rev 164910)
+++ trunk/LayoutTests/ChangeLog 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-28 Benjamin Poulain <benjamin@webkit.org>
+
+ Caller saved registers can be accidentally discarded when clearing the local stack
+ https://bugs.webkit.org/show_bug.cgi?id=129532
+
+ Reviewed by Andreas Kling.
+
+ * fast/selectors/tree-modifying-case-insensitive-selectors.html: Added.
+ * fast/selectors/tree-modifying-selectors.html: Added.
+
</ins><span class="cx"> 2014-02-28 Adenilson Cavalcanti <cavalcantii@gmail.com>
</span><span class="cx">
</span><span class="cx"> Filters should test for area instead of single dimension
</span></span></pre></div>
<a id="trunkLayoutTestsfastselectorstreemodifyingcaseinsensitiveselectorsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors-expected.txt (0 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors-expected.txt 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Some rules modify tree properties on matching. This test the robustness of complex selectors of that type for attribute value matching that requires case insensitive match.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Adjacent relations (tree modifiers), no descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target1")).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.querySelectorAll("[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] ol>li")[0]).backgroundColor is "rgb(1, 2, 3)"
+
+Adjacent relations (tree modifiers), deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.querySelectorAll("[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] div>ol>li span")[0]).backgroundColor is "rgb(4, 5, 6)"
+
+Adjacent relations (tree modifiers) in deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target1")).color is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.querySelectorAll("div[style='display:none']>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div ol>li")[0]).color is "rgb(1, 2, 3)"
+
+Adjacent backtracking, deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.querySelectorAll("div[style='display:none']>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div>ol span")[0]).backgroundColor is "rgb(4, 5, 6)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorstreemodifyingcaseinsensitiveselectorshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors.html (0 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/tree-modifying-case-insensitive-selectors.html 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] ol>li {
+ background-color:rgb(1,2,3);
+}
+[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] div>ol>li span {
+ background-color:rgb(4,5,6);
+}
+div[style="display:none"]>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div ol>li {
+ color:rgb(1,2,3);
+}
+div[style="display:none"]>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div>ol span {
+ color:rgb(4,5,6);
+}
+</style>
+</head>
+<body>
+<div style="display:none">
+ <!-- Mutli-attribute siblings matching. -->
+ <div charset=First align=Root></div>
+ <div align=root></div>
+ <div charset=first></div>
+ <div charset=Second align=First-sibling></div>
+ <div charset=second></div>
+ <div align=first-sibing></div>
+ <div charset=Third align=Second-sibling>
+ <div>
+ <ul>
+ <li></li>
+ </ul>
+ <ol>
+ <li id=target1><span id=target2></span></li>
+ </ol>
+ </div>
+ </div>
+</div>
+</body>
+<script>
+description('Some rules modify tree properties on matching. This test the robustness of complex selectors of that type for attribute value matching that requires case insensitive match.');
+
+debug("Adjacent relations (tree modifiers), no descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).backgroundColor', 'rgb(1, 2, 3)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] ol>li")[0]).backgroundColor', 'rgb(1, 2, 3)');
+
+debug("<br>Adjacent relations (tree modifiers), deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(4, 5, 6)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling] div>ol>li span")[0]).backgroundColor', 'rgb(4, 5, 6)');
+
+debug("<br>Adjacent relations (tree modifiers) in deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).color', 'rgb(1, 2, 3)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("div[style=\'display:none\']>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div ol>li")[0]).color', 'rgb(1, 2, 3)');
+
+debug("<br>Adjacent backtracking, deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(4, 5, 6)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("div[style=\'display:none\']>[charset=first][align=root]~[charset=second][align=first-sibling]~[charset=third][align=second-sibling]>div>ol span")[0]).backgroundColor', 'rgb(4, 5, 6)');
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorstreemodifyingselectorsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/tree-modifying-selectors-expected.txt (0 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/tree-modifying-selectors-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/selectors/tree-modifying-selectors-expected.txt 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+Some rules modify tree properties on matching. This test the robustness of complex selectors of that type
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Adjacent relations (tree modifiers), no descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target1")).backgroundColor is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.querySelectorAll("[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] ol>li")[0]).backgroundColor is "rgb(1, 2, 3)"
+
+Adjacent relations (tree modifiers), deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.querySelectorAll("[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] div>ol>li span")[0]).backgroundColor is "rgb(4, 5, 6)"
+
+Adjacent relations (tree modifiers) in deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target1")).color is "rgb(1, 2, 3)"
+PASS getComputedStyle(document.querySelectorAll("div[style='display:none']>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div ol>li")[0]).color is "rgb(1, 2, 3)"
+
+Adjacent backtracking, deep descendant backtracking, multi-attribute match.
+PASS getComputedStyle(document.getElementById("target2")).backgroundColor is "rgb(4, 5, 6)"
+PASS getComputedStyle(document.querySelectorAll("div[style='display:none']>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div>ol span")[0]).backgroundColor is "rgb(4, 5, 6)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastselectorstreemodifyingselectorshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/selectors/tree-modifying-selectors.html (0 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/selectors/tree-modifying-selectors.html (rev 0)
+++ trunk/LayoutTests/fast/selectors/tree-modifying-selectors.html 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] ol>li {
+ background-color:rgb(1,2,3);
+}
+[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] div>ol>li span {
+ background-color:rgb(4,5,6);
+}
+div[style="display:none"]>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div ol>li {
+ color:rgb(1,2,3);
+}
+div[style="display:none"]>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div>ol span {
+ color:rgb(4,5,6);
+}
+</style>
+</head>
+<body>
+<div style="display:none">
+ <!-- Mutli-attribute siblings matching. -->
+ <div data-a=first data-b=root></div>
+ <div data-b=root></div>
+ <div data-a=first></div>
+ <div data-a=second data-b=first-sibling></div>
+ <div data-a=second></div>
+ <div data-b=first-sibing></div>
+ <div data-a=third data-b=second-sibling>
+ <div>
+ <ul>
+ <li></li>
+ </ul>
+ <ol>
+ <li id=target1><span id=target2></span></li>
+ </ol>
+ </div>
+ </div>
+</div>
+</body>
+<script>
+description('Some rules modify tree properties on matching. This test the robustness of complex selectors of that type');
+
+debug("Adjacent relations (tree modifiers), no descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).backgroundColor', 'rgb(1, 2, 3)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] ol>li")[0]).backgroundColor', 'rgb(1, 2, 3)');
+
+debug("<br>Adjacent relations (tree modifiers), deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(4, 5, 6)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling] div>ol>li span")[0]).backgroundColor', 'rgb(4, 5, 6)');
+
+debug("<br>Adjacent relations (tree modifiers) in deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target1")).color', 'rgb(1, 2, 3)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("div[style=\'display:none\']>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div ol>li")[0]).color', 'rgb(1, 2, 3)');
+
+debug("<br>Adjacent backtracking, deep descendant backtracking, multi-attribute match.");
+shouldBeEqualToString('getComputedStyle(document.getElementById("target2")).backgroundColor', 'rgb(4, 5, 6)');
+shouldBeEqualToString('getComputedStyle(document.querySelectorAll("div[style=\'display:none\']>[data-a=first][data-b=root]~[data-a=second][data-b=first-sibling]~[data-a=third][data-b=second-sibling]>div>ol span")[0]).backgroundColor', 'rgb(4, 5, 6)');
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164910 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-01 05:36:01 UTC (rev 164910)
+++ trunk/Source/WebCore/ChangeLog 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-28 Benjamin Poulain <benjamin@webkit.org>
+
+ Caller saved registers can be accidentally discarded when clearing the local stack
+ https://bugs.webkit.org/show_bug.cgi?id=129532
+
+ Reviewed by Andreas Kling.
+
+ Tests: fast/selectors/tree-modifying-case-insensitive-selectors.html
+ fast/selectors/tree-modifying-selectors.html
+
+ StackAllocator::discard() no longer make sense now that we can use caller saved regsiter.
+ We should instead discard everything up to the beginning of the local stack.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
+ * cssjit/StackAllocator.h:
+ (WebCore::StackAllocator::popAndDiscardUpTo):
+
</ins><span class="cx"> 2014-02-28 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] FrameLoader has a NULL m_progressTracker when initialized with initForSynthesizedDocument()
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (164910 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-03-01 05:36:01 UTC (rev 164910)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -698,7 +698,7 @@
</span><span class="cx"> Assembler::Jump skipFailureCase = m_assembler.jump();
</span><span class="cx">
</span><span class="cx"> failureCases.link(&m_assembler);
</span><del>- failureStack.discard();
</del><ins>+ failureStack.popAndDiscardUpTo(m_checkingContextStackReference);
</ins><span class="cx"> m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
</span><span class="cx">
</span><span class="cx"> skipFailureCase.link(&m_assembler);
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitStackAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/StackAllocator.h (164910 => 164911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/StackAllocator.h 2014-03-01 05:36:01 UTC (rev 164910)
+++ trunk/Source/WebCore/cssjit/StackAllocator.h 2014-03-01 06:13:09 UTC (rev 164911)
</span><span class="lines">@@ -84,6 +84,16 @@
</span><span class="cx"> m_offsetFromTop -= 8;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void popAndDiscardUpTo(StackReference stackReference)
+ {
+ unsigned positionBeforeStackReference = stackReference - 8;
+ RELEASE_ASSERT(positionBeforeStackReference < m_offsetFromTop);
+
+ unsigned stackDelta = m_offsetFromTop - positionBeforeStackReference;
+ m_assembler.addPtr(JSC::MacroAssembler::TrustedImm32(stackDelta), JSC::MacroAssembler::stackPointerRegister);
+ m_offsetFromTop -= stackDelta;
+ }
+
</ins><span class="cx"> void alignStackPreFunctionCall()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_hasFunctionCallPadding);
</span><span class="lines">@@ -102,13 +112,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void discard()
- {
- if (m_offsetFromTop)
- m_assembler.addPtr(JSC::MacroAssembler::TrustedImm32(m_offsetFromTop), JSC::MacroAssembler::stackPointerRegister);
- m_offsetFromTop = 0;
- }
-
</del><span class="cx"> void merge(StackAllocator&& stackA, StackAllocator&& stackB)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(stackA.m_offsetFromTop == stackB.m_offsetFromTop);
</span></span></pre>
</div>
</div>
</body>
</html>