<!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>[165306] 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/165306">165306</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 17:17:57 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Continue hangs when performing for-of over arguments
https://bugs.webkit.org/show_bug.cgi?id=129915
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
Put the continue label in the right place
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::emitEnumeration):
LayoutTests:
Add tests
* js/for-of-arguments-continue-hang-expected.txt: Added.
* js/for-of-arguments-continue-hang.html: Added.
* js/script-tests/for-of-arguments-continue-hang.js: Added.
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsforofargumentscontinuehangexpectedtxt">trunk/LayoutTests/js/for-of-arguments-continue-hang-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsforofargumentscontinuehanghtml">trunk/LayoutTests/js/for-of-arguments-continue-hang.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsforofargumentscontinuehangjs">trunk/LayoutTests/js/script-tests/for-of-arguments-continue-hang.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165305 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-08 01:17:08 UTC (rev 165305)
+++ trunk/LayoutTests/ChangeLog 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-07 Oliver Hunt <oliver@apple.com>
+
+ Continue hangs when performing for-of over arguments
+ https://bugs.webkit.org/show_bug.cgi?id=129915
+
+ Reviewed by Geoffrey Garen.
+
+ Add tests
+
+ * js/for-of-arguments-continue-hang-expected.txt: Added.
+ * js/for-of-arguments-continue-hang.html: Added.
+ * js/script-tests/for-of-arguments-continue-hang.js: Added.
+ (test):
+
</ins><span class="cx"> 2014-03-07 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Traversal failure in a direct adjacent chain with tail backtracking lacks the path to clear the tail
</span></span></pre></div>
<a id="trunkLayoutTestsjsforofargumentscontinuehangexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/for-of-arguments-continue-hang-expected.txt (0 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/for-of-arguments-continue-hang-expected.txt (rev 0)
+++ trunk/LayoutTests/js/for-of-arguments-continue-hang-expected.txt 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+This test makes sure we don't hang we use continue inside a for-of over arguments
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS test() is 0
+PASS test(1) is 1
+PASS test(1,2) is 2
+PASS test(1,2,3) is 3
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsforofargumentscontinuehanghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/for-of-arguments-continue-hang.html (0 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/for-of-arguments-continue-hang.html (rev 0)
+++ trunk/LayoutTests/js/for-of-arguments-continue-hang.html 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/for-of-arguments-continue-hang.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsforofargumentscontinuehangjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/for-of-arguments-continue-hang.js (0 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/for-of-arguments-continue-hang.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/for-of-arguments-continue-hang.js 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+description(
+"This test makes sure we don't hang we use continue inside a for-of over arguments"
+);
+
+function test() {
+ var count = 0;
+ for (var a of arguments)
+ count++;
+ return count;
+}
+
+shouldBe("test()", "0")
+shouldBe("test(1)", "1")
+shouldBe("test(1,2)", "2")
+shouldBe("test(1,2,3)", "3")
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165305 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-08 01:17:08 UTC (rev 165305)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-07 Oliver Hunt <oliver@apple.com>
+
+ Continue hangs when performing for-of over arguments
+ https://bugs.webkit.org/show_bug.cgi?id=129915
+
+ Reviewed by Geoffrey Garen.
+
+ Put the continue label in the right place
+
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::emitEnumeration):
+
</ins><span class="cx"> 2014-03-07 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win64] Compile error after r165128.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (165305 => 165306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-03-08 01:17:08 UTC (rev 165305)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2014-03-08 01:17:57 UTC (rev 165306)
</span><span class="lines">@@ -2446,16 +2446,17 @@
</span><span class="cx"> LabelScopePtr scope = newLabelScope(LabelScope::Loop);
</span><span class="cx"> RefPtr<RegisterID> value = emitLoad(newTemporary(), jsUndefined());
</span><span class="cx">
</span><del>- emitJump(scope->continueTarget());
-
</del><ins>+ RefPtr<Label> loopCondition = newLabel();
</ins><span class="cx"> RefPtr<Label> loopStart = newLabel();
</span><ins>+ emitJump(loopCondition.get());
</ins><span class="cx"> emitLabel(loopStart.get());
</span><span class="cx"> emitLoopHint();
</span><span class="cx"> emitGetArgumentByVal(value.get(), uncheckedRegisterForArguments(), index.get());
</span><span class="cx"> callBack(*this, value.get());
</span><ins>+
+ emitLabel(scope->continueTarget());
</ins><span class="cx"> emitInc(index.get());
</span><del>- emitLabel(scope->continueTarget());
-
</del><ins>+ emitLabel(loopCondition.get());
</ins><span class="cx"> RefPtr<RegisterID> length = emitGetArgumentsLength(newTemporary(), uncheckedRegisterForArguments());
</span><span class="cx"> emitJumpIfTrue(emitEqualityOp(op_less, newTemporary(), index.get(), length.get()), loopStart.get());
</span><span class="cx"> emitLabel(scope->breakTarget());
</span></span></pre>
</div>
</div>
</body>
</html>