<!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>[179682] 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/179682">179682</a></dd>
<dt>Author</dt> <dd>saambarati1@gmail.com</dd>
<dt>Date</dt> <dd>2015-02-05 00:58:38 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in uninitialized deconstructing variable.
https://bugs.webkit.org/show_bug.cgi?id=141070
Reviewed by Michael Saboff.
Source/JavaScriptCore:
According to the ES6 spec, when a destructuring pattern occurs
as the left hand side of an assignment inside a var declaration
statement, the assignment must also have a right hand side value.
"var {x} = {};" is a legal syntactic statement, but,
"var {x};" is a syntactic error.
Section 13.2.2 of the latest draft ES6 spec specifies this requirement:
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-variable-statement
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseVarDeclaration):
(JSC::Parser<LexerType>::parseVarDeclarationList):
(JSC::Parser<LexerType>::parseForStatement):
* parser/Parser.h:
LayoutTests:
* 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="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/LayoutTests/ChangeLog 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-02-05 Saam Barati <saambarati1@gmail.com>
+
+ Crash in uninitialized deconstructing variable.
+ https://bugs.webkit.org/show_bug.cgi?id=141070
+
+ Reviewed by Michael Saboff.
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+
</ins><span class="cx"> 2015-02-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Reactive (some) Media tests. Test results gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -678,6 +678,12 @@
</span><span class="cx"> PASS Valid: "function f() { for ([of] in of){} }"
</span><span class="cx"> PASS Valid: "for ({of} in of){}" with ReferenceError
</span><span class="cx"> PASS Valid: "function f() { for ({of} in of){} }"
</span><ins>+PASS Invalid: "for (var of = x of of){}"
+PASS Invalid: "function f() { for (var of = x of of){} }"
+PASS Invalid: "for (var {of} = x of of){}"
+PASS Invalid: "function f() { for (var {of} = x of of){} }"
+PASS Invalid: "for (var [of] = x of of){}"
+PASS Invalid: "function f() { for (var [of] = x of of){} }"
</ins><span class="cx"> PASS Invalid: "for (of of of of){}"
</span><span class="cx"> PASS Invalid: "function f() { for (of of of of){} }"
</span><span class="cx"> PASS Invalid: "for (of of; of; of){}"
</span><span class="lines">@@ -765,6 +771,14 @@
</span><span class="cx"> PASS Valid: "function f() { 'use strict'; ({a: b}=null) }"
</span><span class="cx"> PASS Valid: "var {1:x}=1"
</span><span class="cx"> PASS Valid: "function f() { var {1:x}=1 }"
</span><ins>+PASS Valid: "var {x}=1"
+PASS Valid: "function f() { var {x}=1 }"
+PASS Valid: "var {x, y}=1"
+PASS Valid: "function f() { var {x, y}=1 }"
+PASS Valid: "var [x]=1"
+PASS Valid: "function f() { var [x]=1 }"
+PASS Valid: "var [x, y]=1"
+PASS Valid: "function f() { var [x, y]=1 }"
</ins><span class="cx"> PASS Valid: "[x]=1"
</span><span class="cx"> PASS Valid: "function f() { [x]=1 }"
</span><span class="cx"> PASS Valid: "var [x]=1"
</span><span class="lines">@@ -787,6 +801,20 @@
</span><span class="cx"> PASS Valid: "function f() { ({a}=1=1) }"
</span><span class="cx"> PASS Valid: "({a:a}=1=1)" with ReferenceError
</span><span class="cx"> PASS Valid: "function f() { ({a:a}=1=1) }"
</span><ins>+PASS Invalid: "var {x}"
+PASS Invalid: "function f() { var {x} }"
+PASS Invalid: "var {x, y}"
+PASS Invalid: "function f() { var {x, y} }"
+PASS Invalid: "var {x} = 20, {x, y}"
+PASS Invalid: "function f() { var {x} = 20, {x, y} }"
+PASS Invalid: "var {foo:bar, bar:baz}"
+PASS Invalid: "function f() { var {foo:bar, bar:baz} }"
+PASS Invalid: "var [x]"
+PASS Invalid: "function f() { var [x] }"
+PASS Invalid: "var [x, y]"
+PASS Invalid: "function f() { var [x, y] }"
+PASS Invalid: "var [x] = [], [x, y]"
+PASS Invalid: "function f() { var [x] = [], [x, y] }"
</ins><span class="cx"> PASS Invalid: "({get [x](){}})"
</span><span class="cx"> PASS Invalid: "function f() { ({get [x](){}}) }"
</span><span class="cx"> PASS Invalid: "({set [x](){}})"
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -428,6 +428,9 @@
</span><span class="cx"> valid("for (var {of} in of){}")
</span><span class="cx"> valid("for ([of] in of){}")
</span><span class="cx"> valid("for ({of} in of){}")
</span><ins>+invalid("for (var of = x of of){}")
+invalid("for (var {of} = x of of){}")
+invalid("for (var [of] = x of of){}")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> invalid("for (of of of of){}")
</span><span class="lines">@@ -475,6 +478,10 @@
</span><span class="cx"> valid("'use strict'; ({1: x}=null)")
</span><span class="cx"> valid("'use strict'; ({a: b}=null)")
</span><span class="cx"> valid("var {1:x}=1")
</span><ins>+valid("var {x}=1")
+valid("var {x, y}=1")
+valid("var [x]=1")
+valid("var [x, y]=1")
</ins><span class="cx"> valid("[x]=1")
</span><span class="cx"> valid("var [x]=1")
</span><span class="cx"> valid("({[x]: 1})")
</span><span class="lines">@@ -486,6 +493,13 @@
</span><span class="cx"> valid("({a:a}=1)=1")
</span><span class="cx"> valid("({a}=1=1)")
</span><span class="cx"> valid("({a:a}=1=1)")
</span><ins>+invalid("var {x}")
+invalid("var {x, y}")
+invalid("var {x} = 20, {x, y}")
+invalid("var {foo:bar, bar:baz}")
+invalid("var [x]")
+invalid("var [x, y]")
+invalid("var [x] = [], [x, y]")
</ins><span class="cx"> invalid("({get [x](){}})")
</span><span class="cx"> invalid("({set [x](){}})")
</span><span class="cx"> invalid("({[...x]: 1})")
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-02-05 Saam Barati <saambarati1@gmail.com>
+
+ Crash in uninitialized deconstructing variable.
+ https://bugs.webkit.org/show_bug.cgi?id=141070
+
+ Reviewed by Michael Saboff.
+
+ According to the ES6 spec, when a destructuring pattern occurs
+ as the left hand side of an assignment inside a var declaration
+ statement, the assignment must also have a right hand side value.
+ "var {x} = {};" is a legal syntactic statement, but,
+ "var {x};" is a syntactic error.
+
+ Section 13.2.2 of the latest draft ES6 spec specifies this requirement:
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-variable-statement
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseVarDeclaration):
+ (JSC::Parser<LexerType>::parseVarDeclarationList):
+ (JSC::Parser<LexerType>::parseForStatement):
+ * parser/Parser.h:
+
</ins><span class="cx"> 2015-02-04 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix a build break on EFL port since r179648.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> TreeDeconstructionPattern scratch1 = 0;
</span><span class="cx"> TreeExpression scratch2 = 0;
</span><span class="cx"> JSTextPosition scratch3;
</span><del>- TreeExpression varDecls = parseVarDeclarationList(context, scratch, scratch1, scratch2, scratch3, scratch3, scratch3);
</del><ins>+ TreeExpression varDecls = parseVarDeclarationList(context, scratch, scratch1, scratch2, scratch3, scratch3, scratch3, VarDeclarationContext);
</ins><span class="cx"> propagateError();
</span><span class="cx"> failIfFalse(autoSemiColon(), "Expected ';' after var declaration");
</span><span class="cx">
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename LexerType>
</span><del>-template <class TreeBuilder> TreeExpression Parser<LexerType>::parseVarDeclarationList(TreeBuilder& context, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd)
</del><ins>+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseVarDeclarationList(TreeBuilder& context, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd, VarDeclarationListContext declarationListContext)
</ins><span class="cx"> {
</span><span class="cx"> TreeExpression head = 0;
</span><span class="cx"> TreeExpression tail = 0;
</span><span class="lines">@@ -487,6 +487,7 @@
</span><span class="cx"> auto pattern = parseDeconstructionPattern(context, DeconstructToVariables);
</span><span class="cx"> failIfFalse(pattern, "Cannot parse this deconstruction pattern");
</span><span class="cx"> hasInitializer = match(EQUAL);
</span><ins>+ failIfTrue(declarationListContext == VarDeclarationContext && !hasInitializer, "Expected an initializer in destructuring variable declaration");
</ins><span class="cx"> lastPattern = pattern;
</span><span class="cx"> if (hasInitializer) {
</span><span class="cx"> next(TreeBuilder::DontBuildStrings); // consume '='
</span><span class="lines">@@ -735,7 +736,7 @@
</span><span class="cx"> m_allowsIn = false;
</span><span class="cx"> JSTextPosition initStart;
</span><span class="cx"> JSTextPosition initEnd;
</span><del>- decls = parseVarDeclarationList(context, declarations, forInTarget, forInInitializer, declsStart, initStart, initEnd);
</del><ins>+ decls = parseVarDeclarationList(context, declarations, forInTarget, forInInitializer, declsStart, initStart, initEnd, ForLoopContext);
</ins><span class="cx"> m_allowsIn = true;
</span><span class="cx"> propagateError();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (179681 => 179682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2015-02-05 08:58:14 UTC (rev 179681)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2015-02-05 08:58:38 UTC (rev 179682)
</span><span class="lines">@@ -742,7 +742,8 @@
</span><span class="cx"> template <class TreeBuilder> TreeProperty parseGetterSetter(TreeBuilder&, bool strict, PropertyNode::Type, unsigned getterOrSetterStartOffset);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&);
</span><span class="cx"> template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
</span><del>- template <class TreeBuilder> TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd);
</del><ins>+ enum VarDeclarationListContext { ForLoopContext, VarDeclarationContext };
+ template <class TreeBuilder> TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd, VarDeclarationListContext);
</ins><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
</span><span class="cx">
</span><span class="cx"> template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, DeconstructionKind, const Identifier&, int depth, JSToken);
</span></span></pre>
</div>
</div>
</body>
</html>