<!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>[181829] 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/181829">181829</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-21 20:14:47 -0700 (Sat, 21 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Computed Property names should allow only AssignmentExpressions not any Expression
https://bugs.webkit.org/show_bug.cgi?id=142902
Reviewed by Ryosuke Niwa.
Source/JavaScriptCore:
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseProperty):
Limit computed expressions to just assignment expressions instead of
any expression (which allowed comma expressions).
LayoutTests:
* js/basic-computed-property-name-expected.txt:
* js/object-literal-computed-methods-expected.txt:
* js/script-tests/basic-computed-property-name.js:
(runTest.runTest.runTest.runTest.runTest.runTest.runTest.runTestThrow):
* js/script-tests/object-literal-computed-methods.js:
Test that comma expressions are not allowed in computed property/method names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsbasiccomputedpropertynameexpectedtxt">trunk/LayoutTests/js/basic-computed-property-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsobjectliteralcomputedmethodsexpectedtxt">trunk/LayoutTests/js/object-literal-computed-methods-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsbasiccomputedpropertynamejs">trunk/LayoutTests/js/script-tests/basic-computed-property-name.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsobjectliteralcomputedmethodsjs">trunk/LayoutTests/js/script-tests/object-literal-computed-methods.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/LayoutTests/ChangeLog 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Computed Property names should allow only AssignmentExpressions not any Expression
+ https://bugs.webkit.org/show_bug.cgi?id=142902
+
+ Reviewed by Ryosuke Niwa.
+
+ * js/basic-computed-property-name-expected.txt:
+ * js/object-literal-computed-methods-expected.txt:
+ * js/script-tests/basic-computed-property-name.js:
+ (runTest.runTest.runTest.runTest.runTest.runTest.runTest.runTestThrow):
+ * js/script-tests/object-literal-computed-methods.js:
+ Test that comma expressions are not allowed in computed property/method names.
+
</ins><span class="cx"> 2015-03-21 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Import the blink test fast/css/currentcolor-strict-mode.html
</span></span></pre></div>
<a id="trunkLayoutTestsjsbasiccomputedpropertynameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/basic-computed-property-name-expected.txt (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/basic-computed-property-name-expected.txt 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/LayoutTests/js/basic-computed-property-name-expected.txt 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -6,6 +6,9 @@
</span><span class="cx"> PASS ({[a]: true}.propertyName) is true
</span><span class="cx"> PASS 'use strict';({[a]: true}.propertyName) is true
</span><span class="cx"> PASS (function(){'use strict';return ({[a]: true}.propertyName)})() is true
</span><ins>+PASS ({[(1,a)]: true}.propertyName) is true
+PASS 'use strict';({[(1,a)]: true}.propertyName) is true
+PASS (function(){'use strict';return ({[(1,a)]: true}.propertyName)})() is true
</ins><span class="cx"> PASS ({[a+1]: true}.propertyName1) is true
</span><span class="cx"> PASS 'use strict';({[a+1]: true}.propertyName1) is true
</span><span class="cx"> PASS (function(){'use strict';return ({[a+1]: true}.propertyName1)})() is true
</span><span class="lines">@@ -48,6 +51,18 @@
</span><span class="cx"> PASS ({__proto__: {get '0'(){ return false; }}, [a]: true}[0]) is true
</span><span class="cx"> PASS 'use strict';({__proto__: {get '0'(){ return false; }}, [a]: true}[0]) is true
</span><span class="cx"> PASS (function(){'use strict';return ({__proto__: {get '0'(){ return false; }}, [a]: true}[0])})() is true
</span><ins>+PASS ({[1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS 'use strict';({[1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS (function(){'use strict';return ({[1,a]: true}.propertyName)})() threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS ({propertyName: false, [1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS 'use strict';({propertyName: false, [1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS (function(){'use strict';return ({propertyName: false, [1,a]: true}.propertyName)})() threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS ({[1,a]: false, propertyName: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS 'use strict';({[1,a]: false, propertyName: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS (function(){'use strict';return ({[1,a]: false, propertyName: true}.propertyName)})() threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS ({get propertyName(){ return false; }, [1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS 'use strict';({get propertyName(){ return false; }, [1,a]: true}.propertyName) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS (function(){'use strict';return ({get propertyName(){ return false; }, [1,a]: true}.propertyName)})() threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsobjectliteralcomputedmethodsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/object-literal-computed-methods-expected.txt (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/object-literal-computed-methods-expected.txt 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/LayoutTests/js/object-literal-computed-methods-expected.txt 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -50,7 +50,8 @@
</span><span class="cx"> PASS o.set('hello', 'world') is 'helloworld'
</span><span class="cx"> PASS ({ [](,,,){} }) threw exception SyntaxError: Unexpected token ']'.
</span><span class="cx"> PASS ({ [1+](){} }) threw exception SyntaxError: Unexpected token ']'.
</span><del>-PASS ({ [1,](){} }) threw exception SyntaxError: Unexpected token ']'.
</del><ins>+PASS ({ [1,](){} }) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
+PASS ({ [1,'name'](){} }) threw exception SyntaxError: Unexpected token ','. Expected ']' to end a computed property name..
</ins><span class="cx"> PASS ({ [[1](){} }) threw exception SyntaxError: Unexpected token '{'. Expected ']' to end a computed property name..
</span><span class="cx"> PASS ({ [foo](,,,){} }) threw exception SyntaxError: Unexpected token ','. Expected a parameter pattern or a ')' in parameter list..
</span><span class="cx"> PASS ({ [foo](a{}, bar(){} }) threw exception SyntaxError: Unexpected token '{'. Expected a ')' or a ',' after a parameter declaration..
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsbasiccomputedpropertynamejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/basic-computed-property-name.js (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/basic-computed-property-name.js 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/LayoutTests/js/script-tests/basic-computed-property-name.js 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -9,7 +9,9 @@
</span><span class="cx"> shouldBeTrue("'use strict';"+test);
</span><span class="cx"> shouldBeTrue("(function(){'use strict';return "+test+"})()");
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> runTest("{[a]: true}.propertyName")
</span><ins>+runTest("{[(1,a)]: true}.propertyName")
</ins><span class="cx"> runTest("{[a+1]: true}.propertyName1")
</span><span class="cx"> runTest("{propertyName: false, [a]: true}.propertyName")
</span><span class="cx"> runTest("{[a]: false, propertyName: true}.propertyName")
</span><span class="lines">@@ -25,3 +27,17 @@
</span><span class="cx"> runTest("{get '0'(){ return false; }, [a]: true}[0]")
</span><span class="cx"> runTest("{[a]: true, get '0'(){ return false; }}[0]")
</span><span class="cx"> runTest("{__proto__: {get '0'(){ return false; }}, [a]: true}[0]")
</span><ins>+
+function runTestThrow(test)
+{
+ test = "(" + test + ")"
+ shouldThrow(test);
+ shouldThrow("'use strict';"+test);
+ shouldThrow("(function(){'use strict';return "+test+"})()");
+}
+
+a = "propertyName"
+runTestThrow("{[1,a]: true}.propertyName")
+runTestThrow("{propertyName: false, [1,a]: true}.propertyName")
+runTestThrow("{[1,a]: false, propertyName: true}.propertyName")
+runTestThrow("{get propertyName(){ return false; }, [1,a]: true}.propertyName")
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsobjectliteralcomputedmethodsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/object-literal-computed-methods.js (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/object-literal-computed-methods.js 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/LayoutTests/js/script-tests/object-literal-computed-methods.js 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> shouldThrow("({ [](,,,){} })");
</span><span class="cx"> shouldThrow("({ [1+](){} })");
</span><span class="cx"> shouldThrow("({ [1,](){} })");
</span><ins>+shouldThrow("({ [1,'name'](){} })");
</ins><span class="cx"> shouldThrow("({ [[1](){} })");
</span><span class="cx"> shouldThrow("({ [foo](,,,){} })");
</span><span class="cx"> shouldThrow("({ [foo](a{}, bar(){} })");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-21 Joseph Pecoraro <pecoraro@apple.com>
+
+ Computed Property names should allow only AssignmentExpressions not any Expression
+ https://bugs.webkit.org/show_bug.cgi?id=142902
+
+ Reviewed by Ryosuke Niwa.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseProperty):
+ Limit computed expressions to just assignment expressions instead of
+ any expression (which allowed comma expressions).
+
</ins><span class="cx"> 2015-03-21 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Make UnlinkedFunctionExecutable fit in a 128-byte cell.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (181828 => 181829)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-03-22 00:07:46 UTC (rev 181828)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-03-22 03:14:47 UTC (rev 181829)
</span><span class="lines">@@ -2004,7 +2004,7 @@
</span><span class="cx"> }
</span><span class="cx"> case OPENBRACKET: {
</span><span class="cx"> next();
</span><del>- auto propertyName = parseExpression(context);
</del><ins>+ auto propertyName = parseAssignmentExpression(context);
</ins><span class="cx"> failIfFalse(propertyName, "Cannot parse computed property name");
</span><span class="cx"> handleProductionOrFail(CLOSEBRACKET, "]", "end", "computed property name");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>