<!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>[178918] 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/178918">178918</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-22 10:07:16 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>PropertyListNode::emitNode duplicates the code to put a constant property
https://bugs.webkit.org/show_bug.cgi?id=140761
Reviewed by Geoffrey Garen.
Extracted PropertyListNode::emitPutConstantProperty to share the code.
Also made PropertyListNode::emitBytecode private since nobody is calling this function directly.
* bytecompiler/NodesCodegen.cpp:
(JSC::PropertyListNode::emitBytecode):
(JSC::PropertyListNode::emitPutConstantProperty): Added.
* parser/Nodes.h:</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="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178917 => 178918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 17:59:08 UTC (rev 178917)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-22 18:07:16 UTC (rev 178918)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ PropertyListNode::emitNode duplicates the code to put a constant property
+ https://bugs.webkit.org/show_bug.cgi?id=140761
+
+ Reviewed by Geoffrey Garen.
+
+ Extracted PropertyListNode::emitPutConstantProperty to share the code.
+
+ Also made PropertyListNode::emitBytecode private since nobody is calling this function directly.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::PropertyListNode::emitBytecode):
+ (JSC::PropertyListNode::emitPutConstantProperty): Added.
+ * parser/Nodes.h:
+
</ins><span class="cx"> 2015-01-22 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> put_by_val_direct need to check the property is index or not for using putDirect / putDirectIndex
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (178917 => 178918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-01-22 17:59:08 UTC (rev 178917)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-01-22 18:07:16 UTC (rev 178918)
</span><span class="lines">@@ -291,14 +291,8 @@
</span><span class="cx">
</span><span class="cx"> // Fast case: this loop just handles regular value properties.
</span><span class="cx"> PropertyListNode* p = this;
</span><del>- for (; p && p->m_node->m_type == PropertyNode::Constant; p = p->m_next) {
- if (p->m_node->m_name) {
- generator.emitDirectPutById(newObj.get(), *p->m_node->name(), generator.emitNode(p->m_node->m_assign));
- continue;
- }
- RefPtr<RegisterID> propertyName = generator.emitNode(p->m_node->m_expression);
- generator.emitDirectPutByVal(newObj.get(), propertyName.get(), generator.emitNode(p->m_node->m_assign));
- }
</del><ins>+ for (; p && p->m_node->m_type == PropertyNode::Constant; p = p->m_next)
+ emitPutConstantProperty(generator, newObj.get(), *p->m_node);
</ins><span class="cx">
</span><span class="cx"> // Were there any get/set properties?
</span><span class="cx"> if (p) {
</span><span class="lines">@@ -324,15 +318,10 @@
</span><span class="cx">
</span><span class="cx"> // Handle regular values.
</span><span class="cx"> if (node->m_type == PropertyNode::Constant) {
</span><del>- if (node->name()) {
- generator.emitDirectPutById(newObj.get(), *node->name(), generator.emitNode(node->m_assign));
- continue;
- }
- RefPtr<RegisterID> propertyName = generator.emitNode(p->m_node->m_expression);
- generator.emitDirectPutByVal(newObj.get(), propertyName.get(), generator.emitNode(p->m_node->m_assign));
</del><ins>+ emitPutConstantProperty(generator, newObj.get(), *node);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> RegisterID* value = generator.emitNode(node->m_assign);
</span><span class="cx">
</span><span class="cx"> // This is a get/set property, find its entry in the map.
</span><span class="lines">@@ -377,6 +366,16 @@
</span><span class="cx"> return generator.moveToDestinationIfNeeded(dst, newObj.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PropertyListNode::emitPutConstantProperty(BytecodeGenerator& generator, RegisterID* newObj, PropertyNode& node)
+{
+ if (node.name()) {
+ generator.emitDirectPutById(newObj, *node.name(), generator.emitNode(node.m_assign));
+ return;
+ }
+ RefPtr<RegisterID> propertyName = generator.emitNode(node.m_expression);
+ generator.emitDirectPutByVal(newObj, propertyName.get(), generator.emitNode(node.m_assign));
+}
+
</ins><span class="cx"> // ------------------------------ BracketAccessorNode --------------------------------
</span><span class="cx">
</span><span class="cx"> RegisterID* BracketAccessorNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (178917 => 178918)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-01-22 17:59:08 UTC (rev 178917)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-01-22 18:07:16 UTC (rev 178918)
</span><span class="lines">@@ -504,9 +504,10 @@
</span><span class="cx"> PropertyListNode(const JSTokenLocation&, PropertyNode*);
</span><span class="cx"> PropertyListNode(const JSTokenLocation&, PropertyNode*, PropertyListNode*);
</span><span class="cx">
</span><ins>+ private:
</ins><span class="cx"> virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
</span><ins>+ void emitPutConstantProperty(BytecodeGenerator&, RegisterID*, PropertyNode&);
</ins><span class="cx">
</span><del>- private:
</del><span class="cx"> PropertyNode* m_node;
</span><span class="cx"> PropertyListNode* m_next;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>