<!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>[162393] trunk/Source/JavaScriptCore</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/162393">162393</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-20 17:10:29 -0800 (Mon, 20 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>JSC Parser: Shrink BindingNode.
&lt;https://webkit.org/b/127253&gt;

The &quot;divot&quot; and &quot;end&quot; source locations are always identical for
BindingNodes, so store only &quot;start&quot; and &quot;end&quot; instead.

1.19 MB progression on Membuster3.

Reviewed by Geoff Garen.

* bytecompiler/NodesCodegen.cpp:
(JSC::BindingNode::bindValue):
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createBindingLocation):
* parser/NodeConstructors.h:
(JSC::BindingNode::create):
(JSC::BindingNode::BindingNode):
* parser/Nodes.h:
(JSC::BindingNode::divotStart):
(JSC::BindingNode::divotEnd):
* parser/Parser.cpp:
(JSC::Parser&lt;LexerType&gt;::createBindingPattern):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::operatorStackPop):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodeConstructorsh">trunk/Source/JavaScriptCore/parser/NodeConstructors.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-19  Andreas Kling  &lt;akling@apple.com&gt;
+
+        JSC Parser: Shrink BindingNode.
+        &lt;https://webkit.org/b/127253&gt;
+
+        The &quot;divot&quot; and &quot;end&quot; source locations are always identical for
+        BindingNodes, so store only &quot;start&quot; and &quot;end&quot; instead.
+
+        1.19 MB progression on Membuster3.
+
+        Reviewed by Geoff Garen.
+
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::BindingNode::bindValue):
+        * parser/ASTBuilder.h:
+        (JSC::ASTBuilder::createBindingLocation):
+        * parser/NodeConstructors.h:
+        (JSC::BindingNode::create):
+        (JSC::BindingNode::BindingNode):
+        * parser/Nodes.h:
+        (JSC::BindingNode::divotStart):
+        (JSC::BindingNode::divotEnd):
+        * parser/Parser.cpp:
+        (JSC::Parser&lt;LexerType&gt;::createBindingPattern):
+        * parser/SyntaxChecker.h:
+        (JSC::SyntaxChecker::operatorStackPop):
+
</ins><span class="cx"> 2014-01-20  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         op_captured_mov and op_new_captured_func in UnlinkedCodeBlocks should use the IdentifierMap instead of the strings directly
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -2475,9 +2475,9 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx">     if (generator.isStrictMode())
</span><del>-        generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</del><ins>+        generator.emitExpressionInfo(divotEnd(), divotStart(), divotEnd());
</ins><span class="cx">     RegisterID* scope = generator.emitResolveScope(generator.newTemporary(), m_boundProperty);
</span><del>-    generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</del><ins>+    generator.emitExpressionInfo(divotEnd(), divotStart(), divotEnd());
</ins><span class="cx">     generator.emitPutToScope(scope, m_boundProperty, value, generator.isStrictMode() ? ThrowIfNotFound : DoNotThrowIfNotFound);
</span><span class="cx">     return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -674,9 +674,9 @@
</span><span class="cx">         node-&gt;appendEntry(location, identifier, wasString, pattern.get());
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    BindingPattern createBindingLocation(const JSTokenLocation&amp;, const Identifier&amp; boundProperty, const JSTextPosition&amp; divot, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</del><ins>+    BindingPattern createBindingLocation(const JSTokenLocation&amp;, const Identifier&amp; boundProperty, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</ins><span class="cx">     {
</span><del>-        return BindingNode::create(m_vm, boundProperty, divot, start, end);
</del><ins>+        return BindingNode::create(m_vm, boundProperty, start, end);
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodeConstructorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/NodeConstructors.h (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/NodeConstructors.h        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/parser/NodeConstructors.h        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -888,14 +888,15 @@
</span><span class="cx">         return adoptRef(new ObjectPatternNode(vm));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    inline PassRefPtr&lt;BindingNode&gt; BindingNode::create(VM* vm, const Identifier&amp; boundProperty, const JSTextPosition&amp; divot, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</del><ins>+    inline PassRefPtr&lt;BindingNode&gt; BindingNode::create(VM* vm, const Identifier&amp; boundProperty, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</ins><span class="cx">     {
</span><del>-        return adoptRef(new BindingNode(vm, boundProperty, divot, start, end));
</del><ins>+        return adoptRef(new BindingNode(vm, boundProperty, start, end));
</ins><span class="cx">     }
</span><span class="cx">     
</span><del>-    inline BindingNode::BindingNode(VM* vm, const Identifier&amp; boundProperty, const JSTextPosition&amp; divot, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</del><ins>+    inline BindingNode::BindingNode(VM* vm, const Identifier&amp; boundProperty, const JSTextPosition&amp; start, const JSTextPosition&amp; end)
</ins><span class="cx">         : DeconstructionPatternNode(vm)
</span><del>-        , ThrowableExpressionData(divot, start, end)
</del><ins>+        , m_divotStart(start)
+        , m_divotEnd(end)
</ins><span class="cx">         , m_boundProperty(boundProperty)
</span><span class="cx">     {
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -1641,20 +1641,25 @@
</span><span class="cx">         Vector&lt;Entry&gt; m_targetPatterns;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    class BindingNode : public DeconstructionPatternNode, ThrowableExpressionData {
</del><ins>+    class BindingNode : public DeconstructionPatternNode {
</ins><span class="cx">     public:
</span><del>-        static PassRefPtr&lt;BindingNode&gt; create(VM*, const Identifier&amp; boundProperty, const JSTextPosition&amp; divot, const JSTextPosition&amp; start, const JSTextPosition&amp; end);
</del><ins>+        static PassRefPtr&lt;BindingNode&gt; create(VM*, const Identifier&amp; boundProperty, const JSTextPosition&amp; start, const JSTextPosition&amp; end);
</ins><span class="cx">         const Identifier&amp; boundProperty() const { return m_boundProperty; }
</span><ins>+
+        const JSTextPosition&amp; divotStart() const { return m_divotStart; }
+        const JSTextPosition&amp; divotEnd() const { return m_divotEnd; }
</ins><span class="cx">         
</span><span class="cx">     private:
</span><del>-        BindingNode(VM*, const Identifier&amp; boundProperty, const JSTextPosition&amp; divot, const JSTextPosition&amp; start, const JSTextPosition&amp; end);
</del><ins>+        BindingNode(VM*, const Identifier&amp; boundProperty, const JSTextPosition&amp; start, const JSTextPosition&amp; end);
</ins><span class="cx"> 
</span><span class="cx">         virtual void collectBoundIdentifiers(Vector&lt;Identifier&gt;&amp;) const override;
</span><span class="cx">         virtual void bindValue(BytecodeGenerator&amp;, RegisterID*) const override;
</span><span class="cx">         virtual void toString(StringBuilder&amp;) const override;
</span><span class="cx">         
</span><span class="cx">         virtual bool isBindingNode() const override { return true; }
</span><del>-        
</del><ins>+
+        JSTextPosition m_divotStart;
+        JSTextPosition m_divotEnd;
</ins><span class="cx">         Identifier m_boundProperty;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">     }
</span><del>-    return context.createBindingLocation(m_token.m_location, name, m_token.m_endPosition, m_token.m_startPosition, m_token.m_endPosition);
</del><ins>+    return context.createBindingLocation(m_token.m_location, name, m_token.m_startPosition, m_token.m_endPosition);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template &lt;typename LexerType&gt;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (162392 => 162393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h        2014-01-21 01:04:43 UTC (rev 162392)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h        2014-01-21 01:10:29 UTC (rev 162393)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">     void appendObjectPatternEntry(ArrayPattern, const JSTokenLocation&amp;, bool, const Identifier&amp;, DeconstructionPattern)
</span><span class="cx">     {
</span><span class="cx">     }
</span><del>-    DeconstructionPattern createBindingLocation(const JSTokenLocation&amp;, const Identifier&amp;, const JSTextPosition&amp;, const JSTextPosition&amp;, const JSTextPosition&amp;)
</del><ins>+    DeconstructionPattern createBindingLocation(const JSTokenLocation&amp;, const Identifier&amp;, const JSTextPosition&amp;, const JSTextPosition&amp;)
</ins><span class="cx">     {
</span><span class="cx">         return 1;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>