<!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>[172794] 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/172794">172794</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 19:38:46 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/172401">r172401</a>): for-in optimization no longer works at all
https://bugs.webkit.org/show_bug.cgi?id=136056
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Roll this back in, along with a fix to make proxies work. Previously, for-in over proxies
would instacrash every time.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitGetByVal):
(JSC::BytecodeGenerator::pushIndexedForInScope):
(JSC::BytecodeGenerator::pushStructureForInScope):
* bytecompiler/BytecodeGenerator.h:
(JSC::ForInContext::ForInContext):
(JSC::StructureForInContext::StructureForInContext):
(JSC::IndexedForInContext::IndexedForInContext):
(JSC::ForInContext::base): Deleted.
* bytecompiler/NodesCodegen.cpp:
(JSC::ForInNode::emitMultiLoopBytecode):
* runtime/JSProxy.cpp:
(JSC::JSProxy::getStructurePropertyNames):
(JSC::JSProxy::getGenericPropertyNames):
* tests/stress/for-in-base-reassigned-later-and-change-structure.js: Added.
(foo):
* tests/stress/for-in-base-reassigned-later.js: Added.
(foo):
* tests/stress/for-in-base-reassigned.js: Added.
(foo):
* tests/stress/for-in-proxy-target-changed-structure.js: Added.
(deleteAll):
(foo):
* tests/stress/for-in-proxy.js: Added.
(foo):
LayoutTests:
This just needs a rebase because the number of calls into the DOM has changed and so the
number of console messages about security stuff has now changed.
* http/tests/security/cross-frame-access-enumeration-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossframeaccessenumerationexpectedtxt">trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt</a></li>
<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="#trunkSourceJavaScriptCoreruntimeJSProxycpp">trunk/Source/JavaScriptCore/runtime/JSProxy.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressforinbasereassignedlaterandchangestructurejs">trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later-and-change-structure.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressforinbasereassignedlaterjs">trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressforinbasereassignedjs">trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressforinproxytargetchangedstructurejs">trunk/Source/JavaScriptCore/tests/stress/for-in-proxy-target-changed-structure.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressforinproxyjs">trunk/Source/JavaScriptCore/tests/stress/for-in-proxy.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/LayoutTests/ChangeLog 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-19 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(r172401): for-in optimization no longer works at all
+ https://bugs.webkit.org/show_bug.cgi?id=136056
+
+ Reviewed by Geoffrey Garen.
+
+ This just needs a rebase because the number of calls into the DOM has changed and so the
+ number of console messages about security stuff has now changed.
+
+ * http/tests/security/cross-frame-access-enumeration-expected.txt:
+
</ins><span class="cx"> 2014-08-19 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] A few calc() test failures in the shape-image-threshold parsing tests
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossframeaccessenumerationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><span class="cx"> CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</span><del>-CONSOLE MESSAGE: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "http://localhost:8000". Protocols, domains, and ports must match.
</del><span class="cx"> This tests that variable names can't be enumerated cross domain (see http://bugs.webkit.org/show_bug.cgi?id=16387)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-08-19 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(r172401): for-in optimization no longer works at all
+ https://bugs.webkit.org/show_bug.cgi?id=136056
+
+ Reviewed by Geoffrey Garen.
+
+ Roll this back in, along with a fix to make proxies work. Previously, for-in over proxies
+ would instacrash every time.
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitGetByVal):
+ (JSC::BytecodeGenerator::pushIndexedForInScope):
+ (JSC::BytecodeGenerator::pushStructureForInScope):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::ForInContext::ForInContext):
+ (JSC::StructureForInContext::StructureForInContext):
+ (JSC::IndexedForInContext::IndexedForInContext):
+ (JSC::ForInContext::base): Deleted.
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ForInNode::emitMultiLoopBytecode):
+ * runtime/JSProxy.cpp:
+ (JSC::JSProxy::getStructurePropertyNames):
+ (JSC::JSProxy::getGenericPropertyNames):
+ * tests/stress/for-in-base-reassigned-later-and-change-structure.js: Added.
+ (foo):
+ * tests/stress/for-in-base-reassigned-later.js: Added.
+ (foo):
+ * tests/stress/for-in-base-reassigned.js: Added.
+ (foo):
+ * tests/stress/for-in-proxy-target-changed-structure.js: Added.
+ (deleteAll):
+ (foo):
+ * tests/stress/for-in-proxy.js: Added.
+ (foo):
+
</ins><span class="cx"> 2014-08-19 Jaehun Lim <ljaehun.lim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix EFL build after r17275
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -1422,9 +1422,6 @@
</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><del>- if (context->base() != base)
- continue;
-
</del><span class="cx"> if (context->local() != property)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -2586,11 +2583,11 @@
</span><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::pushIndexedForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
</del><ins>+void BytecodeGenerator::pushIndexedForInScope(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>(baseRegister, localRegister, indexRegister));
</del><ins>+ m_forInContextStack.append(std::make_unique<IndexedForInContext>(localRegister, indexRegister));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BytecodeGenerator::popIndexedForInScope(RegisterID* localRegister)
</span><span class="lines">@@ -2600,11 +2597,11 @@
</span><span class="cx"> m_forInContextStack.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BytecodeGenerator::pushStructureForInScope(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
</del><ins>+void BytecodeGenerator::pushStructureForInScope(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>(baseRegister, localRegister, indexRegister, propertyRegister, enumeratorRegister));
</del><ins>+ m_forInContextStack.append(std::make_unique<StructureForInContext>(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 (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -99,9 +99,8 @@
</span><span class="cx">
</span><span class="cx"> class ForInContext {
</span><span class="cx"> public:
</span><del>- ForInContext(RegisterID* baseRegister, RegisterID* localRegister)
- : m_baseRegister(baseRegister)
- , m_localRegister(localRegister)
</del><ins>+ ForInContext(RegisterID* localRegister)
+ : m_localRegister(localRegister)
</ins><span class="cx"> , m_isValid(true)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -119,19 +118,17 @@
</span><span class="cx"> };
</span><span class="cx"> virtual ForInContextType type() const = 0;
</span><span class="cx">
</span><del>- RegisterID* base() const { return m_baseRegister.get(); }
</del><span class="cx"> RegisterID* local() const { return m_localRegister.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<RegisterID> m_baseRegister;
</del><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* baseRegister, RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
- : ForInContext(baseRegister, localRegister)
</del><ins>+ StructureForInContext(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
+ : ForInContext(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">@@ -155,8 +152,8 @@
</span><span class="cx">
</span><span class="cx"> class IndexedForInContext : public ForInContext {
</span><span class="cx"> public:
</span><del>- IndexedForInContext(RegisterID* baseRegister, RegisterID* localRegister, RegisterID* indexRegister)
- : ForInContext(baseRegister, localRegister)
</del><ins>+ IndexedForInContext(RegisterID* localRegister, RegisterID* indexRegister)
+ : ForInContext(localRegister)
</ins><span class="cx"> , m_indexRegister(indexRegister)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -527,9 +524,9 @@
</span><span class="cx"> void pushFinallyContext(StatementNode* finallyBlock);
</span><span class="cx"> void popFinallyContext();
</span><span class="cx">
</span><del>- void pushIndexedForInScope(RegisterID* base, RegisterID* local, RegisterID* index);
</del><ins>+ void pushIndexedForInScope(RegisterID* local, RegisterID* index);
</ins><span class="cx"> void popIndexedForInScope(RegisterID* local);
</span><del>- void pushStructureForInScope(RegisterID* base, RegisterID* local, RegisterID* index, RegisterID* property, RegisterID* enumerator);
</del><ins>+ void pushStructureForInScope(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 (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -2070,7 +2070,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(base.get(), local.get(), i.get());
</del><ins>+ generator.pushIndexedForInScope(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">@@ -2104,7 +2104,7 @@
</span><span class="cx">
</span><span class="cx"> this->emitLoopHeader(generator, propertyName.get());
</span><span class="cx">
</span><del>- generator.pushStructureForInScope(base.get(), local.get(), i.get(), propertyName.get(), structureEnumerator.get());
</del><ins>+ generator.pushStructureForInScope(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="trunkSourceJavaScriptCoreruntimeJSProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSProxy.cpp (172793 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSProxy.cpp 2014-08-20 02:17:57 UTC (rev 172793)
+++ trunk/Source/JavaScriptCore/runtime/JSProxy.cpp 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -120,16 +120,17 @@
</span><span class="cx"> return thisObject->target()->methodTable(exec->vm())->getEnumerableLength(exec, thisObject->target());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSProxy::getStructurePropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</del><ins>+void JSProxy::getStructurePropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode)
</ins><span class="cx"> {
</span><del>- JSProxy* thisObject = jsCast<JSProxy*>(object);
- thisObject->target()->methodTable(exec->vm())->getStructurePropertyNames(thisObject->target(), exec, propertyNames, mode);
</del><ins>+ // Skip the structure loop, since it is invalid for proxies.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSProxy::getGenericPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span><span class="cx"> {
</span><span class="cx"> JSProxy* thisObject = jsCast<JSProxy*>(object);
</span><del>- thisObject->target()->methodTable(exec->vm())->getGenericPropertyNames(thisObject->target(), exec, propertyNames, mode);
</del><ins>+ // Get *all* of the property names, not just the generic ones, since we skipped the structure
+ // ones above.
+ thisObject->target()->methodTable(exec->vm())->getPropertyNames(thisObject->target(), exec, propertyNames, mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSProxy::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforinbasereassignedlaterandchangestructurejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later-and-change-structure.js (0 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later-and-change-structure.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later-and-change-structure.js 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function foo(o_) {
+ var o = o_;
+ var result = 0;
+ for (var s in o) {
+ result += o[s];
+ if (result >= 3)
+ o = {0:1, 1:2, b:4, a:3};
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo({0:0, 1:1, a:2, b:3});
+ if (result != 7)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforinbasereassignedlaterjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later.js (0 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned-later.js 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function foo(o_) {
+ var o = o_;
+ var result = 0;
+ for (var s in o) {
+ result += o[s];
+ if (result >= 3)
+ o = {0:1, 1:2, a:3, b:4};
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo({0:0, 1:1, a:2, b:3});
+ if (result != 7)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforinbasereassignedjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned.js (0 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-base-reassigned.js 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function foo(o_) {
+ var o = o_;
+ var result = 0;
+ for (var s in o) {
+ result += o[s];
+ o = {0:1, 1:2, a:3, b:4};
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo({0:0, 1:1, a:2, b:3});
+ if (result != 9)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforinproxytargetchangedstructurejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/for-in-proxy-target-changed-structure.js (0 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-proxy-target-changed-structure.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-proxy-target-changed-structure.js 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+var theO;
+
+function deleteAll() {
+ delete theO.a;
+ delete theO.b;
+ delete theO.c;
+ delete theO.d;
+ for (var i = 0; i < 10; ++i)
+ theO["i" + i] = 42;
+ theO.a = 11;
+ theO.b = 12;
+ theO.c = 13;
+ theO.d = 14;
+}
+
+function foo(o_) {
+ var o = o_;
+ var result = 0;
+ for (var s in o) {
+ result += o[s];
+ deleteAll();
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(createProxy(theO = {a:1, b:2, c:3, d:4}));
+ if (result != 1 + 12 + 13 + 14)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressforinproxyjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/for-in-proxy.js (0 => 172794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/for-in-proxy.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/for-in-proxy.js 2014-08-20 02:38:46 UTC (rev 172794)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+function foo(o_) {
+ var o = o_;
+ var result = 0;
+ for (var s in o) {
+ result += o[s];
+ }
+ return result;
+}
+
+noInline(foo);
+
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(createProxy({a:1, b:2, c:3, d:4}));
+ if (result != 1 + 2 + 3 + 4)
+ throw "Error: bad result: " + result;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>