<!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>[199352] 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/199352">199352</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-04-12 08:21:51 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>We incorrectly parse arrow function expressions
https://bugs.webkit.org/show_bug.cgi?id=156373
Reviewed by Mark Lam.
Source/JavaScriptCore:
This patch removes the notion of "isEndOfArrowFunction".
This was a very weird function and it was incorrect.
It checked that the arrow functions with concise body
grammar production "had a valid ending". "had a valid
ending" is in quotes because concise body arrow functions
have a valid ending as long as their body has a valid
assignment expression. I've removed all notion of this
function because it was wrong and was causing us
to throw syntax errors on valid programs.
* parser/Lexer.cpp:
(JSC::Lexer<T>::nextTokenIsColon):
(JSC::Lexer<T>::lex):
(JSC::Lexer<T>::setTokenPosition): Deleted.
* parser/Lexer.h:
(JSC::Lexer::setIsReparsingFunction):
(JSC::Lexer::isReparsingFunction):
(JSC::Lexer::lineNumber):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseInner):
(JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
(JSC::Parser<LexerType>::parseFunctionInfo):
* parser/Parser.h:
(JSC::Parser::matchIdentifierOrKeyword):
(JSC::Parser::tokenStart):
(JSC::Parser::autoSemiColon):
(JSC::Parser::canRecurse):
(JSC::Parser::isEndOfArrowFunction): Deleted.
(JSC::Parser::setEndOfStatement): Deleted.
* tests/stress/arrowfunction-others.js:
(testCase):
(simpleArrowFunction):
(truthy):
(falsey):
LayoutTests:
* js/parser-syntax-check-expected.txt:
* js/script-tests/parser-syntax-check.js:
(catch):</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="#trunkSourceJavaScriptCoreparserLexercpp">trunk/Source/JavaScriptCore/parser/Lexer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserLexerh">trunk/Source/JavaScriptCore/parser/Lexer.h</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="#trunkSourceJavaScriptCoretestsstressarrowfunctionothersjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-others.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/LayoutTests/ChangeLog 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-12 Saam barati <sbarati@apple.com>
+
+ We incorrectly parse arrow function expressions
+ https://bugs.webkit.org/show_bug.cgi?id=156373
+
+ Reviewed by Mark Lam.
+
+ * js/parser-syntax-check-expected.txt:
+ * js/script-tests/parser-syntax-check.js:
+ (catch):
+
</ins><span class="cx"> 2016-03-17 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Add parsing support for <auto-repeat> syntax
</span></span></pre></div>
<a id="trunkLayoutTestsjsparsersyntaxcheckexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parser-syntax-check-expected.txt (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parser-syntax-check-expected.txt 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/LayoutTests/js/parser-syntax-check-expected.txt 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1231,6 +1231,34 @@
</span><span class="cx"> PASS Invalid: "function f() { foo(x ==> x) }"
</span><span class="cx"> PASS Invalid: "foo(x = x ==> x)"
</span><span class="cx"> PASS Invalid: "function f() { foo(x = x ==> x) }"
</span><ins>+PASS Valid: "var f = cond ? ()=>20 : ()=>20" with ReferenceError
+PASS Valid: "function f() { var f = cond ? ()=>20 : ()=>20 }"
+PASS Valid: "var f = cond ? (x)=>{x} : ()=>20" with ReferenceError
+PASS Valid: "function f() { var f = cond ? (x)=>{x} : ()=>20 }"
+PASS Valid: "var f = cond ? (x)=>x : ()=>{2}" with ReferenceError
+PASS Valid: "function f() { var f = cond ? (x)=>x : ()=>{2} }"
+PASS Valid: "var f = cond ? (x)=>x : x=>2" with ReferenceError
+PASS Valid: "function f() { var f = cond ? (x)=>x : x=>2 }"
+PASS Valid: "var f = cond ? x=>x : x=>2" with ReferenceError
+PASS Valid: "function f() { var f = cond ? x=>x : x=>2 }"
+PASS Valid: "var f = cond ? x=>x*2 : x=>2" with ReferenceError
+PASS Valid: "function f() { var f = cond ? x=>x*2 : x=>2 }"
+PASS Valid: "var f = cond ? x=>x.foo : x=>2" with ReferenceError
+PASS Valid: "function f() { var f = cond ? x=>x.foo : x=>2 }"
+PASS Valid: "var f = cond ? x=>x.foo : x=>x + x + x + x + x + x + x" with ReferenceError
+PASS Valid: "function f() { var f = cond ? x=>x.foo : x=>x + x + x + x + x + x + x }"
+PASS Valid: "var f = cond ? x=>{x.foo } : x=>x + x + x + x + x + x + (x =>x) " with ReferenceError
+PASS Valid: "function f() { var f = cond ? x=>{x.foo } : x=>x + x + x + x + x + x + (x =>x) }"
+PASS Valid: "var f = (x) => x => (x) => ({y}) => y"
+PASS Valid: "function f() { var f = (x) => x => (x) => ({y}) => y }"
+PASS Invalid: "var f = cond ? x=>x.foo; : x=>x + x + x + x + x + x + x"
+PASS Invalid: "function f() { var f = cond ? x=>x.foo; : x=>x + x + x + x + x + x + x }"
+PASS Invalid: "var f = cond ? x=>x.foo : : x=>x + x + x + x + x + x + x"
+PASS Invalid: "function f() { var f = cond ? x=>x.foo : : x=>x + x + x + x + x + x + x }"
+PASS Invalid: "var f = cond ? x=>{x.foo :} : x=>x + x + x + x + x + x + x"
+PASS Invalid: "function f() { var f = cond ? x=>{x.foo :} : x=>x + x + x + x + x + x + x }"
+PASS Invalid: "var f = cond ? x=>{x.foo } => : x=>x + x + x + x + x + x + x"
+PASS Invalid: "function f() { var f = cond ? x=>{x.foo } => : x=>x + x + x + x + x + x + x }"
</ins><span class="cx"> PASS e.line is 1
</span><span class="cx"> PASS foo is 'PASS'
</span><span class="cx"> PASS bar is 'PASS'
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparsersyntaxcheckjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parser-syntax-check.js (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/LayoutTests/js/script-tests/parser-syntax-check.js 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -726,6 +726,20 @@
</span><span class="cx"> invalid("foo(([x = 25]) => x => x => {)");
</span><span class="cx"> invalid("foo(x ==> x)");
</span><span class="cx"> invalid("foo(x = x ==> x)");
</span><ins>+valid("var f = cond ? ()=>20 : ()=>20");
+valid("var f = cond ? (x)=>{x} : ()=>20");
+valid("var f = cond ? (x)=>x : ()=>{2}");
+valid("var f = cond ? (x)=>x : x=>2");
+valid("var f = cond ? x=>x : x=>2");
+valid("var f = cond ? x=>x*2 : x=>2");
+valid("var f = cond ? x=>x.foo : x=>2");
+valid("var f = cond ? x=>x.foo : x=>x + x + x + x + x + x + x");
+valid("var f = cond ? x=>{x.foo } : x=>x + x + x + x + x + x + (x =>x) ");
+valid("var f = (x) => x => (x) => ({y}) => y");
+invalid("var f = cond ? x=>x.foo; : x=>x + x + x + x + x + x + x");
+invalid("var f = cond ? x=>x.foo : : x=>x + x + x + x + x + x + x");
+invalid("var f = cond ? x=>{x.foo :} : x=>x + x + x + x + x + x + x");
+invalid("var f = cond ? x=>{x.foo } => : x=>x + x + x + x + x + x + x");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> try { eval("a.b.c = {};"); } catch(e1) { e=e1; shouldBe("e.line", "1") }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-04-12 Saam barati <sbarati@apple.com>
+
+ We incorrectly parse arrow function expressions
+ https://bugs.webkit.org/show_bug.cgi?id=156373
+
+ Reviewed by Mark Lam.
+
+ This patch removes the notion of "isEndOfArrowFunction".
+ This was a very weird function and it was incorrect.
+ It checked that the arrow functions with concise body
+ grammar production "had a valid ending". "had a valid
+ ending" is in quotes because concise body arrow functions
+ have a valid ending as long as their body has a valid
+ assignment expression. I've removed all notion of this
+ function because it was wrong and was causing us
+ to throw syntax errors on valid programs.
+
+ * parser/Lexer.cpp:
+ (JSC::Lexer<T>::nextTokenIsColon):
+ (JSC::Lexer<T>::lex):
+ (JSC::Lexer<T>::setTokenPosition): Deleted.
+ * parser/Lexer.h:
+ (JSC::Lexer::setIsReparsingFunction):
+ (JSC::Lexer::isReparsingFunction):
+ (JSC::Lexer::lineNumber):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseInner):
+ (JSC::Parser<LexerType>::parseArrowFunctionSingleExpressionBodySourceElements):
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ * parser/Parser.h:
+ (JSC::Parser::matchIdentifierOrKeyword):
+ (JSC::Parser::tokenStart):
+ (JSC::Parser::autoSemiColon):
+ (JSC::Parser::canRecurse):
+ (JSC::Parser::isEndOfArrowFunction): Deleted.
+ (JSC::Parser::setEndOfStatement): Deleted.
+ * tests/stress/arrowfunction-others.js:
+ (testCase):
+ (simpleArrowFunction):
+ (truthy):
+ (falsey):
+
</ins><span class="cx"> 2016-04-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] addStaticGlobals should emit SymbolTableEntry watchpoints to encourage constant folding in DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.cpp (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/parser/Lexer.cpp 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1766,16 +1766,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>-void Lexer<T>::setTokenPosition(JSToken* tokenRecord)
-{
- JSTokenData* tokenData = &tokenRecord->m_data;
- tokenData->line = lineNumber();
- tokenData->offset = currentOffset();
- tokenData->lineStartOffset = currentLineStartOffset();
- ASSERT(tokenData->offset >= tokenData->lineStartOffset);
-}
-
-template <typename T>
</del><span class="cx"> JSTokenType Lexer<T>::lex(JSToken* tokenRecord, unsigned lexerFlags, bool strictMode)
</span><span class="cx"> {
</span><span class="cx"> JSTokenData* tokenData = &tokenRecord->m_data;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserLexerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Lexer.h (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Lexer.h 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/parser/Lexer.h 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> void setIsReparsingFunction() { m_isReparsingFunction = true; }
</span><span class="cx"> bool isReparsingFunction() const { return m_isReparsingFunction; }
</span><span class="cx">
</span><del>- void setTokenPosition(JSToken* tokenRecord);
</del><span class="cx"> JSTokenType lex(JSToken*, unsigned, bool strictMode);
</span><span class="cx"> bool nextTokenIsColon();
</span><span class="cx"> int lineNumber() const { return m_lineNumber; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -287,16 +287,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool validEnding;
- if (isArrowFunctionBodyExpression) {
- ASSERT(m_lexer->isReparsingFunction());
- // When we reparse and stack overflow, we're not guaranteed a valid ending. If we don't run out of stack space,
- // then of course this will always be valid because we already parsed for syntax errors. But we must
- // be cautious in case we run out of stack space.
- validEnding = isEndOfArrowFunction();
- } else
- validEnding = consume(EOFTOK);
-
</del><ins>+ bool validEnding = consume(EOFTOK);
</ins><span class="cx"> if (!sourceElements || !validEnding) {
</span><span class="cx"> if (hasError())
</span><span class="cx"> parseError = m_errorMessage;
</span><span class="lines">@@ -853,13 +844,8 @@
</span><span class="cx">
</span><span class="cx"> context.setEndOffset(expr, m_lastTokenEndPosition.offset);
</span><span class="cx">
</span><del>- failIfFalse(isEndOfArrowFunction(), "Expected a ';', ']', '}', ')', ',', line terminator or EOF following a arrow function statement");
-
</del><span class="cx"> JSTextPosition end = tokenEndPosition();
</span><span class="cx">
</span><del>- if (!m_lexer->prevTerminator())
- setEndOfStatement();
-
</del><span class="cx"> TreeSourceElements sourceElements = context.createSourceElements();
</span><span class="cx"> TreeStatement body = context.createReturnStatement(location, expr, start, end);
</span><span class="cx"> context.setEndOffset(body, m_lastTokenEndPosition.offset);
</span><span class="lines">@@ -2169,9 +2155,7 @@
</span><span class="cx">
</span><span class="cx"> popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo);
</span><span class="cx">
</span><del>- if (functionBodyType == ArrowFunctionBodyExpression)
- failIfFalse(isEndOfArrowFunction(), "Expected the closing ';' ',' ']' ')' '}', line terminator or EOF after arrow function");
- else {
</del><ins>+ if (functionBodyType != ArrowFunctionBodyExpression) {
</ins><span class="cx"> matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
</span><span class="cx"> next();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1257,11 +1257,6 @@
</span><span class="cx"> return isIdentifierOrKeyword(m_token);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ALWAYS_INLINE bool isEndOfArrowFunction()
- {
- return match(SEMICOLON) || match(COMMA) || match(CLOSEPAREN) || match(CLOSEBRACE) || match(CLOSEBRACKET) || match(EOFTOK) || m_lexer->prevTerminator();
- }
-
</del><span class="cx"> ALWAYS_INLINE unsigned tokenStart()
</span><span class="cx"> {
</span><span class="cx"> return m_token.m_location.startOffset;
</span><span class="lines">@@ -1482,11 +1477,6 @@
</span><span class="cx"> return allowAutomaticSemicolon();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setEndOfStatement()
- {
- m_lexer->setTokenPosition(&m_token);
- }
-
</del><span class="cx"> bool canRecurse()
</span><span class="cx"> {
</span><span class="cx"> return m_vm->isSafeToRecurse();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionothersjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-others.js (199351 => 199352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-others.js 2016-04-12 15:19:31 UTC (rev 199351)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-others.js 2016-04-12 15:21:51 UTC (rev 199352)
</span><span class="lines">@@ -1,17 +1,27 @@
</span><span class="cx"> var testCase = function (actual, expected, message) {
</span><del>- if (actual !== expected) {
- throw message + ". Expected '" + expected + "', but was '" + actual + "'";
- }
</del><ins>+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> var simpleArrowFunction = () => {};
</span><span class="cx">
</span><span class="cx"> noInline(simpleArrowFunction);
</span><span class="cx">
</span><ins>+function truthy() { return true; }
+function falsey() { return false; }
+noInline(truthy);
+noInline(falsey);
+
</ins><span class="cx"> for (var i=0;i<10000;i++) {
</span><del>- testCase(Object.getPrototypeOf(simpleArrowFunction), Function.prototype, "Error: Not correct getPrototypeOf value for arrow function");
</del><ins>+ testCase(Object.getPrototypeOf(simpleArrowFunction), Function.prototype, "Error: Not correct getPrototypeOf value for arrow function");
</ins><span class="cx">
</span><del>- testCase(simpleArrowFunction instanceof Function, true, "Error: Not correct result for instanceof method for arrow function");
</del><ins>+ testCase(simpleArrowFunction instanceof Function, true, "Error: Not correct result for instanceof method for arrow function");
</ins><span class="cx">
</span><del>- testCase(simpleArrowFunction.constructor == Function, true, "Error: Not correct result for constructor method of arrow functio n");
</del><ins>+ testCase(simpleArrowFunction.constructor == Function, true, "Error: Not correct result for constructor method of arrow functio n");
+
+ let a1 = truthy() ? ()=>1 : ()=>2;
+ let a2 = falsey() ? ()=>2 : ()=>1;
+ testCase(a1(), 1, "Should be 1");
+ testCase(a2(), 1, "should be 1");
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>