<!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>[192919] 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/192919">192919</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-01 14:47:00 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] support CoverInitializedName in nested AssignmentPatterns
https://bugs.webkit.org/show_bug.cgi?id=151595
Patch by Caitlin Potter <caitpotter88@gmail.com> on 2015-12-01
Reviewed by Geoffrey Garen.
A regression introduced in bug https://bugs.webkit.org/show_bug.cgi?id=151026
causes the parser to fail when attempting to parse nested
ObjectAssignmentPatterns with CoverInitializedName destructuring targets.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseAssignmentExpressionOrPropagateErrorClass):
(JSC::Parser<LexerType>::parseAssignmentExpression):
(JSC::Parser<LexerType>::parseProperty):
(JSC::Parser<LexerType>::parseArrayLiteral):
* parser/Parser.h:
(JSC::Parser::ExpressionErrorClassifier::propagateExpressionErrorClass):
* tests/es6.yaml:
* tests/es6/destructuring_assignment_nested_cover_initialized_name.js: Added.
(test1):
(test2):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestses6destructuring_assignment_nested_cover_initialized_namejs">trunk/Source/JavaScriptCore/tests/es6/destructuring_assignment_nested_cover_initialized_name.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192918 => 192919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 22:46:18 UTC (rev 192918)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 22:47:00 UTC (rev 192919)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-12-01 Caitlin Potter <caitpotter88@gmail.com>
+
+ [JSC] support CoverInitializedName in nested AssignmentPatterns
+ https://bugs.webkit.org/show_bug.cgi?id=151595
+
+ Reviewed by Geoffrey Garen.
+
+ A regression introduced in bug https://bugs.webkit.org/show_bug.cgi?id=151026
+ causes the parser to fail when attempting to parse nested
+ ObjectAssignmentPatterns with CoverInitializedName destructuring targets.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseAssignmentExpressionOrPropagateErrorClass):
+ (JSC::Parser<LexerType>::parseAssignmentExpression):
+ (JSC::Parser<LexerType>::parseProperty):
+ (JSC::Parser<LexerType>::parseArrayLiteral):
+ * parser/Parser.h:
+ (JSC::Parser::ExpressionErrorClassifier::propagateExpressionErrorClass):
+ * tests/es6.yaml:
+ * tests/es6/destructuring_assignment_nested_cover_initialized_name.js: Added.
+ (test1):
+ (test2):
+
</ins><span class="cx"> 2015-12-01 Juergen Ributzka <juergen@apple.com>
</span><span class="cx">
</span><span class="cx"> Add new library dependency for LLVMForJavaScriptCore dylib
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (192918 => 192919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-12-01 22:46:18 UTC (rev 192918)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-12-01 22:47:00 UTC (rev 192919)
</span><span class="lines">@@ -2830,10 +2830,26 @@
</span><span class="cx"> return head;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> template <typename LexerType>
</span><ins>+template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmentExpressionOrPropagateErrorClass(TreeBuilder& context)
+{
+ ExpressionErrorClassifier classifier(this);
+ auto assignment = parseAssignmentExpression(context, classifier);
+ if (!assignment)
+ classifier.propagateExpressionErrorClass();
+ return assignment;
+}
+
+template <typename LexerType>
</ins><span class="cx"> template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmentExpression(TreeBuilder& context)
</span><span class="cx"> {
</span><ins>+ ExpressionErrorClassifier classifier(this);
+ return parseAssignmentExpression(context, classifier);
+}
+
+template <typename LexerType>
+template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmentExpression(TreeBuilder& context, ExpressionErrorClassifier& classifier)
+{
</ins><span class="cx"> failIfStackOverflow();
</span><span class="cx"> JSTextPosition start = tokenStartPosition();
</span><span class="cx"> JSTokenLocation location(tokenLocation());
</span><span class="lines">@@ -2841,7 +2857,6 @@
</span><span class="cx"> int initialNonLHSCount = m_nonLHSCount;
</span><span class="cx"> bool maybeAssignmentPattern = match(OPENBRACE) || match(OPENBRACKET);
</span><span class="cx"> SavePoint savePoint = createSavePoint();
</span><del>- ExpressionErrorClassifier classifier(this);
</del><span class="cx">
</span><span class="cx"> #if ENABLE(ES6_GENERATORS)
</span><span class="cx"> if (match(YIELD) && !isYIELDMaskedAsIDENT(currentScope()->isGenerator()))
</span><span class="lines">@@ -3071,7 +3086,7 @@
</span><span class="cx">
</span><span class="cx"> if (!isGenerator && match(COLON)) {
</span><span class="cx"> next();
</span><del>- TreeExpression node = parseAssignmentExpression(context);
</del><ins>+ TreeExpression node = parseAssignmentExpressionOrPropagateErrorClass(context);
</ins><span class="cx"> failIfFalse(node, "Cannot parse expression for property declaration");
</span><span class="cx"> context.setEndOffset(node, m_lexer->currentOffset());
</span><span class="cx"> return context.createProperty(ident, node, PropertyNode::Constant, PropertyNode::Unknown, complete);
</span><span class="lines">@@ -3347,11 +3362,11 @@
</span><span class="cx"> auto start = m_token.m_startPosition;
</span><span class="cx"> auto divot = m_token.m_endPosition;
</span><span class="cx"> next();
</span><del>- auto spreadExpr = parseAssignmentExpression(context);
</del><ins>+ auto spreadExpr = parseAssignmentExpressionOrPropagateErrorClass(context);
</ins><span class="cx"> failIfFalse(spreadExpr, "Cannot parse subject of a spread operation");
</span><span class="cx"> elem = context.createSpreadExpression(spreadLocation, spreadExpr, start, divot, m_lastTokenEndPosition);
</span><span class="cx"> } else
</span><del>- elem = parseAssignmentExpression(context);
</del><ins>+ elem = parseAssignmentExpressionOrPropagateErrorClass(context);
</ins><span class="cx"> failIfFalse(elem, "Cannot parse array literal element");
</span><span class="cx"> typename TreeBuilder::ElementList elementList = context.createElementList(elisions, elem);
</span><span class="cx"> typename TreeBuilder::ElementList tail = elementList;
</span><span class="lines">@@ -3375,13 +3390,13 @@
</span><span class="cx"> auto start = m_token.m_startPosition;
</span><span class="cx"> auto divot = m_token.m_endPosition;
</span><span class="cx"> next();
</span><del>- TreeExpression elem = parseAssignmentExpression(context);
</del><ins>+ TreeExpression elem = parseAssignmentExpressionOrPropagateErrorClass(context);
</ins><span class="cx"> failIfFalse(elem, "Cannot parse subject of a spread operation");
</span><span class="cx"> auto spread = context.createSpreadExpression(spreadLocation, elem, start, divot, m_lastTokenEndPosition);
</span><span class="cx"> tail = context.createElementList(tail, elisions, spread);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- TreeExpression elem = parseAssignmentExpression(context);
</del><ins>+ TreeExpression elem = parseAssignmentExpressionOrPropagateErrorClass(context);
</ins><span class="cx"> failIfFalse(elem, "Cannot parse array literal element");
</span><span class="cx"> tail = context.createElementList(tail, elisions, elem);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (192918 => 192919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2015-12-01 22:46:18 UTC (rev 192918)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2015-12-01 22:47:00 UTC (rev 192919)
</span><span class="lines">@@ -763,6 +763,13 @@
</span><span class="cx"> return;
</span><span class="cx"> m_class = classification;
</span><span class="cx"> }
</span><ins>+
+ void propagateExpressionErrorClass()
+ {
+ if (m_previous && m_class != ErrorIndicatesNothing)
+ m_previous->m_class = m_class;
+ }
+
</ins><span class="cx"> bool indicatesPossiblePattern() const { return m_class == ErrorIndicatesPattern; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -1196,7 +1203,9 @@
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseIfStatement(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeStatement parseBlockStatement(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> TreeExpression parseExpression(TreeBuilder&);
</span><ins>+ template <class TreeBuilder> TreeExpression parseAssignmentExpression(TreeBuilder&, ExpressionErrorClassifier&);
</ins><span class="cx"> template <class TreeBuilder> TreeExpression parseAssignmentExpression(TreeBuilder&);
</span><ins>+ template <class TreeBuilder> TreeExpression parseAssignmentExpressionOrPropagateErrorClass(TreeBuilder&);
</ins><span class="cx"> template <class TreeBuilder> TreeExpression parseYieldExpression(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseConditionalExpression(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseBinaryExpression(TreeBuilder&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6destructuring_assignment_nested_cover_initialized_namejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/es6/destructuring_assignment_nested_cover_initialized_name.js (0 => 192919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6/destructuring_assignment_nested_cover_initialized_name.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/es6/destructuring_assignment_nested_cover_initialized_name.js 2015-12-01 22:47:00 UTC (rev 192919)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function test1() {
+ var c = "it didn't work";
+ ({ a: { b: { c = "it worked" } } } = { a: { b: {} } });
+ return c === "it worked";
+}
+
+function test2() {
+ var c = "it didn't work";
+ [{ a: { b: { c = "it worked" } } }] = [{ a: { b: {} } }];
+ return c === "it worked";
+}
+
+if (!test1())
+ throw new Error("Test1 failed");
+
+if (!test2())
+ throw new Error("Test2 failed");
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (192918 => 192919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2015-12-01 22:46:18 UTC (rev 192918)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2015-12-01 22:47:00 UTC (rev 192919)
</span><span class="lines">@@ -222,6 +222,8 @@
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/destructuring_assignment_computed_property_default.js
</span><span class="cx"> cmd: runES6 :normal
</span><ins>+- path: es6/destructuring_assignment_nested_cover_initialized_name.js
+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/destructuring_initializer_scoping.js
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/for..of_loops_with_arrays.js
</span></span></pre>
</div>
</div>
</body>
</html>