<!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>[197947] 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/197947">197947</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-10 11:41:37 -0800 (Thu, 10 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assignment to new.target should be an early error
https://bugs.webkit.org/show_bug.cgi?id=151148
Reviewed by Mark Lam.
This patch makes it so that any form of assignment to new.target
is an early syntax error.
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createNewTargetExpr):
(JSC::ASTBuilder::isNewTarget):
(JSC::ASTBuilder::createResolve):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseAssignmentExpression):
(JSC::Parser<LexerType>::parseUnaryExpression):
* parser/SyntaxChecker.h:
(JSC::SyntaxChecker::createThisExpr):
(JSC::SyntaxChecker::createSuperExpr):
(JSC::SyntaxChecker::createNewTargetExpr):
(JSC::SyntaxChecker::isNewTarget):
(JSC::SyntaxChecker::createResolve):
(JSC::SyntaxChecker::createObjectLiteral):
* tests/es6.yaml:
* tests/stress/new-target-syntax-errors.js: Added.
(shouldBeSyntaxError):
(shouldNotBeSyntaxError):
* tests/stress/new-target.js:
(Constructor):
(doWeirdThings):
(noAssign): Deleted.
(catch): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserSyntaxCheckerh">trunk/Source/JavaScriptCore/parser/SyntaxChecker.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressnewtargetjs">trunk/Source/JavaScriptCore/tests/stress/new-target.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressnewtargetsyntaxerrorsjs">trunk/Source/JavaScriptCore/tests/stress/new-target-syntax-errors.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-03-10 Saam barati <sbarati@apple.com>
+
+ Assignment to new.target should be an early error
+ https://bugs.webkit.org/show_bug.cgi?id=151148
+
+ Reviewed by Mark Lam.
+
+ This patch makes it so that any form of assignment to new.target
+ is an early syntax error.
+
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createNewTargetExpr):
+ (JSC::ASTBuilder::isNewTarget):
+ (JSC::ASTBuilder::createResolve):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseAssignmentExpression):
+ (JSC::Parser<LexerType>::parseUnaryExpression):
+ * parser/SyntaxChecker.h:
+ (JSC::SyntaxChecker::createThisExpr):
+ (JSC::SyntaxChecker::createSuperExpr):
+ (JSC::SyntaxChecker::createNewTargetExpr):
+ (JSC::SyntaxChecker::isNewTarget):
+ (JSC::SyntaxChecker::createResolve):
+ (JSC::SyntaxChecker::createObjectLiteral):
+ * tests/es6.yaml:
+ * tests/stress/new-target-syntax-errors.js: Added.
+ (shouldBeSyntaxError):
+ (shouldNotBeSyntaxError):
+ * tests/stress/new-target.js:
+ (Constructor):
+ (doWeirdThings):
+ (noAssign): Deleted.
+ (catch): Deleted.
+
</ins><span class="cx"> 2016-03-08 Skachkov Oleksandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> How we load new.target in arrow functions is broken
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx"> usesNewTarget();
</span><span class="cx"> return new (m_parserArena) NewTargetNode(location);
</span><span class="cx"> }
</span><ins>+ NO_RETURN_DUE_TO_CRASH bool isNewTarget(ExpressionNode*) { RELEASE_ASSERT_NOT_REACHED(); }
</ins><span class="cx"> ExpressionNode* createResolve(const JSTokenLocation& location, const Identifier& ident, const JSTextPosition& start, const JSTextPosition& end)
</span><span class="cx"> {
</span><span class="cx"> if (m_vm->propertyNames->arguments == ident)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -3040,6 +3040,10 @@
</span><span class="cx"> }
</span><span class="cx"> m_parserState.nonTrivialExpressionCount++;
</span><span class="cx"> hadAssignment = true;
</span><ins>+ if (!TreeBuilder::CreatesAST) { // We only need to do this check with the syntax checker.
+ if (UNLIKELY(context.isNewTarget(lhs)))
+ internalFailWithMessage(false, "new.target can't be the left hand side of an assignment expression");
+ }
</ins><span class="cx"> context.assignmentStackAppend(assignmentStack, lhs, start, tokenStartPosition(), m_parserState.assignmentCount, op);
</span><span class="cx"> start = tokenStartPosition();
</span><span class="cx"> m_parserState.assignmentCount++;
</span><span class="lines">@@ -4005,6 +4009,10 @@
</span><span class="cx"> failWithMessage("Cannot parse subexpression of ", operatorString(true, lastOperator), "operator");
</span><span class="cx"> failWithMessage("Cannot parse member expression");
</span><span class="cx"> }
</span><ins>+ if (!TreeBuilder::CreatesAST) { // We only need to do this check with the syntax checker.
+ if (UNLIKELY(lastOperator && context.isNewTarget(expr)))
+ internalFailWithMessage(false, "new.target can't come after a prefix operator");
+ }
</ins><span class="cx"> bool isEvalOrArguments = false;
</span><span class="cx"> if (strictMode() && !m_syntaxAlreadyValidated) {
</span><span class="cx"> if (context.isResolve(expr))
</span><span class="lines">@@ -4013,6 +4021,10 @@
</span><span class="cx"> failIfTrueIfStrict(isEvalOrArguments && modifiesExpr, "Cannot modify '", m_parserState.lastIdentifier->impl(), "' in strict mode");
</span><span class="cx"> switch (m_token.m_type) {
</span><span class="cx"> case PLUSPLUS:
</span><ins>+ if (!TreeBuilder::CreatesAST) { // We only need to do this check with the syntax checker.
+ if (UNLIKELY(context.isNewTarget(expr)))
+ internalFailWithMessage(false, "new.target can't come before a postfix operator");
+ }
</ins><span class="cx"> m_parserState.nonTrivialExpressionCount++;
</span><span class="cx"> m_parserState.nonLHSCount++;
</span><span class="cx"> expr = context.makePostfixNode(location, expr, OpPlusPlus, subExprStart, lastTokenEndPosition(), tokenEndPosition());
</span><span class="lines">@@ -4023,6 +4035,10 @@
</span><span class="cx"> next();
</span><span class="cx"> break;
</span><span class="cx"> case MINUSMINUS:
</span><ins>+ if (!TreeBuilder::CreatesAST) { // We only need to do this check with the syntax checker.
+ if (UNLIKELY(context.isNewTarget(expr)))
+ internalFailWithMessage(false, "new.target can't come before a postfix operator");
+ }
</ins><span class="cx"> m_parserState.nonTrivialExpressionCount++;
</span><span class="cx"> m_parserState.nonLHSCount++;
</span><span class="cx"> expr = context.makePostfixNode(location, expr, OpMinusMinus, subExprStart, lastTokenEndPosition(), tokenEndPosition());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserSyntaxCheckerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/SyntaxChecker.h (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/parser/SyntaxChecker.h 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> ExpressionType createThisExpr(const JSTokenLocation&, ThisTDZMode) { return ThisExpr; }
</span><span class="cx"> ExpressionType createSuperExpr(const JSTokenLocation&) { return SuperExpr; }
</span><span class="cx"> ExpressionType createNewTargetExpr(const JSTokenLocation&) { return NewTargetExpr; }
</span><ins>+ ALWAYS_INLINE bool isNewTarget(ExpressionType type) { return type == NewTargetExpr; }
</ins><span class="cx"> ExpressionType createResolve(const JSTokenLocation&, const Identifier&, int, int) { return ResolveExpr; }
</span><span class="cx"> ExpressionType createObjectLiteral(const JSTokenLocation&) { return ObjectLiteralExpr; }
</span><span class="cx"> ExpressionType createObjectLiteral(const JSTokenLocation&, int) { return ObjectLiteralExpr; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> - path: es6/miscellaneous_RegExp_constructor_can_alter_flags.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/new.target_assignment_is_an_early_error.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/non-strict_function_semantics_hoisted_block-level_function_declaration.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Promise_is_subclassable_Promise.all.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressnewtargetsyntaxerrorsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/new-target-syntax-errors.js (0 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/new-target-syntax-errors.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/new-target-syntax-errors.js 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -0,0 +1,86 @@
</span><ins>+function shouldBeSyntaxError(str) {
+ let failed = true;
+ try {
+ new Function(str);
+ } catch(e) {
+ if (e instanceof SyntaxError)
+ failed = false;
+ }
+
+ if (failed)
+ throw new Error("Did not throw syntax error: " + str);
+}
+
+function shouldNotBeSyntaxError(str) {
+ let failed = false;
+ try {
+ new Function(str);
+ } catch(e) {
+ if (e instanceof SyntaxError && e.message.indexOf("new.target") !== -1)
+ failed = true;
+ }
+
+ if (failed)
+ throw new Error("Did throw a syntax error: " + str);
+}
+
+
+let operators = ["=", "+=", "-=", "*=", "<<=", ">>=", ">>>=", "&=", "^=", "|=", "%="];
+for (let operator of operators) {
+ let functionBody = `new.target ${operator} 20`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `foo = new.target ${operator} 20`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `foo ${operator} new.target ${operator} 20`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `new.target ${operator} foo *= 40`;
+ shouldBeSyntaxError(functionBody);
+
+
+ // Make sure our tests cases our sound and they should not be syntax errors if new.target is replaced by foo
+ functionBody = `foo ${operator} 20`;
+ shouldNotBeSyntaxError(functionBody);
+
+ functionBody = `foo = foo ${operator} 20`;
+ shouldNotBeSyntaxError(functionBody);
+
+ functionBody = `foo ${operator} foo ${operator} 20`;
+ shouldNotBeSyntaxError(functionBody);
+
+ functionBody = `foo ${operator} foo *= 40`;
+ shouldNotBeSyntaxError(functionBody);
+}
+
+let prePostFixOperators = ["++", "--"];
+for (let operator of prePostFixOperators) {
+ let functionBody = `${operator}new.target`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `foo = ${operator}new.target`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `${operator}foo`;
+ shouldNotBeSyntaxError(functionBody);
+
+ functionBody = `foo = ${operator}foo`;
+ shouldNotBeSyntaxError(functionBody);
+}
+
+for (let operator of prePostFixOperators) {
+ let functionBody = `new.target${operator}`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `foo = new.target${operator}`;
+ shouldBeSyntaxError(functionBody);
+
+ functionBody = `foo${operator}`;
+ shouldNotBeSyntaxError(functionBody);
+
+ functionBody = `foo = foo${operator}`;
+ shouldNotBeSyntaxError(functionBody);
+}
+
+shouldBeSyntaxError(`({foo: new.target} = {foo:20})`);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressnewtargetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/new-target.js (197946 => 197947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/new-target.js 2016-03-10 19:26:32 UTC (rev 197946)
+++ trunk/Source/JavaScriptCore/tests/stress/new-target.js 2016-03-10 19:41:37 UTC (rev 197947)
</span><span class="lines">@@ -33,21 +33,6 @@
</span><span class="cx"> }
</span><span class="cx"> new Constructor();
</span><span class="cx">
</span><del>-function noAssign() {
- new.target = 1;
-}
-
-try {
- new noAssign();
- passed = false;
-} catch(e) { }
-try {
- noAssign();
- passed = false;
-} catch(e) { }
-
-test(passed, true, "new.target should not be a reference");
-
</del><span class="cx"> // This is mostly to test that calling new on new.target deos the right thing.
</span><span class="cx"> function doWeirdThings(arg) {
</span><span class="cx"> if (new.target) {
</span></span></pre>
</div>
</div>
</body>
</html>