<!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>[172413] 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/172413">172413</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-08-11 15:00:15 -0700 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-landing <a href="http://trac.webkit.org/projects/webkit/changeset/172401">r172401</a> with fixed test.
<https://webkit.org/b/135782>
Not reviewed.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitGetByVal):
(JSC::BytecodeGenerator::pushIndexedForInScope):
(JSC::BytecodeGenerator::pushStructureForInScope):
* bytecompiler/BytecodeGenerator.h:
(JSC::ForInContext::ForInContext):
(JSC::ForInContext::base):
(JSC::StructureForInContext::StructureForInContext):
(JSC::IndexedForInContext::IndexedForInContext):
* bytecompiler/NodesCodegen.cpp:
(JSC::ForInNode::emitMultiLoopBytecode):
* tests/stress/for-in-tests.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressforintestsjs">trunk/Source/JavaScriptCore/tests/stress/for-in-tests.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172412 => 172413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-11 21:25:34 UTC (rev 172412)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-11 22:00:15 UTC (rev 172413)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-11 Mark Lam <mark.lam@apple.com>
+
+ Re-landing r172401 with fixed test.
+ <https://webkit.org/b/135782>
+
+ Not reviewed.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitGetByVal):
+ (JSC::BytecodeGenerator::pushIndexedForInScope):
+ (JSC::BytecodeGenerator::pushStructureForInScope):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::ForInContext::ForInContext):
+ (JSC::ForInContext::base):
+ (JSC::StructureForInContext::StructureForInContext):
+ (JSC::IndexedForInContext::IndexedForInContext):
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ForInNode::emitMultiLoopBytecode):
+ * tests/stress/for-in-tests.js:
+
</ins><span class="cx"> 2014-08-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172401.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (172412 => 172413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-11 21:25:34 UTC (rev 172412)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-11 22:00:15 UTC (rev 172413)
</span><span class="lines">@@ -1445,6 +1445,9 @@
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = m_forInContextStack.size(); i > 0; i--) {
</span><span class="cx"> ForInContext* context = m_forInContextStack[i - 1].get();
</span><ins>+ if (context->base() != base)
+ continue;
+
</ins><span class="cx"> if (context->local() != property)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -2620,11 +2623,11 @@
</span><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::pushIndexedForInScope(RegisterID* localRegister, RegisterID* indexRegister)
</del><ins>+void BytecodeGenerator::pushIndexedForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
</ins><span class="cx"> {
</span><span class="cx"> if (!localRegister)
</span><span class="cx"> return;
</span><del>- m_forInContextStack.append(std::make_unique<IndexedForInContext>(localRegister, indexRegister));
</del><ins>+ m_forInContextStack.append(std::make_unique<IndexedForInContext>(baseRegister, localRegister, indexRegister));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::popIndexedForInScope(RegisterID* localRegister)
</span><span class="lines">@@ -2634,11 +2637,11 @@
</span><span class="cx"> m_forInContextStack.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::pushStructureForInScope(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
</del><ins>+void BytecodeGenerator::pushStructureForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
</ins><span class="cx"> {
</span><span class="cx"> if (!localRegister)
</span><span class="cx"> return;
</span><del>- m_forInContextStack.append(std::make_unique<StructureForInContext>(localRegister, indexRegister, propertyRegister, enumeratorRegister));
</del><ins>+ m_forInContextStack.append(std::make_unique<StructureForInContext>(baseRegister, localRegister, indexRegister, propertyRegister, enumeratorRegister));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::popStructureForInScope(RegisterID* localRegister)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (172412 => 172413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-11 21:25:34 UTC (rev 172412)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-11 22:00:15 UTC (rev 172413)
</span><span class="lines">@@ -99,8 +99,9 @@
</span><span class="cx">
</span><span class="cx"> class ForInContext {
</span><span class="cx"> public:
</span><del>- ForInContext(RegisterID* localRegister)
- : m_localRegister(localRegister)
</del><ins>+ ForInContext(RegisterID* baseRegister, RegisterID* localRegister)
+ : m_baseRegister(baseRegister)
+ , m_localRegister(localRegister)
</ins><span class="cx"> , m_isValid(true)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -118,17 +119,19 @@
</span><span class="cx"> };
</span><span class="cx"> virtual ForInContextType type() const = 0;
</span><span class="cx">
</span><ins>+ RegisterID* base() const { return m_baseRegister.get(); }
</ins><span class="cx"> RegisterID* local() const { return m_localRegister.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ RefPtr<RegisterID> m_baseRegister;
</ins><span class="cx"> RefPtr<RegisterID> m_localRegister;
</span><span class="cx"> bool m_isValid;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StructureForInContext : public ForInContext {
</span><span class="cx"> public:
</span><del>- StructureForInContext(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
- : ForInContext(localRegister)
</del><ins>+ StructureForInContext(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
+ : ForInContext(baseRegister, localRegister)
</ins><span class="cx"> , m_indexRegister(indexRegister)
</span><span class="cx"> , m_propertyRegister(propertyRegister)
</span><span class="cx"> , m_enumeratorRegister(enumeratorRegister)
</span><span class="lines">@@ -152,8 +155,8 @@
</span><span class="cx">
</span><span class="cx"> class IndexedForInContext : public ForInContext {
</span><span class="cx"> public:
</span><del>- IndexedForInContext(RegisterID* localRegister, RegisterID* indexRegister)
- : ForInContext(localRegister)
</del><ins>+ IndexedForInContext(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
+ : ForInContext(baseRegister, localRegister)
</ins><span class="cx"> , m_indexRegister(indexRegister)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -525,9 +528,9 @@
</span><span class="cx"> void pushFinallyContext(StatementNode* finallyBlock);
</span><span class="cx"> void popFinallyContext();
</span><span class="cx">
</span><del>- void pushIndexedForInScope(RegisterID* local, RegisterID* index);
</del><ins>+ void pushIndexedForInScope(RegisterID* base, RegisterID* local, RegisterID* index);
</ins><span class="cx"> void popIndexedForInScope(RegisterID* local);
</span><del>- void pushStructureForInScope(RegisterID* local, RegisterID* index, RegisterID* property, RegisterID* enumerator);
</del><ins>+ void pushStructureForInScope(RegisterID* base, RegisterID* local, RegisterID* index, RegisterID* property, RegisterID* enumerator);
</ins><span class="cx"> void popStructureForInScope(RegisterID* local);
</span><span class="cx"> void invalidateForInContextForLocal(RegisterID* local);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (172412 => 172413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-08-11 21:25:34 UTC (rev 172412)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-08-11 22:00:15 UTC (rev 172413)
</span><span class="lines">@@ -2044,7 +2044,7 @@
</span><span class="cx"> generator.emitToIndexString(propertyName.get(), i.get());
</span><span class="cx"> this->emitLoopHeader(generator, propertyName.get());
</span><span class="cx">
</span><del>- generator.pushIndexedForInScope(local.get(), i.get());
</del><ins>+ generator.pushIndexedForInScope(base.get(), local.get(), i.get());
</ins><span class="cx"> generator.emitNode(dst, m_statement);
</span><span class="cx"> generator.popIndexedForInScope(local.get());
</span><span class="cx">
</span><span class="lines">@@ -2078,7 +2078,7 @@
</span><span class="cx">
</span><span class="cx"> this->emitLoopHeader(generator, propertyName.get());
</span><span class="cx">
</span><del>- generator.pushStructureForInScope(local.get(), i.get(), propertyName.get(), structureEnumerator.get());
</del><ins>+ generator.pushStructureForInScope(base.get(), local.get(), i.get(), propertyName.get(), structureEnumerator.get());
</ins><span class="cx"> generator.emitNode(dst, m_statement);
</span><span class="cx"> generator.popStructureForInScope(local.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforintestsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/for-in-tests.js (172412 => 172413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-tests.js 2014-08-11 21:25:34 UTC (rev 172412)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-tests.js 2014-08-11 22:00:15 UTC (rev 172413)
</span><span class="lines">@@ -75,3 +75,26 @@
</span><span class="cx"> }
</span><span class="cx"> foo(null);
</span><span class="cx"> })();
</span><ins>+(function() {
+ var foo = function(a, b) {
+ for (var p in b) {
+ var f1 = a[p];
+ var f2 = b[p];
+ if (f1 === f2)
+ continue;
+ a[p] = b[p];
+ }
+ };
+ noInline(foo);
+ for (var i = 0; i < 10000; ++i) {
+ var o1 = {};
+ var o2 = {};
+ o2.x = 42;
+ o2.y = 53;
+ foo(o1, o2);
+ if (o1.x !== o2.x)
+ throw new Error("bad result: " + o1.x + "!==" + o2.x);
+ if (o1.y !== o2.y)
+ throw new Error("bad result: " + o1.y + "!==" + o2.y);
+ }
+})();
</ins></span></pre>
</div>
</div>
</body>
</html>