<!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>[166240] 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/166240">166240</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-03-25 11:00:30 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED in Parser: dst != localReg
https://bugs.webkit.org/show_bug.cgi?id=130710
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
Just make sure we don't try to write to a captured constant,
following the change to track captured variables separately.
* bytecompiler/NodesCodegen.cpp:
(JSC::PostfixNode::emitResolve):
(JSC::PrefixNode::emitResolve):
LayoutTests:
New testcases.
* js/parser-syntax-check-expected.txt:
* js/script-tests/parser-syntax-check.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsparsersyntaxcheckexpectedtxt">trunk/LayoutTests/js/parser-syntax-check-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparsersyntaxcheckjs">trunk/LayoutTests/js/script-tests/parser-syntax-check.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166239 => 166240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-25 17:45:52 UTC (rev 166239)
+++ trunk/LayoutTests/ChangeLog 2014-03-25 18:00:30 UTC (rev 166240)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-24 Oliver Hunt <oliver@apple.com>
+
+ ASSERTION FAILED in Parser: dst != localReg
+ https://bugs.webkit.org/show_bug.cgi?id=130710
+
+ Reviewed by Filip Pizlo.
+
+ New testcases.
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+
</ins><span class="cx"> 2014-03-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent 'removetrack' events from firing when all inband text tracks are removed.
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (166239 => 166240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2014-03-25 17:45:52 UTC (rev 166239)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2014-03-25 18:00:30 UTC (rev 166240)
</span><span class="lines">@@ -350,6 +350,30 @@
</span><span class="cx"> PASS Invalid: "function f() { var a = b ? c, b }"
</span><span class="cx"> PASS Invalid: "const a = b : c"
</span><span class="cx"> PASS Invalid: "function f() { const a = b : c }"
</span><ins>+PASS Valid: "const a = 7; eval(''); a++"
+PASS Valid: "function f() { const a = 7; eval(''); a++ }"
+PASS Valid: "const a = 7; eval(''); a--"
+PASS Valid: "function f() { const a = 7; eval(''); a-- }"
+PASS Valid: "const a = 7; with({}) a++"
+PASS Valid: "function f() { const a = 7; with({}) a++ }"
+PASS Valid: "const a = 7; with({}) a--"
+PASS Valid: "function f() { const a = 7; with({}) a-- }"
+PASS Valid: "const a = 7; eval(''); a+=1"
+PASS Valid: "function f() { const a = 7; eval(''); a+=1 }"
+PASS Valid: "const a = 7; eval(''); a-=1"
+PASS Valid: "function f() { const a = 7; eval(''); a-=1 }"
+PASS Valid: "const a = 7; with({}) a+=1"
+PASS Valid: "function f() { const a = 7; with({}) a+=1 }"
+PASS Valid: "const a = 7; with({}) a-=1"
+PASS Valid: "function f() { const a = 7; with({}) a-=1 }"
+PASS Valid: "const a = 7; eval(''); a=1"
+PASS Valid: "function f() { const a = 7; eval(''); a=1 }"
+PASS Valid: "const a = 7; eval(''); a=1"
+PASS Valid: "function f() { const a = 7; eval(''); a=1 }"
+PASS Valid: "const a = 7; with({}) a=1"
+PASS Valid: "function f() { const a = 7; with({}) a=1 }"
+PASS Valid: "const a = 7; with({}) a=1"
+PASS Valid: "function f() { const a = 7; with({}) a=1 }"
</ins><span class="cx"> for statement
</span><span class="cx"> PASS Valid: "for ( ; ; ) { break }"
</span><span class="cx"> PASS Valid: "function f() { for ( ; ; ) { break } }"
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (166239 => 166240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2014-03-25 17:45:52 UTC (rev 166239)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2014-03-25 18:00:30 UTC (rev 166240)
</span><span class="lines">@@ -241,7 +241,20 @@
</span><span class="cx"> valid ("var a = a in b in c instanceof d");
</span><span class="cx"> invalid("var a = b ? c, b");
</span><span class="cx"> invalid("const a = b : c");
</span><ins>+valid("const a = 7; eval(''); a++");
+valid("const a = 7; eval(''); a--");
+valid("const a = 7; with({}) a++");
+valid("const a = 7; with({}) a--");
+valid("const a = 7; eval(''); a+=1");
+valid("const a = 7; eval(''); a-=1");
+valid("const a = 7; with({}) a+=1");
+valid("const a = 7; with({}) a-=1");
+valid("const a = 7; eval(''); a=1");
+valid("const a = 7; eval(''); a=1");
+valid("const a = 7; with({}) a=1");
+valid("const a = 7; with({}) a=1");
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> debug ("for statement");
</span><span class="cx">
</span><span class="cx"> valid ("for ( ; ; ) { break }");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166239 => 166240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 17:45:52 UTC (rev 166239)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-25 18:00:30 UTC (rev 166240)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-24 Oliver Hunt <oliver@apple.com>
+
+ ASSERTION FAILED in Parser: dst != localReg
+ https://bugs.webkit.org/show_bug.cgi?id=130710
+
+ Reviewed by Filip Pizlo.
+
+ Just make sure we don't try to write to a captured constant,
+ following the change to track captured variables separately.
+
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::PostfixNode::emitResolve):
+ (JSC::PrefixNode::emitResolve):
+
</ins><span class="cx"> 2014-03-25 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove the autotools build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (166239 => 166240)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-03-25 17:45:52 UTC (rev 166239)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-03-25 18:00:30 UTC (rev 166240)
</span><span class="lines">@@ -740,8 +740,7 @@
</span><span class="cx"> if (local.isReadOnly()) {
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded();
</span><span class="cx"> localReg = generator.emitMove(generator.tempDestination(dst), localReg);
</span><del>- }
- if (local.isCaptured()) {
</del><ins>+ } else if (local.isCaptured()) {
</ins><span class="cx"> RefPtr<RegisterID> tempDst = generator.finalDestination(dst);
</span><span class="cx"> ASSERT(dst != localReg);
</span><span class="cx"> RefPtr<RegisterID> tempDstSrc = generator.newTemporary();
</span><span class="lines">@@ -916,8 +915,7 @@
</span><span class="cx"> if (local.isReadOnly()) {
</span><span class="cx"> generator.emitReadOnlyExceptionIfNeeded();
</span><span class="cx"> localReg = generator.emitMove(generator.tempDestination(dst), localReg);
</span><del>- }
- if (local.isCaptured()) {
</del><ins>+ } else if (local.isCaptured()) {
</ins><span class="cx"> RefPtr<RegisterID> tempDst = generator.tempDestination(dst);
</span><span class="cx"> generator.emitMove(tempDst.get(), localReg);
</span><span class="cx"> emitIncOrDec(generator, tempDst.get(), m_operator);
</span></span></pre>
</div>
</div>
</body>
</html>