<!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>[192876] 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/192876">192876</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-01 01:46:12 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] "super" and "this" should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment
https://bugs.webkit.org/show_bug.cgi?id=149338
Source/JavaScriptCore:
Patch by Aleksandr Skachkov <gskachkov@gmail.com> on 2015-12-01
Reviewed by Saam Barati.
Implemented new version of the lexically bound 'this' in arrow function. In current version
'this' is stored inside of the lexical environment of the function. To store and load we use
op_get_from_scope and op_put_to_scope operations. Also new implementation prevent raising TDZ
error for arrow functions that are declared before super() but invoke after.
* builtins/BuiltinExecutables.cpp:
(JSC::createExecutableInternal):
* bytecode/BytecodeList.json:
* bytecode/BytecodeUseDef.h:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
* bytecode/EvalCodeCache.h:
(JSC::EvalCodeCache::getSlow):
* bytecode/ExecutableInfo.h:
(JSC::ExecutableInfo::ExecutableInfo):
(JSC::ExecutableInfo::isDerivedConstructorContext):
(JSC::ExecutableInfo::isArrowFunctionContext):
* bytecode/UnlinkedCodeBlock.cpp:
(JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
* bytecode/UnlinkedCodeBlock.h:
(JSC::UnlinkedCodeBlock::isDerivedConstructorContext):
(JSC::UnlinkedCodeBlock::isArrowFunctionContext):
* bytecode/UnlinkedFunctionExecutable.cpp:
(JSC::generateUnlinkedFunctionCodeBlock):
(JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
* bytecode/UnlinkedFunctionExecutable.h:
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
(JSC::BytecodeGenerator::initializeArrowFunctionContextScopeIfNeeded):
(JSC::BytecodeGenerator::variable):
(JSC::BytecodeGenerator::emitLoadArrowFunctionLexicalEnvironment):
(JSC::BytecodeGenerator::emitLoadThisFromArrowFunctionLexicalEnvironment):
(JSC::BytecodeGenerator::emitLoadNewTargetFromArrowFunctionLexicalEnvironment):
(JSC::BytecodeGenerator::emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment):
(JSC::BytecodeGenerator::emitPutNewTargetToArrowFunctionContextScope):
(JSC::BytecodeGenerator::emitPutDerivedConstructorToArrowFunctionContextScope):
(JSC::BytecodeGenerator::emitPutThisToArrowFunctionContextScope):
* bytecompiler/BytecodeGenerator.h:
(JSC::BytecodeGenerator::isDerivedConstructorContext):
(JSC::BytecodeGenerator::usesArrowFunction):
(JSC::BytecodeGenerator::needsToUpdateArrowFunctionContext):
(JSC::BytecodeGenerator::usesEval):
(JSC::BytecodeGenerator::usesThis):
(JSC::BytecodeGenerator::newTarget):
(JSC::BytecodeGenerator::makeFunction):
* bytecompiler/NodesCodegen.cpp:
(JSC::ThisNode::emitBytecode):
(JSC::SuperNode::emitBytecode):
(JSC::EvalFunctionCallNode::emitBytecode):
(JSC::FunctionCallValueNode::emitBytecode):
(JSC::FunctionNode::emitBytecode):
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::evaluate):
* dfg/DFGAbstractInterpreterInlines.h:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGCapabilities.cpp:
* dfg/DFGClobberize.h:
* dfg/DFGDoesGC.cpp:
* dfg/DFGFixupPhase.cpp:
* dfg/DFGNodeType.h:
* dfg/DFGObjectAllocationSinkingPhase.cpp:
* dfg/DFGPredictionPropagationPhase.cpp:
* dfg/DFGPromotedHeapLocation.cpp:
* dfg/DFGPromotedHeapLocation.h:
* dfg/DFGSafeToExecute.h:
* dfg/DFGSpeculativeJIT.cpp:
* dfg/DFGSpeculativeJIT.h:
* dfg/DFGSpeculativeJIT32_64.cpp:
* dfg/DFGSpeculativeJIT64.cpp:
* ftl/FTLCapabilities.cpp:
* ftl/FTLLowerDFGToLLVM.cpp:
* ftl/FTLOperations.cpp:
(JSC::FTL::operationMaterializeObjectInOSR):
* interpreter/Interpreter.cpp:
(JSC::eval):
* jit/JIT.cpp:
* jit/JIT.h:
* jit/JITOpcodes.cpp:
(JSC::JIT::emitNewFuncExprCommon):
* jit/JITOpcodes32_64.cpp:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* parser/ASTBuilder.h:
(JSC::ASTBuilder::createArrowFunctionExpr):
(JSC::ASTBuilder::usesArrowFunction):
* parser/Nodes.h:
(JSC::ScopeNode::usesArrowFunction):
* parser/Parser.cpp:
(JSC::Parser<LexerType>::parseFunctionInfo):
* parser/ParserModes.h:
* runtime/CodeCache.cpp:
(JSC::CodeCache::getGlobalCodeBlock):
(JSC::CodeCache::getProgramCodeBlock):
(JSC::CodeCache::getEvalCodeBlock):
(JSC::CodeCache::getModuleProgramCodeBlock):
(JSC::CodeCache::getFunctionExecutableFromGlobalCode):
* runtime/CodeCache.h:
* runtime/CommonIdentifiers.h:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/Executable.cpp:
(JSC::ScriptExecutable::ScriptExecutable):
(JSC::EvalExecutable::create):
(JSC::EvalExecutable::EvalExecutable):
(JSC::ProgramExecutable::ProgramExecutable):
(JSC::ModuleProgramExecutable::ModuleProgramExecutable):
(JSC::FunctionExecutable::FunctionExecutable):
* runtime/Executable.h:
(JSC::ScriptExecutable::isArrowFunctionContext):
(JSC::ScriptExecutable::isDerivedConstructorContext):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::createEvalCodeBlock):
* runtime/JSGlobalObject.h:
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncEval):
* tests/es6.yaml:
* tests/stress/arrowfunction-activation-sink-osrexit.js:
* tests/stress/arrowfunction-activation-sink.js:
* tests/stress/arrowfunction-lexical-bind-newtarget.js: Added.
* tests/stress/arrowfunction-lexical-bind-supercall-1.js: Added.
* tests/stress/arrowfunction-lexical-bind-supercall-2.js: Added.
* tests/stress/arrowfunction-lexical-bind-supercall-3.js: Added.
* tests/stress/arrowfunction-lexical-bind-supercall-4.js: Added.
* tests/stress/arrowfunction-lexical-bind-this-1.js:
* tests/stress/arrowfunction-lexical-bind-this-7.js: Added.
* tests/stress/arrowfunction-tdz-1.js: Added.
* tests/stress/arrowfunction-tdz-2.js: Added.
* tests/stress/arrowfunction-tdz-3.js: Added.
* tests/stress/arrowfunction-tdz-4.js: Added.
* tests/stress/arrowfunction-tdz.js: Removed.
LayoutTests:
Patch by Skachkov Oleksandr <gskachkov@gmail.com> on 2015-12-01
Reviewed by Saam Barati.
* js/arrowfunction-supercall-expected.txt: Added.
* js/arrowfunction-supercall.html: Added.
* js/arrowfunction-tdz-expected.txt: Added new expectation.
* js/script-tests/arrowfunction-supercall.js: Added.
* js/script-tests/arrowfunction-tdz.js: Added new cases.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsarrowfunctiontdzexpectedtxt">trunk/LayoutTests/js/arrowfunction-tdz-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrowfunctiontdzjs">trunk/LayoutTests/js/script-tests/arrowfunction-tdz.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp">trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeUseDefh">trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeEvalCodeCacheh">trunk/Source/JavaScriptCore/bytecode/EvalCodeCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeExecutableInfoh">trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutablecpp">trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh">trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDoesGCcpp">trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGFixupPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPromotedHeapLocationcpp">trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPromotedHeapLocationh">trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafeToExecuteh">trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITh">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOperationscpp">trunk/Source/JavaScriptCore/ftl/FTLOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserASTBuilderh">trunk/Source/JavaScriptCore/parser/ASTBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserModesh">trunk/Source/JavaScriptCore/parser/ParserModes.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCachecpp">trunk/Source/JavaScriptCore/runtime/CodeCache.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCodeCacheh">trunk/Source/JavaScriptCore/runtime/CodeCache.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionactivationsinkosrexitjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink-osrexit.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionactivationsinkjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindthis1js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-1.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsarrowfunctionsupercallexpectedtxt">trunk/LayoutTests/js/arrowfunction-supercall-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsarrowfunctionsupercallhtml">trunk/LayoutTests/js/arrowfunction-supercall.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsarrowfunctionsupercalljs">trunk/LayoutTests/js/script-tests/arrowfunction-supercall.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindnewtargetjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-newtarget.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall1js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-1.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall2js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-2.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall3js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-3.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall4js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-4.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindthis7js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-7.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontdz1js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-1.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontdz2js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-2.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontdz3js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-3.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontdz4js">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-4.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressarrowfunctiontdzjs">trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/LayoutTests/ChangeLog 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-12-01 Skachkov Oleksandr <gskachkov@gmail.com>
+
+ [ES6] "super" and "this" should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment
+ https://bugs.webkit.org/show_bug.cgi?id=149338
+
+ Reviewed by Saam Barati.
+
+ * js/arrowfunction-supercall-expected.txt: Added.
+ * js/arrowfunction-supercall.html: Added.
+ * js/arrowfunction-tdz-expected.txt: Added new expectation.
+ * js/script-tests/arrowfunction-supercall.js: Added.
+ * js/script-tests/arrowfunction-tdz.js: Added new cases.
+
</ins><span class="cx"> 2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] streams should not directly use Number and related methods
</span></span></pre></div>
<a id="trunkLayoutTestsjsarrowfunctionsupercallexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/arrowfunction-supercall-expected.txt (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/arrowfunction-supercall-expected.txt (rev 0)
+++ trunk/LayoutTests/js/arrowfunction-supercall-expected.txt 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+Tests for ES6 arrow function, calling of the super in arrow function
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS isReferenceError is true
+PASS b.id is value
+PASS isReferenceError is true
+PASS d1.id is "b"
+PASS d2.id is value
+PASS (new D()).id is value
+PASS (new E(false)).id is value
+PASS typeof (new E(true)).id is 'undefined'
+PASS (new F(false)).id is value
+PASS typeof (new F(true)).id is 'undefined'
+PASS indexOfParentClassInStackError < indexOfnestedArrowInStackError is true
+PASS indexOfnestedArrowInStackError < indexOfarrowInChildConstructorInStackError is true
+PASS indexOfarrowInChildConstructorInStackError < indexOfChildClassInStackError is true
+PASS indexOfChildClassInStackError > 0 is true
+PASS indexOfParentClassInStackError > -1 && errorStack.indexOf('ParentClass', indexOfParentClassInStackError + 1) === -1 is true
+PASS indexOfnestedArrowInStackError > -1 && errorStack.indexOf('nestedArrow', indexOfnestedArrowInStackError + 1) === -1 is true
+PASS indexOfarrowInChildConstructorInStackError > -1 && errorStack.indexOf('arrowInChildConstructor', indexOfarrowInChildConstructorInStackError + 1) === -1 is true
+PASS indexOfChildClassInStackError > -1 && errorStack.indexOf('ChildClass', indexOfChildClassInStackError + 1) === -1 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsarrowfunctionsupercallhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/arrowfunction-supercall.html (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/arrowfunction-supercall.html (rev 0)
+++ trunk/LayoutTests/js/arrowfunction-supercall.html 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/arrowfunction-supercall.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsarrowfunctiontdzexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/arrowfunction-tdz-expected.txt (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/arrowfunction-tdz-expected.txt 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/LayoutTests/js/arrowfunction-tdz-expected.txt 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -4,6 +4,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS isReferenceError is true
</span><ins>+PASS isReferenceError is true
+PASS d.id is 'a'
+PASS e.id is 'a'
+PASS f.id is 'a'
+PASS isReferenceError is true
+PASS g.id is 'a'
+PASS h.id is 'a'
+PASS i.id is 'a'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrowfunctionsupercalljs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/arrowfunction-supercall.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/arrowfunction-supercall.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/arrowfunction-supercall.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,151 @@
</span><ins>+description('Tests for ES6 arrow function, calling of the super in arrow function');
+
+var value = 'abcd-1234';
+
+var A = class A {
+ constructor() {
+ this.id = value;
+ }
+};
+
+var B = class B extends A {
+ constructor(accessThisBeforeSuper) {
+ var f = () => { super(); };
+ if (accessThisBeforeSuper) {
+ if (this.id !== value) throw new Error('Should be reference error because of TDZ');
+ f();
+ } else {
+ f();
+ if (this.id !== value) throw new Error('wrong value');
+ }
+ }
+};
+
+var isReferenceError = false;
+try {
+ new B(true);
+} catch (e) {
+ isReferenceError = e instanceof ReferenceError;
+}
+
+shouldBe('isReferenceError', 'true');
+
+var b = new B(false);
+shouldBe('b.id', 'value');
+
+var C = class C extends A {
+ constructor(runSuperInConstructor, forceTDZ) {
+ var f1 = () => { if (!forceTDZ) super(); this.id = 'b'; };
+ var f2 = () => { if (this.id !== 'b') throw new Error('wrong bound of the this'); };
+ var f3 = () => { if (this.id !== value) throw new Error('wrong bound of the this'); };
+
+ if (runSuperInConstructor) {
+ super();
+ f3();
+ } else {
+ f1();
+ f2();
+ }
+ }
+};
+
+isReferenceError = false;
+try {
+ new C(false, true);
+} catch (e) {
+ isReferenceError = e instanceof ReferenceError;
+}
+shouldBe('isReferenceError', 'true');
+var d1 = new C(false, false);
+shouldBe('d1.id', '"b"');
+
+var d2 = new C(true, false);
+shouldBe('d2.id', 'value');
+
+var D = class D extends A {
+ constructor () {
+ var arrow = () => {
+ let __proto__ = 'some-text';
+ var arr = () => {
+ let value = __proto__ + 'text';
+ super();
+ };
+
+ arr();
+ };
+
+ arrow();
+ }
+};
+shouldBe('(new D()).id', 'value');
+
+class E extends A {
+ constructor(doReplaceProto) {
+ var arrow = () => {
+ if (doReplaceProto)
+ E.__proto__ = function () {};
+ super();
+ };
+
+ arrow();
+ }
+};
+shouldBe('(new E(false)).id', "value");
+shouldBe('typeof (new E(true)).id', "'undefined'");
+
+class F extends A {
+ constructor(doReplaceProto) {
+ var arrow = () => super();
+ if (doReplaceProto)
+ F.__proto__ = function () {};
+ arrow();
+ }
+};
+shouldBe('(new F(false)).id', "value");
+shouldBe('typeof (new F(true)).id', "'undefined'");
+
+var errorStack;
+
+var ParentClass = class ParentClass {
+ constructor() {
+ try {
+ this.idValue = testValue;
+ throw new Error('Error');
+ } catch (e) {
+ errorStack = e.stack;
+ }
+ }
+};
+
+var ChildClass = class ChildClass extends ParentClass {
+ constructor () {
+ var arrowInChildConstructor = () => {
+ var nestedArrow = () => {
+ super();
+ }
+
+ nestedArrow();
+ };
+
+ arrowInChildConstructor();
+ }
+};
+
+var c = new ChildClass();
+
+var indexOfParentClassInStackError = errorStack.indexOf('ParentClass');
+var indexOfnestedArrowInStackError = errorStack.indexOf('nestedArrow');
+var indexOfarrowInChildConstructorInStackError = errorStack.indexOf('arrowInChildConstructor');
+var indexOfChildClassInStackError = errorStack.indexOf('ChildClass');
+
+shouldBeTrue("indexOfParentClassInStackError < indexOfnestedArrowInStackError");
+shouldBeTrue("indexOfnestedArrowInStackError < indexOfarrowInChildConstructorInStackError");
+shouldBeTrue("indexOfarrowInChildConstructorInStackError < indexOfChildClassInStackError");
+shouldBeTrue("indexOfChildClassInStackError > 0");
+
+shouldBeTrue("indexOfParentClassInStackError > -1 && errorStack.indexOf('ParentClass', indexOfParentClassInStackError + 1) === -1");
+shouldBeTrue("indexOfnestedArrowInStackError > -1 && errorStack.indexOf('nestedArrow', indexOfnestedArrowInStackError + 1) === -1");
+shouldBeTrue("indexOfarrowInChildConstructorInStackError > -1 && errorStack.indexOf('arrowInChildConstructor', indexOfarrowInChildConstructorInStackError + 1) === -1");
+shouldBeTrue("indexOfChildClassInStackError > -1 && errorStack.indexOf('ChildClass', indexOfChildClassInStackError + 1) === -1");
+
+var successfullyParsed = true;
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsarrowfunctiontdzjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/arrowfunction-tdz.js (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/arrowfunction-tdz.js 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/LayoutTests/js/script-tests/arrowfunction-tdz.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,13 +1,20 @@
</span><span class="cx"> description('Tests for ES6 arrow function test tdz');
</span><span class="cx">
</span><del>-var A = class A { };
</del><ins>+var A = class A {
+ constructor() {
+ this.id = 'a';
+ }
+};
+
</ins><span class="cx"> var B = class B extends A {
</span><span class="cx"> constructor(accessThisBeforeSuper) {
</span><ins>+ var f = () => this;
</ins><span class="cx"> if (accessThisBeforeSuper) {
</span><del>- var f = () => this;
</del><ins>+ f();
</ins><span class="cx"> super();
</span><span class="cx"> } else {
</span><span class="cx"> super();
</span><ins>+ f();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -21,6 +28,65 @@
</span><span class="cx">
</span><span class="cx"> shouldBe('isReferenceError', 'true');
</span><span class="cx">
</span><del>-var e = new B(false);
</del><ins>+var a = new B(false);
</ins><span class="cx">
</span><ins>+var D = class D extends A {
+ constructor(accessThisBeforeSuper, returnThis) {
+ var f = () => returnThis ? this : {};
+ if (accessThisBeforeSuper) {
+ let val = f();
+ super();
+ } else {
+ super();
+ let val = f();
+ }
+ }
+};
+
+isReferenceError = false;
+try {
+ new D(true, true);
+} catch (e) {
+ isReferenceError = e instanceof ReferenceError;
+}
+
+shouldBe('isReferenceError', 'true');
+
+var d = new D(false, true);
+shouldBe('d.id', "'a'");
+var e = new D(false, false);
+shouldBe('e.id', "'a'");
+var f = new D(true, false);
+shouldBe('f.id', "'a'");
+
+var G = class G extends A {
+ constructor(accessThisBeforeSuper, returnThis) {
+ var f = () => returnThis ? (() => this ) : (()=>{});
+ let af = f();
+ if (accessThisBeforeSuper) {
+ let result = af();
+ super();
+ } else {
+ super();
+ let result = af();
+ }
+ }
+};
+
+try {
+ new G(true, true);
+} catch (e) {
+ exception = e;
+ isReferenceError = e instanceof ReferenceError;
+}
+
+shouldBe('isReferenceError', 'true');
+
+var g = new G(false, true);
+shouldBe('g.id', "'a'");
+var h = new G(false, false);
+shouldBe('h.id', "'a'");
+var i = new G(true, false);
+shouldBe('i.id', "'a'");
+
</ins><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,3 +1,145 @@
</span><ins>+2015-12-01 Aleksandr Skachkov <gskachkov@gmail.com>
+
+ [ES6] "super" and "this" should be lexically bound inside an arrow function and should live in a JSLexicalEnvironment
+ https://bugs.webkit.org/show_bug.cgi?id=149338
+
+ Reviewed by Saam Barati.
+
+ Implemented new version of the lexically bound 'this' in arrow function. In current version
+ 'this' is stored inside of the lexical environment of the function. To store and load we use
+ op_get_from_scope and op_put_to_scope operations. Also new implementation prevent raising TDZ
+ error for arrow functions that are declared before super() but invoke after.
+
+ * builtins/BuiltinExecutables.cpp:
+ (JSC::createExecutableInternal):
+ * bytecode/BytecodeList.json:
+ * bytecode/BytecodeUseDef.h:
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::dumpBytecode):
+ * bytecode/EvalCodeCache.h:
+ (JSC::EvalCodeCache::getSlow):
+ * bytecode/ExecutableInfo.h:
+ (JSC::ExecutableInfo::ExecutableInfo):
+ (JSC::ExecutableInfo::isDerivedConstructorContext):
+ (JSC::ExecutableInfo::isArrowFunctionContext):
+ * bytecode/UnlinkedCodeBlock.cpp:
+ (JSC::UnlinkedCodeBlock::UnlinkedCodeBlock):
+ * bytecode/UnlinkedCodeBlock.h:
+ (JSC::UnlinkedCodeBlock::isDerivedConstructorContext):
+ (JSC::UnlinkedCodeBlock::isArrowFunctionContext):
+ * bytecode/UnlinkedFunctionExecutable.cpp:
+ (JSC::generateUnlinkedFunctionCodeBlock):
+ (JSC::UnlinkedFunctionExecutable::UnlinkedFunctionExecutable):
+ * bytecode/UnlinkedFunctionExecutable.h:
+ * bytecompiler/BytecodeGenerator.cpp:
+ (JSC::BytecodeGenerator::BytecodeGenerator):
+ (JSC::BytecodeGenerator::initializeArrowFunctionContextScopeIfNeeded):
+ (JSC::BytecodeGenerator::variable):
+ (JSC::BytecodeGenerator::emitLoadArrowFunctionLexicalEnvironment):
+ (JSC::BytecodeGenerator::emitLoadThisFromArrowFunctionLexicalEnvironment):
+ (JSC::BytecodeGenerator::emitLoadNewTargetFromArrowFunctionLexicalEnvironment):
+ (JSC::BytecodeGenerator::emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment):
+ (JSC::BytecodeGenerator::emitPutNewTargetToArrowFunctionContextScope):
+ (JSC::BytecodeGenerator::emitPutDerivedConstructorToArrowFunctionContextScope):
+ (JSC::BytecodeGenerator::emitPutThisToArrowFunctionContextScope):
+ * bytecompiler/BytecodeGenerator.h:
+ (JSC::BytecodeGenerator::isDerivedConstructorContext):
+ (JSC::BytecodeGenerator::usesArrowFunction):
+ (JSC::BytecodeGenerator::needsToUpdateArrowFunctionContext):
+ (JSC::BytecodeGenerator::usesEval):
+ (JSC::BytecodeGenerator::usesThis):
+ (JSC::BytecodeGenerator::newTarget):
+ (JSC::BytecodeGenerator::makeFunction):
+ * bytecompiler/NodesCodegen.cpp:
+ (JSC::ThisNode::emitBytecode):
+ (JSC::SuperNode::emitBytecode):
+ (JSC::EvalFunctionCallNode::emitBytecode):
+ (JSC::FunctionCallValueNode::emitBytecode):
+ (JSC::FunctionNode::emitBytecode):
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::evaluate):
+ * dfg/DFGAbstractInterpreterInlines.h:
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGCapabilities.cpp:
+ * dfg/DFGClobberize.h:
+ * dfg/DFGDoesGC.cpp:
+ * dfg/DFGFixupPhase.cpp:
+ * dfg/DFGNodeType.h:
+ * dfg/DFGObjectAllocationSinkingPhase.cpp:
+ * dfg/DFGPredictionPropagationPhase.cpp:
+ * dfg/DFGPromotedHeapLocation.cpp:
+ * dfg/DFGPromotedHeapLocation.h:
+ * dfg/DFGSafeToExecute.h:
+ * dfg/DFGSpeculativeJIT.cpp:
+ * dfg/DFGSpeculativeJIT.h:
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ * dfg/DFGSpeculativeJIT64.cpp:
+ * ftl/FTLCapabilities.cpp:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ * ftl/FTLOperations.cpp:
+ (JSC::FTL::operationMaterializeObjectInOSR):
+ * interpreter/Interpreter.cpp:
+ (JSC::eval):
+ * jit/JIT.cpp:
+ * jit/JIT.h:
+ * jit/JITOpcodes.cpp:
+ (JSC::JIT::emitNewFuncExprCommon):
+ * jit/JITOpcodes32_64.cpp:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * parser/ASTBuilder.h:
+ (JSC::ASTBuilder::createArrowFunctionExpr):
+ (JSC::ASTBuilder::usesArrowFunction):
+ * parser/Nodes.h:
+ (JSC::ScopeNode::usesArrowFunction):
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::parseFunctionInfo):
+ * parser/ParserModes.h:
+ * runtime/CodeCache.cpp:
+ (JSC::CodeCache::getGlobalCodeBlock):
+ (JSC::CodeCache::getProgramCodeBlock):
+ (JSC::CodeCache::getEvalCodeBlock):
+ (JSC::CodeCache::getModuleProgramCodeBlock):
+ (JSC::CodeCache::getFunctionExecutableFromGlobalCode):
+ * runtime/CodeCache.h:
+ * runtime/CommonIdentifiers.h:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/Executable.cpp:
+ (JSC::ScriptExecutable::ScriptExecutable):
+ (JSC::EvalExecutable::create):
+ (JSC::EvalExecutable::EvalExecutable):
+ (JSC::ProgramExecutable::ProgramExecutable):
+ (JSC::ModuleProgramExecutable::ModuleProgramExecutable):
+ (JSC::FunctionExecutable::FunctionExecutable):
+ * runtime/Executable.h:
+ (JSC::ScriptExecutable::isArrowFunctionContext):
+ (JSC::ScriptExecutable::isDerivedConstructorContext):
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::createEvalCodeBlock):
+ * runtime/JSGlobalObject.h:
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::globalFuncEval):
+ * tests/es6.yaml:
+ * tests/stress/arrowfunction-activation-sink-osrexit.js:
+ * tests/stress/arrowfunction-activation-sink.js:
+ * tests/stress/arrowfunction-lexical-bind-newtarget.js: Added.
+ * tests/stress/arrowfunction-lexical-bind-supercall-1.js: Added.
+ * tests/stress/arrowfunction-lexical-bind-supercall-2.js: Added.
+ * tests/stress/arrowfunction-lexical-bind-supercall-3.js: Added.
+ * tests/stress/arrowfunction-lexical-bind-supercall-4.js: Added.
+ * tests/stress/arrowfunction-lexical-bind-this-1.js:
+ * tests/stress/arrowfunction-lexical-bind-this-7.js: Added.
+ * tests/stress/arrowfunction-tdz-1.js: Added.
+ * tests/stress/arrowfunction-tdz-2.js: Added.
+ * tests/stress/arrowfunction-tdz-3.js: Added.
+ * tests/stress/arrowfunction-tdz-4.js: Added.
+ * tests/stress/arrowfunction-tdz.js: Removed.
+
</ins><span class="cx"> 2015-12-01 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] streams should not directly use Number and related methods
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsBuiltinExecutablescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/builtins/BuiltinExecutables.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx"> metadata->overrideName(name);
</span><span class="cx"> VariableEnvironment dummyTDZVariables;
</span><del>- UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, kind, constructAbility, dummyTDZVariables, WTF::move(sourceOverride));
</del><ins>+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, kind, constructAbility, dummyTDZVariables, false, WTF::move(sourceOverride));
</ins><span class="cx"> functionExecutable->setNameValue(vm, jsString(&vm, name.string()));
</span><span class="cx"> return functionExecutable;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> { "name" : "op_switch_string", "length" : 4 },
</span><span class="cx"> { "name" : "op_new_func", "length" : 4 },
</span><span class="cx"> { "name" : "op_new_func_exp", "length" : 4 },
</span><del>- { "name" : "op_new_arrow_func_exp", "length" : 5 },
</del><ins>+ { "name" : "op_new_arrow_func_exp", "length" : 4 },
</ins><span class="cx"> { "name" : "op_call", "length" : 9 },
</span><span class="cx"> { "name" : "op_tail_call", "length" : 9 },
</span><span class="cx"> { "name" : "op_call_eval", "length" : 9 },
</span><span class="lines">@@ -127,7 +127,6 @@
</span><span class="cx"> { "name" : "op_enumerator_structure_pname", "length" : 4 },
</span><span class="cx"> { "name" : "op_enumerator_generic_pname", "length" : 4 },
</span><span class="cx"> { "name" : "op_to_index_string", "length" : 3 },
</span><del>- { "name" : "op_load_arrowfunction_this", "length" : 2 },
</del><span class="cx"> { "name" : "op_assert", "length" : 3 },
</span><span class="cx"> { "name" : "op_copy_rest", "length": 4 },
</span><span class="cx"> { "name" : "op_get_rest_length", "length": 3 }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> return;
</span><span class="cx"> case op_assert:
</span><span class="cx"> case op_get_scope:
</span><del>- case op_load_arrowfunction_this:
</del><span class="cx"> case op_to_this:
</span><span class="cx"> case op_check_tdz:
</span><span class="cx"> case op_profile_will_call:
</span><span class="lines">@@ -371,7 +370,6 @@
</span><span class="cx"> case op_to_this:
</span><span class="cx"> case op_check_tdz:
</span><span class="cx"> case op_get_scope:
</span><del>- case op_load_arrowfunction_this:
</del><span class="cx"> case op_create_direct_arguments:
</span><span class="cx"> case op_create_scoped_arguments:
</span><span class="cx"> case op_create_out_of_band_arguments:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -757,11 +757,6 @@
</span><span class="cx"> printLocationOpAndRegisterOperand(out, exec, location, it, "get_scope", r0);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case op_load_arrowfunction_this: {
- int r0 = (++it)->u.operand;
- printLocationOpAndRegisterOperand(out, exec, location, it, "load_arrowfunction_this", r0);
- break;
- }
</del><span class="cx"> case op_create_direct_arguments: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> printLocationAndOp(out, exec, location, it, "create_direct_arguments");
</span><span class="lines">@@ -1307,9 +1302,8 @@
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int r1 = (++it)->u.operand;
</span><span class="cx"> int f0 = (++it)->u.operand;
</span><del>- int r2 = (++it)->u.operand;
</del><span class="cx"> printLocationAndOp(out, exec, location, it, "op_new_arrow_func_exp");
</span><del>- out.printf("%s, %s, f%d, %s", registerName(r0).data(), registerName(r1).data(), f0, registerName(r2).data());
</del><ins>+ out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_new_func_exp: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeEvalCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/EvalCodeCache.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/EvalCodeCache.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/EvalCodeCache.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> return m_cacheMap.get(evalSource.impl()).get();
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-
- EvalExecutable* getSlow(ExecState* exec, JSCell* owner, bool inStrictContext, ThisTDZMode thisTDZMode, const String& evalSource, JSScope* scope)
</del><ins>+
+ EvalExecutable* getSlow(ExecState* exec, JSCell* owner, bool inStrictContext, ThisTDZMode thisTDZMode, bool isDerivedConstructorContext, bool isArrowFunctionContext, const String& evalSource, JSScope* scope)
</ins><span class="cx"> {
</span><span class="cx"> VariableEnvironment variablesUnderTDZ;
</span><span class="cx"> JSScope::collectVariablesUnderTDZ(scope, variablesUnderTDZ);
</span><del>- EvalExecutable* evalExecutable = EvalExecutable::create(exec, makeSource(evalSource), inStrictContext, thisTDZMode, &variablesUnderTDZ);
</del><ins>+ EvalExecutable* evalExecutable = EvalExecutable::create(exec, makeSource(evalSource), inStrictContext, thisTDZMode, isDerivedConstructorContext, isArrowFunctionContext, &variablesUnderTDZ);
</ins><span class="cx"> if (!evalExecutable)
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeExecutableInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/ExecutableInfo.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> struct ExecutableInfo {
</span><del>- ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor, bool isBuiltinFunction, ConstructorKind constructorKind, bool isArrowFunction)
</del><ins>+ ExecutableInfo(bool needsActivation, bool usesEval, bool isStrictMode, bool isConstructor, bool isBuiltinFunction, ConstructorKind constructorKind, bool isArrowFunction, bool isDerivedConstructorContext, bool isArrowFunctionContext)
</ins><span class="cx"> : m_needsActivation(needsActivation)
</span><span class="cx"> , m_usesEval(usesEval)
</span><span class="cx"> , m_isStrictMode(isStrictMode)
</span><span class="lines">@@ -39,6 +39,8 @@
</span><span class="cx"> , m_isBuiltinFunction(isBuiltinFunction)
</span><span class="cx"> , m_constructorKind(static_cast<unsigned>(constructorKind))
</span><span class="cx"> , m_isArrowFunction(isArrowFunction)
</span><ins>+ , m_isDerivedConstructorContext(isDerivedConstructorContext)
+ , m_isArrowFunctionContext(isArrowFunctionContext)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_constructorKind == static_cast<unsigned>(constructorKind));
</span><span class="cx"> }
</span><span class="lines">@@ -50,6 +52,8 @@
</span><span class="cx"> bool isBuiltinFunction() const { return m_isBuiltinFunction; }
</span><span class="cx"> ConstructorKind constructorKind() const { return static_cast<ConstructorKind>(m_constructorKind); }
</span><span class="cx"> bool isArrowFunction() const { return m_isArrowFunction; }
</span><ins>+ bool isDerivedConstructorContext() const { return m_isDerivedConstructorContext; }
+ bool isArrowFunctionContext() const { return m_isArrowFunctionContext; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> unsigned m_needsActivation : 1;
</span><span class="lines">@@ -59,6 +63,8 @@
</span><span class="cx"> unsigned m_isBuiltinFunction : 1;
</span><span class="cx"> unsigned m_constructorKind : 2;
</span><span class="cx"> unsigned m_isArrowFunction : 1;
</span><ins>+ unsigned m_isDerivedConstructorContext : 1;
+ unsigned m_isArrowFunctionContext : 1;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -66,6 +66,8 @@
</span><span class="cx"> , m_isBuiltinFunction(info.isBuiltinFunction())
</span><span class="cx"> , m_constructorKind(static_cast<unsigned>(info.constructorKind()))
</span><span class="cx"> , m_isArrowFunction(info.isArrowFunction())
</span><ins>+ , m_isDerivedConstructorContext(info.isDerivedConstructorContext())
+ , m_isArrowFunctionContext(info.isArrowFunctionContext())
</ins><span class="cx"> , m_firstLine(0)
</span><span class="cx"> , m_lineCount(0)
</span><span class="cx"> , m_endColumn(UINT_MAX)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -117,6 +117,8 @@
</span><span class="cx"> bool isStrictMode() const { return m_isStrictMode; }
</span><span class="cx"> bool usesEval() const { return m_usesEval; }
</span><span class="cx"> bool isArrowFunction() const { return m_isArrowFunction; }
</span><ins>+ bool isDerivedConstructorContext() const { return m_isDerivedConstructorContext; }
+ bool isArrowFunctionContext() const { return m_isArrowFunctionContext; }
</ins><span class="cx">
</span><span class="cx"> bool needsFullScopeChain() const { return m_needsFullScopeChain; }
</span><span class="cx">
</span><span class="lines">@@ -388,6 +390,8 @@
</span><span class="cx"> unsigned m_isBuiltinFunction : 1;
</span><span class="cx"> unsigned m_constructorKind : 2;
</span><span class="cx"> unsigned m_isArrowFunction : 1;
</span><ins>+ unsigned m_isDerivedConstructorContext : 1;
+ unsigned m_isArrowFunctionContext : 1;
</ins><span class="cx">
</span><span class="cx"> unsigned m_firstLine;
</span><span class="cx"> unsigned m_lineCount;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> executable->recordParse(function->features(), function->hasCapturedVariables());
</span><span class="cx">
</span><span class="cx"> UnlinkedFunctionCodeBlock* result = UnlinkedFunctionCodeBlock::create(&vm, FunctionCode,
</span><del>- ExecutableInfo(function->needsActivation(), function->usesEval(), function->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction, executable->constructorKind(), isArrowFunction));
</del><ins>+ ExecutableInfo(function->needsActivation(), function->usesEval(), function->isStrictMode(), kind == CodeForConstruct, functionKind == UnlinkedBuiltinFunction, executable->constructorKind(), isArrowFunction, executable->isDerivedConstructorContext(), false));
</ins><span class="cx"> auto generator(std::make_unique<BytecodeGenerator>(vm, function.get(), result, debuggerMode, profilerMode, executable->parentScopeTDZVariables()));
</span><span class="cx"> error = generator->generate();
</span><span class="cx"> if (error.isValid())
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& source, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode* node, UnlinkedFunctionKind kind, ConstructAbility constructAbility, VariableEnvironment& parentScopeTDZVariables)
</del><ins>+UnlinkedFunctionExecutable::UnlinkedFunctionExecutable(VM* vm, Structure* structure, const SourceCode& source, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode* node, UnlinkedFunctionKind kind, ConstructAbility constructAbility, VariableEnvironment& parentScopeTDZVariables, bool isDerivedConstructorContext)
</ins><span class="cx"> : Base(*vm, structure)
</span><span class="cx"> , m_name(node->ident())
</span><span class="cx"> , m_inferredName(node->inferredName())
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> , m_constructorKind(static_cast<unsigned>(node->constructorKind()))
</span><span class="cx"> , m_functionMode(node->functionMode())
</span><span class="cx"> , m_isArrowFunction(node->isArrowFunction())
</span><ins>+ , m_isDerivedConstructorContext(isDerivedConstructorContext)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_constructorKind == static_cast<unsigned>(node->constructorKind()));
</span><span class="cx"> m_parentScopeTDZVariables.swap(parentScopeTDZVariables);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -65,10 +65,10 @@
</span><span class="cx"> typedef JSCell Base;
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
</span><span class="cx">
</span><del>- static UnlinkedFunctionExecutable* create(VM* vm, const SourceCode& source, FunctionMetadataNode* node, UnlinkedFunctionKind unlinkedFunctionKind, ConstructAbility constructAbility, VariableEnvironment& parentScopeTDZVariables, RefPtr<SourceProvider>&& sourceOverride = nullptr)
</del><ins>+ static UnlinkedFunctionExecutable* create(VM* vm, const SourceCode& source, FunctionMetadataNode* node, UnlinkedFunctionKind unlinkedFunctionKind, ConstructAbility constructAbility, VariableEnvironment& parentScopeTDZVariables, bool isDerivedConstructorContext, RefPtr<SourceProvider>&& sourceOverride = nullptr)
</ins><span class="cx"> {
</span><span class="cx"> UnlinkedFunctionExecutable* instance = new (NotNull, allocateCell<UnlinkedFunctionExecutable>(vm->heap))
</span><del>- UnlinkedFunctionExecutable(vm, vm->unlinkedFunctionExecutableStructure.get(), source, WTF::move(sourceOverride), node, unlinkedFunctionKind, constructAbility, parentScopeTDZVariables);
</del><ins>+ UnlinkedFunctionExecutable(vm, vm->unlinkedFunctionExecutableStructure.get(), source, WTF::move(sourceOverride), node, unlinkedFunctionKind, constructAbility, parentScopeTDZVariables, isDerivedConstructorContext);
</ins><span class="cx"> instance->finishCreation(*vm);
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="lines">@@ -126,9 +126,10 @@
</span><span class="cx"> bool isClassConstructorFunction() const { return constructorKind() != ConstructorKind::None; }
</span><span class="cx"> const VariableEnvironment* parentScopeTDZVariables() const { return &m_parentScopeTDZVariables; }
</span><span class="cx"> bool isArrowFunction() const { return m_isArrowFunction; }
</span><ins>+ bool isDerivedConstructorContext() const {return m_isDerivedConstructorContext; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, VariableEnvironment&);
</del><ins>+ UnlinkedFunctionExecutable(VM*, Structure*, const SourceCode&, RefPtr<SourceProvider>&& sourceOverride, FunctionMetadataNode*, UnlinkedFunctionKind, ConstructAbility, VariableEnvironment&, bool isDerivedConstructorContext);
</ins><span class="cx"> WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForCall;
</span><span class="cx"> WriteBarrier<UnlinkedFunctionCodeBlock> m_unlinkedCodeBlockForConstruct;
</span><span class="cx">
</span><span class="lines">@@ -159,6 +160,7 @@
</span><span class="cx"> unsigned m_constructorKind : 2;
</span><span class="cx"> unsigned m_functionMode : 1; // FunctionMode
</span><span class="cx"> unsigned m_isArrowFunction : 1;
</span><ins>+ unsigned m_isDerivedConstructorContext : 1;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void finishCreation(VM& vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -155,6 +155,8 @@
</span><span class="cx"> , m_thisRegister(CallFrame::thisArgumentOffset())
</span><span class="cx"> , m_codeType(GlobalCode)
</span><span class="cx"> , m_vm(&vm)
</span><ins>+ , m_isDerivedConstructorContext(false)
+ , m_needsToUpdateArrowFunctionContext(programNode->usesArrowFunction() || programNode->usesEval())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(parentScopeTDZVariables, !parentScopeTDZVariables->size());
</span><span class="cx">
</span><span class="lines">@@ -185,6 +187,11 @@
</span><span class="cx"> // operations we emit we will have ResolveTypes that implictly do TDZ checks. Therefore, we don't need
</span><span class="cx"> // additional TDZ checks on top of those. This is why we can omit pushing programNode->lexicalVariables()
</span><span class="cx"> // to the TDZ stack.
</span><ins>+
+ if (needsToUpdateArrowFunctionContext()) {
+ initializeArrowFunctionContextScopeIfNeeded();
+ emitPutThisToArrowFunctionContextScope();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BytecodeGenerator::BytecodeGenerator(VM& vm, FunctionNode* functionNode, UnlinkedFunctionCodeBlock* codeBlock, DebuggerMode debuggerMode, ProfilerMode profilerMode, const VariableEnvironment* parentScopeTDZVariables)
</span><span class="lines">@@ -202,6 +209,8 @@
</span><span class="cx"> // compatible with tail calls (we have no way of emitting op_did_call).
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=148819
</span><span class="cx"> , m_inTailPosition(Options::useTailCalls() && !isConstructor() && constructorKind() == ConstructorKind::None && isStrictMode() && !m_shouldEmitProfileHooks)
</span><ins>+ , m_isDerivedConstructorContext(codeBlock->isDerivedConstructorContext())
+ , m_needsToUpdateArrowFunctionContext(functionNode->usesArrowFunction() || functionNode->usesEval())
</ins><span class="cx"> {
</span><span class="cx"> for (auto& constantRegister : m_linkTimeConstantRegisters)
</span><span class="cx"> constantRegister = nullptr;
</span><span class="lines">@@ -226,8 +235,9 @@
</span><span class="cx"> pattern->collectBoundIdentifiers(boundParameterProperties);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- bool shouldCaptureSomeOfTheThings = m_shouldEmitDebugHooks || m_codeBlock->needsFullScopeChain();
</del><ins>+
+ bool containsArrowOrEvalButNotInArrowBlock = needsToUpdateArrowFunctionContext() && !m_codeBlock->isArrowFunction();
+ bool shouldCaptureSomeOfTheThings = m_shouldEmitDebugHooks || m_codeBlock->needsFullScopeChain() || containsArrowOrEvalButNotInArrowBlock;
</ins><span class="cx"> bool shouldCaptureAllOfTheThings = m_shouldEmitDebugHooks || codeBlock->usesEval();
</span><span class="cx"> bool needsArguments = functionNode->usesArguments() || codeBlock->usesEval();
</span><span class="cx"> if (shouldCaptureAllOfTheThings)
</span><span class="lines">@@ -492,16 +502,21 @@
</span><span class="cx"> instructions().append(0);
</span><span class="cx"> instructions().append(0);
</span><span class="cx"> }
</span><del>- } else {
- if (functionNode->usesThis() || codeBlock->usesEval())
- emitLoadArrowFunctionThis(&m_thisRegister);
- }
</del><ins>+ } else if (functionNode->usesThis())
+ emitLoadThisFromArrowFunctionLexicalEnvironment();
</ins><span class="cx">
</span><span class="cx"> // All "addVar()"s needs to happen before "initializeDefaultParameterValuesAndSetupFunctionScopeStack()" is called
</span><span class="cx"> // because a function's default parameter ExpressionNodes will use temporary registers.
</span><span class="cx"> m_TDZStack.append(std::make_pair(*parentScopeTDZVariables, false));
</span><span class="cx"> initializeDefaultParameterValuesAndSetupFunctionScopeStack(parameters, functionNode, functionSymbolTable, symbolTableConstantIndex, captures);
</span><span class="cx">
</span><ins>+ if (needsToUpdateArrowFunctionContext() && !codeBlock->isArrowFunction()) {
+ initializeArrowFunctionContextScopeIfNeeded(functionSymbolTable);
+ emitPutThisToArrowFunctionContextScope();
+ emitPutNewTargetToArrowFunctionContextScope();
+ emitPutDerivedConstructorToArrowFunctionContextScope();
+ }
+
</ins><span class="cx"> pushLexicalScope(m_scopeNode, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -514,6 +529,8 @@
</span><span class="cx"> , m_codeType(EvalCode)
</span><span class="cx"> , m_vm(&vm)
</span><span class="cx"> , m_usesNonStrictEval(codeBlock->usesEval() && !codeBlock->isStrictMode())
</span><ins>+ , m_isDerivedConstructorContext(codeBlock->isDerivedConstructorContext())
+ , m_needsToUpdateArrowFunctionContext(evalNode->usesArrowFunction() || evalNode->usesEval())
</ins><span class="cx"> {
</span><span class="cx"> for (auto& constantRegister : m_linkTimeConstantRegisters)
</span><span class="cx"> constantRegister = nullptr;
</span><span class="lines">@@ -543,6 +560,14 @@
</span><span class="cx">
</span><span class="cx"> m_TDZStack.append(std::make_pair(*parentScopeTDZVariables, false));
</span><span class="cx">
</span><ins>+ if (codeBlock->isArrowFunctionContext() && evalNode->usesThis())
+ emitLoadThisFromArrowFunctionLexicalEnvironment();
+
+ if (needsToUpdateArrowFunctionContext() && !codeBlock->isArrowFunctionContext()) {
+ initializeArrowFunctionContextScopeIfNeeded();
+ emitPutThisToArrowFunctionContextScope();
+ }
+
</ins><span class="cx"> pushLexicalScope(m_scopeNode, true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -555,6 +580,8 @@
</span><span class="cx"> , m_codeType(ModuleCode)
</span><span class="cx"> , m_vm(&vm)
</span><span class="cx"> , m_usesNonStrictEval(false)
</span><ins>+ , m_isDerivedConstructorContext(false)
+ , m_needsToUpdateArrowFunctionContext(moduleProgramNode->usesArrowFunction() || moduleProgramNode->usesEval())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_UNUSED(parentScopeTDZVariables, !parentScopeTDZVariables->size());
</span><span class="cx">
</span><span class="lines">@@ -790,6 +817,59 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void BytecodeGenerator::initializeArrowFunctionContextScopeIfNeeded(SymbolTable* symbolTable)
+{
+ if (m_arrowFunctionContextLexicalEnvironmentRegister != nullptr)
+ return;
+
+ if (m_lexicalEnvironmentRegister != nullptr) {
+ m_arrowFunctionContextLexicalEnvironmentRegister = m_lexicalEnvironmentRegister;
+
+ if (!m_codeBlock->isArrowFunction()) {
+ ScopeOffset offset;
+
+ offset = symbolTable->takeNextScopeOffset();
+ symbolTable->set(propertyNames().thisIdentifier.impl(), SymbolTableEntry(VarOffset(offset)));
+
+ if (m_codeType == FunctionCode) {
+ offset = symbolTable->takeNextScopeOffset();
+ symbolTable->set(propertyNames().newTargetLocalPrivateName.impl(), SymbolTableEntry(VarOffset(offset)));
+ }
+
+ if (isConstructor() && constructorKind() == ConstructorKind::Derived) {
+ offset = symbolTable->takeNextScopeOffset();
+ symbolTable->set(propertyNames().derivedConstructorPrivateName.impl(), SymbolTableEntry(VarOffset(offset)));
+ }
+ }
+
+ return;
+ }
+
+ VariableEnvironment environment;
+ auto addResult = environment.add(propertyNames().thisIdentifier);
+ addResult.iterator->value.setIsCaptured();
+ addResult.iterator->value.setIsConst();
+
+ if (m_codeType == FunctionCode) {
+ auto addTarget = environment.add(propertyNames().newTargetLocalPrivateName);
+ addTarget.iterator->value.setIsCaptured();
+ addTarget.iterator->value.setIsLet();
+ }
+
+ if (isConstructor() && constructorKind() == ConstructorKind::Derived) {
+ auto derivedConstructor = environment.add(propertyNames().derivedConstructorPrivateName);
+ derivedConstructor.iterator->value.setIsCaptured();
+ derivedConstructor.iterator->value.setIsLet();
+ }
+
+ size_t size = m_symbolTableStack.size();
+ pushLexicalScopeInternal(environment, true, nullptr, TDZRequirement::UnderTDZ, ScopeType::LetConstScope, ScopeRegisterType::Block);
+
+ ASSERT_UNUSED(size, m_symbolTableStack.size() == size + 1);
+
+ m_arrowFunctionContextLexicalEnvironmentRegister = m_symbolTableStack.last().m_scope;
+}
+
</ins><span class="cx"> RegisterID* BytecodeGenerator::initializeNextParameter()
</span><span class="cx"> {
</span><span class="cx"> VirtualRegister reg = virtualRegisterForArgument(m_codeBlock->numParameters());
</span><span class="lines">@@ -1816,9 +1896,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Variable BytecodeGenerator::variable(const Identifier& property)
</del><ins>+Variable BytecodeGenerator::variable(const Identifier& property, ThisResolutionType thisResolutionType)
</ins><span class="cx"> {
</span><del>- if (property == propertyNames().thisIdentifier) {
</del><ins>+ if (property == propertyNames().thisIdentifier && thisResolutionType == ThisResolutionType::Local) {
</ins><span class="cx"> return Variable(property, VarOffset(thisRegister()->virtualRegister()), thisRegister(),
</span><span class="cx"> ReadOnly, Variable::SpecialVariable, 0, false);
</span><span class="cx"> }
</span><span class="lines">@@ -2515,9 +2595,6 @@
</span><span class="cx"> instructions().append(dst->index());
</span><span class="cx"> instructions().append(scopeRegister()->index());
</span><span class="cx"> instructions().append(index);
</span><del>-
- if (opcodeID == op_new_arrow_func_exp)
- instructions().append(thisRegister()->index());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RegisterID* BytecodeGenerator::emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func)
</span><span class="lines">@@ -2528,10 +2605,6 @@
</span><span class="cx">
</span><span class="cx"> RegisterID* BytecodeGenerator::emitNewArrowFunctionExpression(RegisterID* dst, ArrowFuncExprNode* func)
</span><span class="cx"> {
</span><del>- bool isClassConstructor = m_codeBlock->isConstructor() && constructorKind() != ConstructorKind::None;
- if (isClassConstructor)
- emitTDZCheck(thisRegister());
-
</del><span class="cx"> emitNewFunctionCommon(dst, func, op_new_arrow_func_exp);
</span><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="lines">@@ -3127,13 +3200,6 @@
</span><span class="cx"> m_topMostScope = addVar();
</span><span class="cx"> emitMove(m_topMostScope, scopeRegister());
</span><span class="cx"> }
</span><del>-
-RegisterID* BytecodeGenerator::emitLoadArrowFunctionThis(RegisterID* arrowFunctionThis)
-{
- emitOpcode(op_load_arrowfunction_this);
- instructions().append(arrowFunctionThis->index());
- return arrowFunctionThis;
-}
</del><span class="cx">
</span><span class="cx"> void BytecodeGenerator::emitComplexPopScopes(RegisterID* scope, ControlFlowContext* topScope, ControlFlowContext* bottomScope)
</span><span class="cx"> {
</span><span class="lines">@@ -3802,6 +3868,64 @@
</span><span class="cx"> m_forInContextStack.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RegisterID* BytecodeGenerator::emitLoadArrowFunctionLexicalEnvironment()
+{
+ ASSERT(m_codeBlock->isArrowFunction() || m_codeBlock->isArrowFunctionContext() || constructorKind() == ConstructorKind::Derived);
+
+ m_resolvedArrowFunctionScopeContextRegister = emitResolveScope(nullptr, variable(propertyNames().thisIdentifier, ThisResolutionType::Scoped));
+ return m_resolvedArrowFunctionScopeContextRegister.get();
+}
+
+void BytecodeGenerator::emitLoadThisFromArrowFunctionLexicalEnvironment()
+{
+ emitGetFromScope(thisRegister(), emitLoadArrowFunctionLexicalEnvironment(), variable(propertyNames().thisIdentifier, ThisResolutionType::Scoped), DoNotThrowIfNotFound);
+}
+
+RegisterID* BytecodeGenerator::emitLoadNewTargetFromArrowFunctionLexicalEnvironment()
+{
+ m_isNewTargetLoadedInArrowFunction = true;
+
+ Variable newTargetVar = variable(propertyNames().newTargetLocalPrivateName);
+ emitMove(m_newTargetRegister, emitGetFromScope(newTemporary(), emitLoadArrowFunctionLexicalEnvironment(), newTargetVar, ThrowIfNotFound));
+
+ return m_newTargetRegister;
+}
+
+RegisterID* BytecodeGenerator::emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment()
+{
+ Variable protoScopeVar = variable(propertyNames().derivedConstructorPrivateName);
+ return emitGetFromScope(newTemporary(), emitLoadArrowFunctionLexicalEnvironment(), protoScopeVar, ThrowIfNotFound);
+}
+
+void BytecodeGenerator::emitPutNewTargetToArrowFunctionContextScope()
+{
+ ASSERT(m_arrowFunctionContextLexicalEnvironmentRegister != nullptr);
+
+ Variable newTargetVar = variable(propertyNames().newTargetLocalPrivateName);
+ emitPutToScope(m_arrowFunctionContextLexicalEnvironmentRegister, newTargetVar, newTarget(), DoNotThrowIfNotFound, Initialization);
+}
+
+void BytecodeGenerator::emitPutDerivedConstructorToArrowFunctionContextScope()
+{
+ if (isConstructor() && constructorKind() == ConstructorKind::Derived) {
+ ASSERT(m_arrowFunctionContextLexicalEnvironmentRegister != nullptr);
+
+ Variable protoScope = variable(propertyNames().derivedConstructorPrivateName);
+ emitPutToScope(m_arrowFunctionContextLexicalEnvironmentRegister, protoScope, &m_calleeRegister, DoNotThrowIfNotFound, Initialization);
+ }
+}
+
+void BytecodeGenerator::emitPutThisToArrowFunctionContextScope()
+{
+ ASSERT(isDerivedConstructorContext() || m_arrowFunctionContextLexicalEnvironmentRegister != nullptr);
+
+ if (isDerivedConstructorContext())
+ emitLoadArrowFunctionLexicalEnvironment();
+
+ Variable thisVar = variable(propertyNames().thisIdentifier, ThisResolutionType::Scoped);
+ emitPutToScope(isDerivedConstructorContext() ? m_resolvedArrowFunctionScopeContextRegister.get() : m_arrowFunctionContextLexicalEnvironmentRegister, thisVar, thisRegister(), DoNotThrowIfNotFound, NotInitialization);
+}
+
</ins><span class="cx"> void BytecodeGenerator::pushStructureForInScope(RegisterID* localRegister, RegisterID* indexRegister, RegisterID* propertyRegister, RegisterID* enumeratorRegister)
</span><span class="cx"> {
</span><span class="cx"> if (!localRegister)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -65,6 +65,8 @@
</span><span class="cx"> ExpectArrayConstructor
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ enum class ThisResolutionType { Local, Scoped };
+
</ins><span class="cx"> class CallArguments {
</span><span class="cx"> public:
</span><span class="cx"> CallArguments(BytecodeGenerator&, ArgumentsNode*, unsigned additionalArguments = 0);
</span><span class="lines">@@ -279,13 +281,18 @@
</span><span class="cx"> const CommonIdentifiers& propertyNames() const { return *m_vm->propertyNames; }
</span><span class="cx">
</span><span class="cx"> bool isConstructor() const { return m_codeBlock->isConstructor(); }
</span><ins>+ bool isDerivedConstructorContext() const { return m_codeBlock->isDerivedConstructorContext(); }
+ bool usesArrowFunction() const { return m_scopeNode->usesArrowFunction(); }
+ bool needsToUpdateArrowFunctionContext() const { return m_needsToUpdateArrowFunctionContext; }
+ bool usesEval() const { return m_scopeNode->usesEval(); }
+ bool usesThis() const { return m_scopeNode->usesThis(); }
</ins><span class="cx"> ConstructorKind constructorKind() const { return m_codeBlock->constructorKind(); }
</span><span class="cx">
</span><span class="cx"> ParserError generate();
</span><span class="cx">
</span><span class="cx"> bool isArgumentNumber(const Identifier&, int);
</span><span class="cx">
</span><del>- Variable variable(const Identifier&);
</del><ins>+ Variable variable(const Identifier&, ThisResolutionType = ThisResolutionType::Local);
</ins><span class="cx">
</span><span class="cx"> enum ExistingVariableMode { VerifyExisting, IgnoreExisting };
</span><span class="cx"> void createVariable(const Identifier&, VarKind, SymbolTable*, ExistingVariableMode = VerifyExisting); // Creates the variable, or asserts that the already-created variable is sufficiently compatible.
</span><span class="lines">@@ -293,7 +300,11 @@
</span><span class="cx"> // Returns the register storing "this"
</span><span class="cx"> RegisterID* thisRegister() { return &m_thisRegister; }
</span><span class="cx"> RegisterID* argumentsRegister() { return m_argumentsRegister; }
</span><del>- RegisterID* newTarget() { return m_newTargetRegister; }
</del><ins>+ RegisterID* newTarget()
+ {
+ return !m_codeBlock->isArrowFunction() || m_isNewTargetLoadedInArrowFunction
+ ? m_newTargetRegister : emitLoadNewTargetFromArrowFunctionLexicalEnvironment();
+ }
</ins><span class="cx">
</span><span class="cx"> RegisterID* scopeRegister() { return m_scopeRegister; }
</span><span class="cx">
</span><span class="lines">@@ -479,6 +490,10 @@
</span><span class="cx"> void emitProfileType(RegisterID* registerToProfile, const JSTextPosition& startDivot, const JSTextPosition& endDivot);
</span><span class="cx">
</span><span class="cx"> void emitProfileControlFlow(int);
</span><ins>+
+ RegisterID* emitLoadArrowFunctionLexicalEnvironment();
+ void emitLoadThisFromArrowFunctionLexicalEnvironment();
+ RegisterID* emitLoadNewTargetFromArrowFunctionLexicalEnvironment();
</ins><span class="cx">
</span><span class="cx"> RegisterID* emitLoad(RegisterID* dst, bool);
</span><span class="cx"> RegisterID* emitLoad(RegisterID* dst, const Identifier&);
</span><span class="lines">@@ -623,6 +638,10 @@
</span><span class="cx"> void emitGetScope();
</span><span class="cx"> RegisterID* emitPushWithScope(RegisterID* objectScope);
</span><span class="cx"> void emitPopWithScope();
</span><ins>+ void emitPutThisToArrowFunctionContextScope();
+ void emitPutNewTargetToArrowFunctionContextScope();
+ void emitPutDerivedConstructorToArrowFunctionContextScope();
+ RegisterID* emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment();
</ins><span class="cx">
</span><span class="cx"> void emitDebugHook(DebugHookID, unsigned line, unsigned charOffset, unsigned lineStart);
</span><span class="cx">
</span><span class="lines">@@ -698,7 +717,6 @@
</span><span class="cx">
</span><span class="cx"> void allocateCalleeSaveSpace();
</span><span class="cx"> void allocateAndEmitScope();
</span><del>- RegisterID* emitLoadArrowFunctionThis(RegisterID*);
</del><span class="cx"> void emitComplexPopScopes(RegisterID*, ControlFlowContext* topScope, ControlFlowContext* bottomScope);
</span><span class="cx">
</span><span class="cx"> typedef HashMap<double, JSValue> NumberMap;
</span><span class="lines">@@ -750,6 +768,8 @@
</span><span class="cx">
</span><span class="cx"> UnlinkedFunctionExecutable* makeFunction(FunctionMetadataNode* metadata)
</span><span class="cx"> {
</span><ins>+ bool newisDerivedConstructorContext = constructorKind() == ConstructorKind::Derived || (m_isDerivedConstructorContext && metadata->isArrowFunction());
+
</ins><span class="cx"> VariableEnvironment variablesUnderTDZ;
</span><span class="cx"> getVariablesUnderTDZ(variablesUnderTDZ);
</span><span class="cx">
</span><span class="lines">@@ -758,7 +778,7 @@
</span><span class="cx"> if (parseMode == SourceParseMode::GetterMode || parseMode == SourceParseMode::SetterMode || parseMode == SourceParseMode::ArrowFunctionMode || (parseMode == SourceParseMode::MethodMode && metadata->constructorKind() == ConstructorKind::None))
</span><span class="cx"> constructAbility = ConstructAbility::CannotConstruct;
</span><span class="cx">
</span><del>- return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), metadata, isBuiltinFunction() ? UnlinkedBuiltinFunction : UnlinkedNormalFunction, constructAbility, variablesUnderTDZ);
</del><ins>+ return UnlinkedFunctionExecutable::create(m_vm, m_scopeNode->source(), metadata, isBuiltinFunction() ? UnlinkedBuiltinFunction : UnlinkedNormalFunction, constructAbility, variablesUnderTDZ, newisDerivedConstructorContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void getVariablesUnderTDZ(VariableEnvironment&);
</span><span class="lines">@@ -768,6 +788,7 @@
</span><span class="cx">
</span><span class="cx"> void initializeVarLexicalEnvironment(int symbolTableConstantIndex);
</span><span class="cx"> void initializeDefaultParameterValuesAndSetupFunctionScopeStack(FunctionParameters&, FunctionNode*, SymbolTable*, int symbolTableConstantIndex, const std::function<bool (UniquedStringImpl*)>& captures);
</span><ins>+ void initializeArrowFunctionContextScopeIfNeeded(SymbolTable* = nullptr);
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> JSString* addStringConstant(const Identifier&);
</span><span class="lines">@@ -809,6 +830,8 @@
</span><span class="cx"> RegisterID* m_globalObjectRegister { nullptr };
</span><span class="cx"> RegisterID* m_newTargetRegister { nullptr };
</span><span class="cx"> RegisterID* m_linkTimeConstantRegisters[LinkTimeConstantCount];
</span><ins>+ RegisterID* m_arrowFunctionContextLexicalEnvironmentRegister { nullptr };
+ RefPtr<RegisterID> m_resolvedArrowFunctionScopeContextRegister;
</ins><span class="cx">
</span><span class="cx"> SegmentedVector<RegisterID*, 16> m_localRegistersForCalleeSaveRegisters;
</span><span class="cx"> SegmentedVector<RegisterID, 32> m_constantPoolRegisters;
</span><span class="lines">@@ -863,6 +886,9 @@
</span><span class="cx"> bool m_isBuiltinFunction { false };
</span><span class="cx"> bool m_usesNonStrictEval { false };
</span><span class="cx"> bool m_inTailPosition { false };
</span><ins>+ bool m_isDerivedConstructorContext { false };
+ bool m_needsToUpdateArrowFunctionContext;
+ bool m_isNewTargetLoadedInArrowFunction { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -145,7 +145,10 @@
</span><span class="cx">
</span><span class="cx"> RegisterID* ThisNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><del>- if (m_shouldAlwaysEmitTDZCheck || generator.constructorKind() == ConstructorKind::Derived)
</del><ins>+ if (generator.constructorKind() == ConstructorKind::Derived && generator.needsToUpdateArrowFunctionContext())
+ generator.emitLoadThisFromArrowFunctionLexicalEnvironment();
+
+ if (m_shouldAlwaysEmitTDZCheck || generator.constructorKind() == ConstructorKind::Derived || generator.isDerivedConstructorContext())
</ins><span class="cx"> generator.emitTDZCheck(generator.thisRegister());
</span><span class="cx">
</span><span class="cx"> if (dst == generator.ignoredResult())
</span><span class="lines">@@ -164,10 +167,17 @@
</span><span class="cx"> if (dst == generator.ignoredResult())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RegisterID callee;
- callee.setIndex(JSStack::Callee);
</del><ins>+ RegisterID* scopeId;
+ if (generator.isDerivedConstructorContext())
+ scopeId = generator.emitLoadDerivedConstructorFromArrowFunctionLexicalEnvironment();
+ else {
+ RegisterID callee;
+ callee.setIndex(JSStack::Callee);
</ins><span class="cx">
</span><del>- return generator.emitGetById(generator.finalDestination(dst), &callee, generator.propertyNames().underscoreProto);
</del><ins>+ scopeId = &callee;
+ }
+
+ return generator.emitGetById(generator.finalDestination(dst), scopeId, generator.propertyNames().underscoreProto);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RegisterID* emitSuperBaseForCallee(BytecodeGenerator& generator)
</span><span class="lines">@@ -691,6 +701,21 @@
</span><span class="cx">
</span><span class="cx"> RegisterID* EvalFunctionCallNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
</span><span class="cx"> {
</span><ins>+ // We need try to load 'this' before call eval in constructor, because 'this' can created by 'super' in some of the arrow function
+ // var A = class A {
+ // constructor () { this.id = 'A'; }
+ // }
+ //
+ // var B = class B extend A {
+ // constructor () {
+ // var arrow = () => super();
+ // arrow();
+ // eval("this.id = 'B'");
+ // }
+ // }
+ if (generator.constructorKind() == ConstructorKind::Derived && generator.needsToUpdateArrowFunctionContext())
+ generator.emitLoadThisFromArrowFunctionLexicalEnvironment();
+
</ins><span class="cx"> Variable var = generator.variable(generator.propertyNames().eval);
</span><span class="cx"> if (RegisterID* local = var.local()) {
</span><span class="cx"> RefPtr<RegisterID> func = generator.emitMove(generator.tempDestination(dst), local);
</span><span class="lines">@@ -718,11 +743,16 @@
</span><span class="cx"> RefPtr<RegisterID> returnValue = generator.finalDestination(dst, func.get());
</span><span class="cx"> CallArguments callArguments(generator, m_args);
</span><span class="cx"> if (m_expr->isSuperNode()) {
</span><del>- ASSERT(generator.isConstructor());
- ASSERT(generator.constructorKind() == ConstructorKind::Derived);
</del><ins>+ ASSERT(generator.isConstructor() || generator.isDerivedConstructorContext());
+ ASSERT(generator.constructorKind() == ConstructorKind::Derived || generator.isDerivedConstructorContext());
</ins><span class="cx"> generator.emitMove(callArguments.thisRegister(), generator.newTarget());
</span><span class="cx"> RegisterID* ret = generator.emitConstruct(returnValue.get(), func.get(), NoExpectedFunction, callArguments, divot(), divotStart(), divotEnd());
</span><span class="cx"> generator.emitMove(generator.thisRegister(), ret);
</span><ins>+
+ bool isConstructorKindDerived = generator.constructorKind() == ConstructorKind::Derived;
+ if (generator.isDerivedConstructorContext() || (isConstructorKindDerived && generator.needsToUpdateArrowFunctionContext()))
+ generator.emitPutThisToArrowFunctionContextScope();
+
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx"> generator.emitLoad(callArguments.thisRegister(), jsUndefined());
</span><span class="lines">@@ -2980,6 +3010,9 @@
</span><span class="cx">
</span><span class="cx"> // If there is no return we must automatically insert one.
</span><span class="cx"> if (!returnNode) {
</span><ins>+ if (generator.constructorKind() == ConstructorKind::Derived && generator.needsToUpdateArrowFunctionContext())
+ generator.emitLoadThisFromArrowFunctionLexicalEnvironment(); // Arrow function can invoke 'super' in constructor and before leave constructor we need load 'this' from lexical arrow function environment
+
</ins><span class="cx"> RegisterID* r0 = generator.isConstructor() ? generator.thisRegister() : generator.emitLoad(0, jsUndefined());
</span><span class="cx"> generator.emitProfileType(r0, ProfileTypeBytecodeFunctionReturnStatement); // Do not emit expression info for this profile because it's not in the user's source code.
</span><span class="cx"> ASSERT(startOffset() >= lineStartOffset());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> VariableEnvironment variablesUnderTDZ;
</span><span class="cx"> JSScope::collectVariablesUnderTDZ(scope()->jsScope(), variablesUnderTDZ);
</span><span class="cx">
</span><del>- EvalExecutable* eval = EvalExecutable::create(callFrame, makeSource(script), codeBlock.isStrictMode(), thisTDZMode, &variablesUnderTDZ);
</del><ins>+ EvalExecutable* eval = EvalExecutable::create(callFrame, makeSource(script), codeBlock.isStrictMode(), thisTDZMode, codeBlock.unlinkedCodeBlock()->isDerivedConstructorContext(), codeBlock.unlinkedCodeBlock()->isArrowFunction(), &variablesUnderTDZ);
</ins><span class="cx"> if (vm.exception()) {
</span><span class="cx"> exception = vm.exception();
</span><span class="cx"> vm.clearException();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1805,15 +1805,6 @@
</span><span class="cx"> forNode(node).setType(m_graph, SpecObjectOther);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case LoadArrowFunctionThis:
- if (JSValue base = forNode(node->child1()).m_value) {
- JSArrowFunction* function = jsDynamicCast<JSArrowFunction*>(base);
- setConstant(node, *m_graph.freeze(function->boundThis()));
- break;
- }
- forNode(node).setType(m_graph, SpecFinalObject);
- break;
-
</del><span class="cx"> case SkipScope: {
</span><span class="cx"> JSValue child = forNode(node->child1()).value();
</span><span class="cx"> if (child) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -4514,17 +4514,6 @@
</span><span class="cx"> set(VirtualRegister(currentInstruction[1].u.operand), result);
</span><span class="cx"> NEXT_OPCODE(op_get_scope);
</span><span class="cx"> }
</span><del>-
- case op_load_arrowfunction_this: {
- Node* callee = get(VirtualRegister(JSStack::Callee));
- Node* result;
- if (JSArrowFunction* function = callee->dynamicCastConstant<JSArrowFunction*>())
- result = jsConstant(function->boundThis());
- else
- result = addToGraph(LoadArrowFunctionThis, callee);
- set(VirtualRegister(currentInstruction[1].u.operand), result);
- NEXT_OPCODE(op_load_arrowfunction_this);
- }
</del><span class="cx">
</span><span class="cx"> case op_create_direct_arguments: {
</span><span class="cx"> noticeArgumentsUse();
</span><span class="lines">@@ -4574,24 +4563,20 @@
</span><span class="cx"> NEXT_OPCODE(op_new_func);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case op_new_func_exp: {
- FunctionExecutable* expr = m_inlineStackTop->m_profiledBlock->functionExpr(currentInstruction[3].u.operand);
- FrozenValue* frozen = m_graph.freezeStrong(expr);
- set(VirtualRegister(currentInstruction[1].u.operand),
- addToGraph(NewFunction, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
- NEXT_OPCODE(op_new_func_exp);
- }
-
</del><ins>+ case op_new_func_exp:
</ins><span class="cx"> case op_new_arrow_func_exp: {
</span><span class="cx"> FunctionExecutable* expr = m_inlineStackTop->m_profiledBlock->functionExpr(currentInstruction[3].u.operand);
</span><span class="cx"> FrozenValue* frozen = m_graph.freezeStrong(expr);
</span><del>-
</del><span class="cx"> set(VirtualRegister(currentInstruction[1].u.operand),
</span><del>- addToGraph(NewArrowFunction, OpInfo(frozen),
- get(VirtualRegister(currentInstruction[2].u.operand)),
- get(VirtualRegister(currentInstruction[4].u.operand))));
</del><ins>+ addToGraph(NewFunction, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
</ins><span class="cx">
</span><del>- NEXT_OPCODE(op_new_arrow_func_exp);
</del><ins>+ if (opcodeID == op_new_func_exp) {
+ // Curly braces are necessary
+ NEXT_OPCODE(op_new_func_exp);
+ } else {
+ // Curly braces are necessary
+ NEXT_OPCODE(op_new_arrow_func_exp);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case op_typeof: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -202,7 +202,6 @@
</span><span class="cx"> case op_switch_char:
</span><span class="cx"> case op_in:
</span><span class="cx"> case op_get_scope:
</span><del>- case op_load_arrowfunction_this:
</del><span class="cx"> case op_get_from_scope:
</span><span class="cx"> case op_get_enumerable_length:
</span><span class="cx"> case op_has_generic_property:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> case ArithCos:
</span><span class="cx"> case ArithLog:
</span><span class="cx"> case GetScope:
</span><del>- case LoadArrowFunctionThis:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case StringCharCodeAt:
</span><span class="cx"> case StringFromCharCode:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDoesGCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> case GetButterflyReadOnly:
</span><span class="cx"> case CheckArray:
</span><span class="cx"> case GetScope:
</span><del>- case LoadArrowFunctionThis:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetClosureVar:
</span><span class="cx"> case PutClosureVar:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1012,11 +1012,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case LoadArrowFunctionThis: {
- fixEdge<KnownCellUse>(node->child1());
- break;
- }
-
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetScope:
</span><span class="cx"> case GetGetter:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -207,7 +207,6 @@
</span><span class="cx"> macro(MultiPutByOffset, NodeMustGenerate) \
</span><span class="cx"> macro(GetArrayLength, NodeResultInt32) \
</span><span class="cx"> macro(GetTypedArrayByteOffset, NodeResultInt32) \
</span><del>- macro(LoadArrowFunctionThis, NodeResultJS) \
</del><span class="cx"> macro(GetScope, NodeResultJS) \
</span><span class="cx"> macro(SkipScope, NodeResultJS) \
</span><span class="cx"> macro(GetClosureVar, NodeResultJS) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -838,17 +838,14 @@
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction: {
</span><del>- bool isArrowFunction = node->op() == NewArrowFunction;
</del><span class="cx"> if (node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid()) {
</span><span class="cx"> m_heap.escape(node->child1().node());
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- target = &m_heap.newAllocation(node, isArrowFunction ? Allocation::Kind::NewArrowFunction : Allocation::Kind::Function);
</del><ins>+ target = &m_heap.newAllocation(node, Allocation::Kind::Function);
</ins><span class="cx"> writes.add(FunctionExecutablePLoc, LazyNode(node->cellOperand()));
</span><span class="cx"> writes.add(FunctionActivationPLoc, LazyNode(node->child1().node()));
</span><del>- if (isArrowFunction)
- writes.add(ArrowFunctionBoundThisPLoc, LazyNode(node->child2().node()));
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1018,14 +1015,6 @@
</span><span class="cx"> m_heap.escape(node->child1().node());
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case LoadArrowFunctionThis:
- target = m_heap.onlyLocalAllocation(node->child1().node());
- if (target && target->isArrowFunctionAllocation())
- exactRead = ArrowFunctionBoundThisPLoc;
- else
- m_heap.escape(node->child1().node());
- break;
-
</del><span class="cx"> case GetScope:
</span><span class="cx"> target = m_heap.onlyLocalAllocation(node->child1().node());
</span><span class="cx"> if (target && target->isFunctionAllocation())
</span><span class="lines">@@ -2045,9 +2034,8 @@
</span><span class="cx">
</span><span class="cx"> case NewFunction:
</span><span class="cx"> case NewArrowFunction: {
</span><del>- bool isArrowFunction = node->op() == NewArrowFunction;
</del><span class="cx"> Vector<PromotedHeapLocation> locations = m_locationsForAllocation.get(escapee);
</span><del>- ASSERT(locations.size() == (isArrowFunction ? 3 : 2));
</del><ins>+ ASSERT(locations.size() == 2);
</ins><span class="cx">
</span><span class="cx"> PromotedHeapLocation executable(FunctionExecutablePLoc, allocation.identifier());
</span><span class="cx"> ASSERT_UNUSED(executable, locations.contains(executable));
</span><span class="lines">@@ -2056,13 +2044,6 @@
</span><span class="cx"> ASSERT(locations.contains(activation));
</span><span class="cx">
</span><span class="cx"> node->child1() = Edge(resolve(block, activation), KnownCellUse);
</span><del>-
- if (isArrowFunction) {
- PromotedHeapLocation boundThis(ArrowFunctionBoundThisPLoc, allocation.identifier());
- ASSERT(locations.contains(boundThis));
- node->child2() = Edge(resolve(block, boundThis), CellUse);
- }
-
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -594,10 +594,6 @@
</span><span class="cx"> changed |= setPrediction(SpecObjectOther);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case LoadArrowFunctionThis:
- changed |= setPrediction(SpecFinalObject);
- break;
-
</del><span class="cx"> case In:
</span><span class="cx"> changed |= setPrediction(SpecBoolean);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPromotedHeapLocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -102,10 +102,6 @@
</span><span class="cx"> case ClosureVarPLoc:
</span><span class="cx"> out.print("ClosureVarPLoc");
</span><span class="cx"> return;
</span><del>-
- case ArrowFunctionBoundThisPLoc:
- out.print("ArrowFunctionBoundThisPLoc");
- return;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPromotedHeapLocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGPromotedHeapLocation.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -46,8 +46,7 @@
</span><span class="cx"> FunctionExecutablePLoc,
</span><span class="cx"> FunctionActivationPLoc,
</span><span class="cx"> ActivationScopePLoc,
</span><del>- ClosureVarPLoc,
- ArrowFunctionBoundThisPLoc
</del><ins>+ ClosureVarPLoc
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class PromotedLocationDescriptor {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -202,7 +202,6 @@
</span><span class="cx"> case Arrayify:
</span><span class="cx"> case ArrayifyToStructure:
</span><span class="cx"> case GetScope:
</span><del>- case LoadArrowFunctionThis:
</del><span class="cx"> case SkipScope:
</span><span class="cx"> case GetClosureVar:
</span><span class="cx"> case PutClosureVar:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -4739,16 +4739,7 @@
</span><span class="cx"> m_jit.loadPtr(JITCompiler::Address(function.gpr(), JSFunction::offsetOfScopeChain()), result.gpr());
</span><span class="cx"> cellResult(result.gpr(), node);
</span><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><del>-void SpeculativeJIT::compileLoadArrowFunctionThis(Node* node)
-{
- SpeculateCellOperand function(this, node->child1());
- GPRTemporary result(this, Reuse, function);
- m_jit.loadPtr(JITCompiler::Address(function.gpr(), JSArrowFunction::offsetOfThisValue()), result.gpr());
- cellResult(result.gpr(), node);
-}
-
</del><span class="cx"> void SpeculativeJIT::compileSkipScope(Node* node)
</span><span class="cx"> {
</span><span class="cx"> SpeculateCellOperand scope(this, node->child1());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -2200,7 +2200,6 @@
</span><span class="cx"> void compileGetByValOnScopedArguments(Node*);
</span><span class="cx">
</span><span class="cx"> void compileGetScope(Node*);
</span><del>- void compileLoadArrowFunctionThis(Node*);
</del><span class="cx"> void compileSkipScope(Node*);
</span><span class="cx">
</span><span class="cx"> void compileGetArrayLength(Node*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -3799,10 +3799,6 @@
</span><span class="cx"> case GetScope:
</span><span class="cx"> compileGetScope(node);
</span><span class="cx"> break;
</span><del>-
- case LoadArrowFunctionThis:
- compileLoadArrowFunctionThis(node);
- break;
</del><span class="cx">
</span><span class="cx"> case SkipScope:
</span><span class="cx"> compileSkipScope(node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -3837,10 +3837,6 @@
</span><span class="cx"> compileGetScope(node);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case LoadArrowFunctionThis:
- compileLoadArrowFunctionThis(node);
- break;
-
</del><span class="cx"> case SkipScope:
</span><span class="cx"> compileSkipScope(node);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> case CountExecution:
</span><span class="cx"> case GetExecutable:
</span><span class="cx"> case GetScope:
</span><del>- case LoadArrowFunctionThis:
</del><span class="cx"> case GetCallee:
</span><span class="cx"> case GetArgumentCount:
</span><span class="cx"> case ToString:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -810,9 +810,6 @@
</span><span class="cx"> case GetScope:
</span><span class="cx"> compileGetScope();
</span><span class="cx"> break;
</span><del>- case LoadArrowFunctionThis:
- compileLoadArrowFunctionThis();
- break;
</del><span class="cx"> case SkipScope:
</span><span class="cx"> compileSkipScope();
</span><span class="cx"> break;
</span><span class="lines">@@ -4507,11 +4504,6 @@
</span><span class="cx"> setJSValue(m_out.loadPtr(lowCell(m_node->child1()), m_heaps.JSFunction_scope));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void compileLoadArrowFunctionThis()
- {
- setJSValue(m_out.loadPtr(lowCell(m_node->child1()), m_heaps.JSArrowFunction_this));
- }
-
</del><span class="cx"> void compileSkipScope()
</span><span class="cx"> {
</span><span class="cx"> setJSValue(m_out.loadPtr(lowCell(m_node->child1()), m_heaps.JSScope_next));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOperations.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOperations.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/ftl/FTLOperations.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -164,25 +164,17 @@
</span><span class="cx"> // Figure out what the executable and activation are
</span><span class="cx"> FunctionExecutable* executable = nullptr;
</span><span class="cx"> JSScope* activation = nullptr;
</span><del>- JSValue boundThis;
- bool isArrowFunction = false;
</del><span class="cx"> for (unsigned i = materialization->properties().size(); i--;) {
</span><span class="cx"> const ExitPropertyValue& property = materialization->properties()[i];
</span><span class="cx"> if (property.location() == PromotedLocationDescriptor(FunctionExecutablePLoc))
</span><span class="cx"> executable = jsCast<FunctionExecutable*>(JSValue::decode(values[i]));
</span><span class="cx"> if (property.location() == PromotedLocationDescriptor(FunctionActivationPLoc))
</span><span class="cx"> activation = jsCast<JSScope*>(JSValue::decode(values[i]));
</span><del>- if (property.location() == PromotedLocationDescriptor(ArrowFunctionBoundThisPLoc)) {
- isArrowFunction = true;
- boundThis = JSValue::decode(values[i]);
- }
</del><span class="cx"> }
</span><span class="cx"> RELEASE_ASSERT(executable && activation);
</span><span class="cx">
</span><span class="cx">
</span><del>- JSFunction* result = isArrowFunction
- ? JSArrowFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation, boundThis)
- : JSFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation);
</del><ins>+ JSFunction* result = JSFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, activation);
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> ASSERT(!callFrame->vm().exception());
</span><span class="cx">
</span><span class="cx"> ThisTDZMode thisTDZMode = callerCodeBlock->unlinkedCodeBlock()->constructorKind() == ConstructorKind::Derived ? ThisTDZMode::AlwaysCheck : ThisTDZMode::CheckIfNeeded;
</span><del>- eval = callerCodeBlock->evalCodeCache().getSlow(callFrame, callerCodeBlock, callerCodeBlock->isStrictMode(), thisTDZMode, programSource, callerScopeChain);
</del><ins>+ eval = callerCodeBlock->evalCodeCache().getSlow(callFrame, callerCodeBlock, callerCodeBlock->isStrictMode(), thisTDZMode, callerCodeBlock->unlinkedCodeBlock()->isDerivedConstructorContext(), callerCodeBlock->unlinkedCodeBlock()->isArrowFunction(), programSource, callerScopeChain);
</ins><span class="cx"> if (!eval)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> DEFINE_OP(op_end)
</span><span class="cx"> DEFINE_OP(op_enter)
</span><span class="cx"> DEFINE_OP(op_get_scope)
</span><del>- DEFINE_OP(op_load_arrowfunction_this)
</del><span class="cx"> DEFINE_OP(op_eq)
</span><span class="cx"> DEFINE_OP(op_eq_null)
</span><span class="cx"> case op_get_array_length:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -500,7 +500,6 @@
</span><span class="cx"> void emit_op_end(Instruction*);
</span><span class="cx"> void emit_op_enter(Instruction*);
</span><span class="cx"> void emit_op_get_scope(Instruction*);
</span><del>- void emit_op_load_arrowfunction_this(Instruction*);
</del><span class="cx"> void emit_op_eq(Instruction*);
</span><span class="cx"> void emit_op_eq_null(Instruction*);
</span><span class="cx"> void emit_op_get_by_id(Instruction*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -684,14 +684,6 @@
</span><span class="cx"> loadPtr(Address(regT0, JSFunction::offsetOfScopeChain()), regT0);
</span><span class="cx"> emitStoreCell(dst, regT0);
</span><span class="cx"> }
</span><del>-
-void JIT::emit_op_load_arrowfunction_this(Instruction* currentInstruction)
-{
- int dst = currentInstruction[1].u.operand;
- emitGetFromCallFrameHeaderPtr(JSStack::Callee, regT0);
- loadPtr(Address(regT0, JSArrowFunction::offsetOfThisValue()), regT0);
- emitStoreCell(dst, regT0);
-}
</del><span class="cx">
</span><span class="cx"> void JIT::emit_op_to_this(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="lines">@@ -988,23 +980,14 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emitNewFuncExprCommon(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- OpcodeID opcodeID = m_vm->interpreter->getOpcodeID(currentInstruction->u.opcode);
- bool isArrowFunction = opcodeID == op_new_arrow_func_exp;
-
</del><span class="cx"> Jump notUndefinedScope;
</span><span class="cx"> int dst = currentInstruction[1].u.operand;
</span><span class="cx"> #if USE(JSVALUE64)
</span><span class="cx"> emitGetVirtualRegister(currentInstruction[2].u.operand, regT0);
</span><del>- if (isArrowFunction)
- emitGetVirtualRegister(currentInstruction[4].u.operand, regT1);
</del><span class="cx"> notUndefinedScope = branch64(NotEqual, regT0, TrustedImm64(JSValue::encode(jsUndefined())));
</span><span class="cx"> store64(TrustedImm64(JSValue::encode(jsUndefined())), Address(callFrameRegister, sizeof(Register) * dst));
</span><span class="cx"> #else
</span><span class="cx"> emitLoadPayload(currentInstruction[2].u.operand, regT0);
</span><del>- if (isArrowFunction) {
- int value = currentInstruction[4].u.operand;
- emitLoad(value, regT3, regT2);
- }
</del><span class="cx"> notUndefinedScope = branch32(NotEqual, tagFor(currentInstruction[2].u.operand), TrustedImm32(JSValue::UndefinedTag));
</span><span class="cx"> emitStore(dst, jsUndefined());
</span><span class="cx"> #endif
</span><span class="lines">@@ -1012,14 +995,7 @@
</span><span class="cx"> notUndefinedScope.link(this);
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* function = m_codeBlock->functionExpr(currentInstruction[3].u.operand);
</span><del>- if (isArrowFunction)
-#if USE(JSVALUE64)
- callOperation(operationNewArrowFunction, dst, regT0, function, regT1);
-#else
- callOperation(operationNewArrowFunction, dst, regT0, function, regT3, regT2);
-#endif
- else
- callOperation(operationNewFunction, dst, regT0, function);
</del><ins>+ callOperation(operationNewFunction, dst, regT0, function);
</ins><span class="cx"> done.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -938,14 +938,6 @@
</span><span class="cx"> emitStoreCell(dst, regT0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JIT::emit_op_load_arrowfunction_this(Instruction* currentInstruction)
-{
- int dst = currentInstruction[1].u.operand;
- emitGetFromCallFrameHeaderPtr(JSStack::Callee, regT0);
- loadPtr(Address(regT0, JSArrowFunction::offsetOfThisValue()), regT0);
- emitStoreCell(dst, regT0);
-}
-
</del><span class="cx"> void JIT::emit_op_create_this(Instruction* currentInstruction)
</span><span class="cx"> {
</span><span class="cx"> int callee = currentInstruction[2].u.operand;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1055,13 +1055,12 @@
</span><span class="cx"> LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp)
</span><span class="cx"> {
</span><span class="cx"> LLINT_BEGIN();
</span><del>-
- JSValue thisValue = LLINT_OP_C(4).jsValue();
</del><ins>+
</ins><span class="cx"> CodeBlock* codeBlock = exec->codeBlock();
</span><span class="cx"> JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
</span><span class="cx"> FunctionExecutable* executable = codeBlock->functionExpr(pc[3].u.operand);
</span><span class="cx">
</span><del>- LLINT_RETURN(JSArrowFunction::create(vm, executable, scope, thisValue));
</del><ins>+ LLINT_RETURN(JSFunction::create(vm, executable, scope));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static SlowPathReturnType handleHostCall(ExecState* execCallee, Instruction* pc, JSValue callee, CodeSpecializationKind kind)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1461,7 +1461,7 @@
</span><span class="cx"> _llint_op_new_arrow_func_exp:
</span><span class="cx"> traceExecution()
</span><span class="cx"> callSlowPath(_llint_slow_path_new_arrow_func_exp)
</span><del>- dispatch(5)
</del><ins>+ dispatch(4)
</ins><span class="cx">
</span><span class="cx"> _llint_op_call:
</span><span class="cx"> traceExecution()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -2422,16 +2422,6 @@
</span><span class="cx"> dispatch(2)
</span><span class="cx">
</span><span class="cx">
</span><del>-_llint_op_load_arrowfunction_this:
- traceExecution()
- loadi Callee + PayloadOffset[cfr], t0
- loadi JSArrowFunction::m_boundThis[t0], t0
- loadisFromInstruction(1, t1)
- storei CellTag, TagOffset[cfr, t1, 8]
- storei t0, PayloadOffset[cfr, t1, 8]
- dispatch(2)
-
-
</del><span class="cx"> _llint_op_get_rest_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi PayloadOffset + ArgumentCount[cfr], t0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -2284,22 +2284,14 @@
</span><span class="cx"> .opProfileTypeDone:
</span><span class="cx"> dispatch(6)
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> _llint_op_profile_control_flow:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadpFromInstruction(1, t0)
</span><span class="cx"> addq 1, BasicBlockLocation::m_executionCount[t0]
</span><span class="cx"> dispatch(2)
</span><span class="cx">
</span><del>-
-_llint_op_load_arrowfunction_this:
- traceExecution()
- loadp Callee[cfr], t0
- loadp JSArrowFunction::m_boundThis[t0], t0
- loadisFromInstruction(1, t1)
- storeq t0, [cfr, t1, 8]
- dispatch(2)
-
-
</del><span class="cx"> _llint_op_get_rest_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi PayloadOffset + ArgumentCount[cfr], t0
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserASTBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ASTBuilder.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/parser/ASTBuilder.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& functionInfo)
</span><span class="cx"> {
</span><del>- usesThis();
</del><ins>+ usesArrowFunction();
</ins><span class="cx"> SourceCode source = m_sourceCode->subExpression(functionInfo.startOffset, functionInfo.body->isArrowFunctionBodyExpression() ? functionInfo.endOffset - 1 : functionInfo.endOffset, functionInfo.startLine, functionInfo.bodyStartColumn);
</span><span class="cx"> ArrowFuncExprNode* result = new (m_parserArena) ArrowFuncExprNode(location, *functionInfo.name, functionInfo.body, source);
</span><span class="cx"> functionInfo.body->setLoc(functionInfo.startLine, functionInfo.endLine, location.startOffset, location.lineStartOffset);
</span><span class="lines">@@ -912,6 +912,7 @@
</span><span class="cx">
</span><span class="cx"> void incConstants() { m_scope.m_numConstants++; }
</span><span class="cx"> void usesThis() { m_scope.m_features |= ThisFeature; }
</span><ins>+ void usesArrowFunction() { m_scope.m_features |= ArrowFunctionFeature; }
</ins><span class="cx"> void usesArguments() { m_scope.m_features |= ArgumentsFeature; }
</span><span class="cx"> void usesWith() { m_scope.m_features |= WithFeature; }
</span><span class="cx"> void usesEval()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1559,6 +1559,7 @@
</span><span class="cx">
</span><span class="cx"> bool usesEval() const { return m_features & EvalFeature; }
</span><span class="cx"> bool usesArguments() const { return (m_features & ArgumentsFeature) && !(m_features & ShadowsArgumentsFeature); }
</span><ins>+ bool usesArrowFunction() const { return m_features & ArrowFunctionFeature; }
</ins><span class="cx"> bool modifiesParameter() const { return m_features & ModifiedParameterFeature; }
</span><span class="cx"> bool modifiesArguments() const { return m_features & (EvalFeature | ModifiedArgumentsFeature); }
</span><span class="cx"> bool isStrictMode() const { return m_features & StrictModeFeature; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1876,11 +1876,11 @@
</span><span class="cx"> semanticFailIfTrue(m_vm->propertyNames->arguments == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
</span><span class="cx"> semanticFailIfTrue(m_vm->propertyNames->eval == *functionInfo.name, "'", functionInfo.name->impl(), "' is not a valid function name in strict mode");
</span><span class="cx"> }
</span><del>- if (functionScope->hasDirectSuper()) {
</del><ins>+ if (functionScope->hasDirectSuper() && functionBodyType == StandardFunctionBodyBlock) {
</ins><span class="cx"> semanticFailIfTrue(!isClassConstructor, "Cannot call super() outside of a class constructor");
</span><span class="cx"> semanticFailIfTrue(constructorKind != ConstructorKind::Derived, "Cannot call super() in a base class constructor");
</span><span class="cx"> }
</span><del>- if (functionScope->needsSuperBinding())
</del><ins>+ if (functionScope->needsSuperBinding() && functionBodyType == StandardFunctionBodyBlock)
</ins><span class="cx"> semanticFailIfTrue(expectedSuperBinding == SuperBinding::NotNeeded, "super can only be used in a method of a derived class");
</span><span class="cx">
</span><span class="cx"> JSTokenLocation location = JSTokenLocation(m_token.m_location);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserModesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/ParserModes.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/ParserModes.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/parser/ParserModes.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -143,17 +143,19 @@
</span><span class="cx">
</span><span class="cx"> typedef unsigned CodeFeatures;
</span><span class="cx">
</span><del>-const CodeFeatures NoFeatures = 0;
-const CodeFeatures EvalFeature = 1 << 0;
-const CodeFeatures ArgumentsFeature = 1 << 1;
-const CodeFeatures WithFeature = 1 << 2;
-const CodeFeatures ThisFeature = 1 << 3;
-const CodeFeatures StrictModeFeature = 1 << 4;
-const CodeFeatures ShadowsArgumentsFeature = 1 << 5;
-const CodeFeatures ModifiedParameterFeature = 1 << 6;
-const CodeFeatures ModifiedArgumentsFeature = 1 << 7;
</del><ins>+const CodeFeatures NoFeatures = 0;
+const CodeFeatures EvalFeature = 1 << 0;
+const CodeFeatures ArgumentsFeature = 1 << 1;
+const CodeFeatures WithFeature = 1 << 2;
+const CodeFeatures ThisFeature = 1 << 3;
+const CodeFeatures StrictModeFeature = 1 << 4;
+const CodeFeatures ShadowsArgumentsFeature = 1 << 5;
+const CodeFeatures ModifiedParameterFeature = 1 << 6;
+const CodeFeatures ModifiedArgumentsFeature = 1 << 7;
+const CodeFeatures ArrowFunctionFeature = 1 << 8;
+const CodeFeatures ArrowFunctionContextFeature = 1 << 9;
</ins><span class="cx">
</span><del>-const CodeFeatures AllFeatures = EvalFeature | ArgumentsFeature | WithFeature | ThisFeature | StrictModeFeature | ShadowsArgumentsFeature | ModifiedParameterFeature;
</del><ins>+const CodeFeatures AllFeatures = EvalFeature | ArgumentsFeature | WithFeature | ThisFeature | StrictModeFeature | ShadowsArgumentsFeature | ModifiedParameterFeature | ArrowFunctionFeature | ArrowFunctionContextFeature;
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -83,8 +83,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <class UnlinkedCodeBlockType, class ExecutableType>
</span><del>-UnlinkedCodeBlockType* CodeCache::getGlobalCodeBlock(VM& vm, ExecutableType* executable, const SourceCode& source, JSParserBuiltinMode builtinMode,
- JSParserStrictMode strictMode, ThisTDZMode thisTDZMode, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error, const VariableEnvironment* variablesUnderTDZ)
</del><ins>+UnlinkedCodeBlockType* CodeCache::getGlobalCodeBlock(VM& vm, ExecutableType* executable, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, ThisTDZMode thisTDZMode, bool, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error, const VariableEnvironment* variablesUnderTDZ)
</ins><span class="cx"> {
</span><span class="cx"> SourceCodeKey key = SourceCodeKey(source, String(), CacheTypes<UnlinkedCodeBlockType>::codeType, builtinMode, strictMode, thisTDZMode);
</span><span class="cx"> SourceCodeValue* cache = m_sourceCode.findCacheAndUpdateAge(key);
</span><span class="lines">@@ -112,7 +111,8 @@
</span><span class="cx"> bool endColumnIsOnStartLine = !lineCount;
</span><span class="cx"> unsigned unlinkedEndColumn = rootNode->endColumn();
</span><span class="cx"> unsigned endColumn = unlinkedEndColumn + (endColumnIsOnStartLine ? startColumn : 1);
</span><del>- executable->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine(), rootNode->lastLine(), startColumn, endColumn);
</del><ins>+ unsigned arrowContextFeature = executable->isArrowFunctionContext() ? ArrowFunctionContextFeature : 0;
+ executable->recordParse(rootNode->features() | arrowContextFeature, rootNode->hasCapturedVariables(), rootNode->firstLine(), rootNode->lastLine(), startColumn, endColumn);
</ins><span class="cx">
</span><span class="cx"> UnlinkedCodeBlockType* unlinkedCodeBlock = UnlinkedCodeBlockType::create(&vm, executable->executableInfo());
</span><span class="cx"> unlinkedCodeBlock->recordParse(rootNode->features(), rootNode->hasCapturedVariables(), rootNode->firstLine() - source.firstLine(), lineCount, unlinkedEndColumn);
</span><span class="lines">@@ -132,18 +132,18 @@
</span><span class="cx"> UnlinkedProgramCodeBlock* CodeCache::getProgramCodeBlock(VM& vm, ProgramExecutable* executable, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error)
</span><span class="cx"> {
</span><span class="cx"> VariableEnvironment emptyParentTDZVariables;
</span><del>- return getGlobalCodeBlock<UnlinkedProgramCodeBlock>(vm, executable, source, builtinMode, strictMode, ThisTDZMode::CheckIfNeeded, debuggerMode, profilerMode, error, &emptyParentTDZVariables);
</del><ins>+ return getGlobalCodeBlock<UnlinkedProgramCodeBlock>(vm, executable, source, builtinMode, strictMode, ThisTDZMode::CheckIfNeeded, false, debuggerMode, profilerMode, error, &emptyParentTDZVariables);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-UnlinkedEvalCodeBlock* CodeCache::getEvalCodeBlock(VM& vm, EvalExecutable* executable, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, ThisTDZMode thisTDZMode, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error, const VariableEnvironment* variablesUnderTDZ)
</del><ins>+UnlinkedEvalCodeBlock* CodeCache::getEvalCodeBlock(VM& vm, EvalExecutable* executable, const SourceCode& source, JSParserBuiltinMode builtinMode, JSParserStrictMode strictMode, ThisTDZMode thisTDZMode, bool isArrowFunctionContext, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error, const VariableEnvironment* variablesUnderTDZ)
</ins><span class="cx"> {
</span><del>- return getGlobalCodeBlock<UnlinkedEvalCodeBlock>(vm, executable, source, builtinMode, strictMode, thisTDZMode, debuggerMode, profilerMode, error, variablesUnderTDZ);
</del><ins>+ return getGlobalCodeBlock<UnlinkedEvalCodeBlock>(vm, executable, source, builtinMode, strictMode, thisTDZMode, isArrowFunctionContext, debuggerMode, profilerMode, error, variablesUnderTDZ);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UnlinkedModuleProgramCodeBlock* CodeCache::getModuleProgramCodeBlock(VM& vm, ModuleProgramExecutable* executable, const SourceCode& source, JSParserBuiltinMode builtinMode, DebuggerMode debuggerMode, ProfilerMode profilerMode, ParserError& error)
</span><span class="cx"> {
</span><span class="cx"> VariableEnvironment emptyParentTDZVariables;
</span><del>- return getGlobalCodeBlock<UnlinkedModuleProgramCodeBlock>(vm, executable, source, builtinMode, JSParserStrictMode::Strict, ThisTDZMode::CheckIfNeeded, debuggerMode, profilerMode, error, &emptyParentTDZVariables);
</del><ins>+ return getGlobalCodeBlock<UnlinkedModuleProgramCodeBlock>(vm, executable, source, builtinMode, JSParserStrictMode::Strict, ThisTDZMode::CheckIfNeeded, false, debuggerMode, profilerMode, error, &emptyParentTDZVariables);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: There's no need to add the function's name to the key here. It's already in the source code.
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> metadata->setEndPosition(positionBeforeLastNewline);
</span><span class="cx"> // The Function constructor only has access to global variables, so no variables will be under TDZ.
</span><span class="cx"> VariableEnvironment emptyTDZVariables;
</span><del>- UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, UnlinkedNormalFunction, ConstructAbility::CanConstruct, emptyTDZVariables);
</del><ins>+ UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, UnlinkedNormalFunction, ConstructAbility::CanConstruct, emptyTDZVariables, false);
</ins><span class="cx"> functionExecutable->m_nameValue.set(vm, functionExecutable, jsString(&vm, name.string()));
</span><span class="cx">
</span><span class="cx"> m_sourceCode.addCache(key, SourceCodeValue(vm, functionExecutable, m_sourceCode.age()));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCodeCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CodeCache.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CodeCache.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/CodeCache.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> ~CodeCache();
</span><span class="cx">
</span><span class="cx"> UnlinkedProgramCodeBlock* getProgramCodeBlock(VM&, ProgramExecutable*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, DebuggerMode, ProfilerMode, ParserError&);
</span><del>- UnlinkedEvalCodeBlock* getEvalCodeBlock(VM&, EvalExecutable*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, ThisTDZMode, DebuggerMode, ProfilerMode, ParserError&, const VariableEnvironment*);
</del><ins>+ UnlinkedEvalCodeBlock* getEvalCodeBlock(VM&, EvalExecutable*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, ThisTDZMode, bool, DebuggerMode, ProfilerMode, ParserError&, const VariableEnvironment*);
</ins><span class="cx"> UnlinkedModuleProgramCodeBlock* getModuleProgramCodeBlock(VM&, ModuleProgramExecutable*, const SourceCode&, JSParserBuiltinMode, DebuggerMode, ProfilerMode, ParserError&);
</span><span class="cx"> UnlinkedFunctionExecutable* getFunctionExecutableFromGlobalCode(VM&, const Identifier&, const SourceCode&, ParserError&);
</span><span class="cx">
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> template <class UnlinkedCodeBlockType, class ExecutableType>
</span><del>- UnlinkedCodeBlockType* getGlobalCodeBlock(VM&, ExecutableType*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, ThisTDZMode, DebuggerMode, ProfilerMode, ParserError&, const VariableEnvironment*);
</del><ins>+ UnlinkedCodeBlockType* getGlobalCodeBlock(VM&, ExecutableType*, const SourceCode&, JSParserBuiltinMode, JSParserStrictMode, ThisTDZMode, bool, DebuggerMode, ProfilerMode, ParserError&, const VariableEnvironment*);
</ins><span class="cx">
</span><span class="cx"> CodeCacheMap m_sourceCode;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -330,8 +330,11 @@
</span><span class="cx"> macro(Uint32Array) \
</span><span class="cx"> macro(Float32Array) \
</span><span class="cx"> macro(Float64Array) \
</span><ins>+ macro(newTargetLocal) \
+ macro(derivedConstructor) \
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class BuiltinNames;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> ConstructData constructData;
</span><del>- ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS);
</del><ins>+ ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS || constructor->jsExecutable()->isArrowFunction());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> auto& cacheWriteBarrier = pc[4].u.jsCell;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -131,13 +131,15 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo ScriptExecutable::s_info = { "ScriptExecutable", &ExecutableBase::s_info, 0, CREATE_METHOD_TABLE(ScriptExecutable) };
</span><span class="cx">
</span><del>-ScriptExecutable::ScriptExecutable(Structure* structure, VM& vm, const SourceCode& source, bool isInStrictContext)
</del><ins>+ScriptExecutable::ScriptExecutable(Structure* structure, VM& vm, const SourceCode& source, bool isInStrictContext, bool isInDerivedConstructorContext, bool isInArrowFunctionContext)
</ins><span class="cx"> : ExecutableBase(vm, structure, NUM_PARAMETERS_NOT_COMPILED)
</span><span class="cx"> , m_source(source)
</span><span class="cx"> , m_features(isInStrictContext ? StrictModeFeature : 0)
</span><span class="cx"> , m_hasCapturedVariables(false)
</span><span class="cx"> , m_neverInline(false)
</span><span class="cx"> , m_didTryToEnterInLoop(false)
</span><ins>+ , m_isDerivedConstructorContext(isInDerivedConstructorContext)
+ , m_isArrowFunctionContext(isInArrowFunctionContext)
</ins><span class="cx"> , m_overrideLineNumber(-1)
</span><span class="cx"> , m_firstLine(-1)
</span><span class="cx"> , m_lastLine(-1)
</span><span class="lines">@@ -412,7 +414,7 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo EvalExecutable::s_info = { "EvalExecutable", &ScriptExecutable::s_info, 0, CREATE_METHOD_TABLE(EvalExecutable) };
</span><span class="cx">
</span><del>-EvalExecutable* EvalExecutable::create(ExecState* exec, const SourceCode& source, bool isInStrictContext, ThisTDZMode thisTDZMode, const VariableEnvironment* variablesUnderTDZ)
</del><ins>+EvalExecutable* EvalExecutable::create(ExecState* exec, const SourceCode& source, bool isInStrictContext, ThisTDZMode thisTDZMode, bool isDerivedConstructorContext, bool isArrowFunctionContext, const VariableEnvironment* variablesUnderTDZ)
</ins><span class="cx"> {
</span><span class="cx"> JSGlobalObject* globalObject = exec->lexicalGlobalObject();
</span><span class="cx"> if (!globalObject->evalEnabled()) {
</span><span class="lines">@@ -420,10 +422,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- EvalExecutable* executable = new (NotNull, allocateCell<EvalExecutable>(*exec->heap())) EvalExecutable(exec, source, isInStrictContext);
</del><ins>+ EvalExecutable* executable = new (NotNull, allocateCell<EvalExecutable>(*exec->heap())) EvalExecutable(exec, source, isInStrictContext, isDerivedConstructorContext, isArrowFunctionContext);
</ins><span class="cx"> executable->finishCreation(exec->vm());
</span><span class="cx">
</span><del>- UnlinkedEvalCodeBlock* unlinkedEvalCode = globalObject->createEvalCodeBlock(exec, executable, thisTDZMode, variablesUnderTDZ);
</del><ins>+ UnlinkedEvalCodeBlock* unlinkedEvalCode = globalObject->createEvalCodeBlock(exec, executable, thisTDZMode, isArrowFunctionContext, variablesUnderTDZ);
</ins><span class="cx"> if (!unlinkedEvalCode)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -432,8 +434,8 @@
</span><span class="cx"> return executable;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EvalExecutable::EvalExecutable(ExecState* exec, const SourceCode& source, bool inStrictContext)
- : ScriptExecutable(exec->vm().evalExecutableStructure.get(), exec->vm(), source, inStrictContext)
</del><ins>+EvalExecutable::EvalExecutable(ExecState* exec, const SourceCode& source, bool inStrictContext, bool isDerivedConstructorContext, bool isArrowFunctionContext)
+ : ScriptExecutable(exec->vm().evalExecutableStructure.get(), exec->vm(), source, inStrictContext, isDerivedConstructorContext, isArrowFunctionContext)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -445,7 +447,7 @@
</span><span class="cx"> const ClassInfo ProgramExecutable::s_info = { "ProgramExecutable", &ScriptExecutable::s_info, 0, CREATE_METHOD_TABLE(ProgramExecutable) };
</span><span class="cx">
</span><span class="cx"> ProgramExecutable::ProgramExecutable(ExecState* exec, const SourceCode& source)
</span><del>- : ScriptExecutable(exec->vm().programExecutableStructure.get(), exec->vm(), source, false)
</del><ins>+ : ScriptExecutable(exec->vm().programExecutableStructure.get(), exec->vm(), source, false, false, false)
</ins><span class="cx"> {
</span><span class="cx"> m_typeProfilingStartOffset = 0;
</span><span class="cx"> m_typeProfilingEndOffset = source.length() - 1;
</span><span class="lines">@@ -461,7 +463,7 @@
</span><span class="cx"> const ClassInfo ModuleProgramExecutable::s_info = { "ModuleProgramExecutable", &ScriptExecutable::s_info, 0, CREATE_METHOD_TABLE(ModuleProgramExecutable) };
</span><span class="cx">
</span><span class="cx"> ModuleProgramExecutable::ModuleProgramExecutable(ExecState* exec, const SourceCode& source)
</span><del>- : ScriptExecutable(exec->vm().moduleProgramExecutableStructure.get(), exec->vm(), source, false)
</del><ins>+ : ScriptExecutable(exec->vm().moduleProgramExecutableStructure.get(), exec->vm(), source, false, false, false)
</ins><span class="cx"> {
</span><span class="cx"> m_typeProfilingStartOffset = 0;
</span><span class="cx"> m_typeProfilingEndOffset = source.length() - 1;
</span><span class="lines">@@ -492,10 +494,8 @@
</span><span class="cx">
</span><span class="cx"> const ClassInfo FunctionExecutable::s_info = { "FunctionExecutable", &ScriptExecutable::s_info, 0, CREATE_METHOD_TABLE(FunctionExecutable) };
</span><span class="cx">
</span><del>-FunctionExecutable::FunctionExecutable(VM& vm, const SourceCode& source,
- UnlinkedFunctionExecutable* unlinkedExecutable, unsigned firstLine,
- unsigned lastLine, unsigned startColumn, unsigned endColumn)
- : ScriptExecutable(vm.functionExecutableStructure.get(), vm, source, unlinkedExecutable->isInStrictContext())
</del><ins>+FunctionExecutable::FunctionExecutable(VM& vm, const SourceCode& source, UnlinkedFunctionExecutable* unlinkedExecutable, unsigned firstLine, unsigned lastLine, unsigned startColumn, unsigned endColumn)
+ : ScriptExecutable(vm.functionExecutableStructure.get(), vm, source, unlinkedExecutable->isInStrictContext(), unlinkedExecutable->isDerivedConstructorContext(), false)
</ins><span class="cx"> , m_unlinkedExecutable(vm, this, unlinkedExecutable)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!source.isNull());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -344,7 +344,9 @@
</span><span class="cx"> bool usesEval() const { return m_features & EvalFeature; }
</span><span class="cx"> bool usesArguments() const { return m_features & ArgumentsFeature; }
</span><span class="cx"> bool needsActivation() const { return m_hasCapturedVariables || m_features & (EvalFeature | WithFeature); }
</span><ins>+ bool isArrowFunctionContext() const { return m_isArrowFunctionContext; }
</ins><span class="cx"> bool isStrictMode() const { return m_features & StrictModeFeature; }
</span><ins>+ bool isDerivedConstructorContext() const { return m_isDerivedConstructorContext; }
</ins><span class="cx"> ECMAMode ecmaMode() const { return isStrictMode() ? StrictMode : NotStrictMode; }
</span><span class="cx">
</span><span class="cx"> void setNeverInline(bool value) { m_neverInline = value; }
</span><span class="lines">@@ -393,7 +395,7 @@
</span><span class="cx"> JSObject* prepareForExecutionImpl(ExecState*, JSFunction*, JSScope*, CodeSpecializationKind);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ScriptExecutable(Structure* structure, VM& vm, const SourceCode& source, bool isInStrictContext);
</del><ins>+ ScriptExecutable(Structure*, VM&, const SourceCode&, bool isInStrictContext, bool isInDerivedConstructorContext, bool isInArrowFunctionContext);
</ins><span class="cx">
</span><span class="cx"> void finishCreation(VM& vm)
</span><span class="cx"> {
</span><span class="lines">@@ -412,6 +414,8 @@
</span><span class="cx"> bool m_neverInline;
</span><span class="cx"> bool m_neverOptimize { false };
</span><span class="cx"> bool m_didTryToEnterInLoop;
</span><ins>+ bool m_isDerivedConstructorContext;
+ bool m_isArrowFunctionContext;
</ins><span class="cx"> int m_overrideLineNumber;
</span><span class="cx"> int m_firstLine;
</span><span class="cx"> int m_lastLine;
</span><span class="lines">@@ -434,7 +438,7 @@
</span><span class="cx"> return m_evalCodeBlock.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static EvalExecutable* create(ExecState*, const SourceCode&, bool isInStrictContext, ThisTDZMode, const VariableEnvironment*);
</del><ins>+ static EvalExecutable* create(ExecState*, const SourceCode&, bool isInStrictContext, ThisTDZMode, bool isDerivedConstructorContext, bool isArrowFunctionContext, const VariableEnvironment*);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<JITCode> generatedJITCode()
</span><span class="cx"> {
</span><span class="lines">@@ -448,7 +452,7 @@
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><del>- ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false); }
</del><ins>+ ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false, isDerivedConstructorContext(), isArrowFunctionContext()); }
</ins><span class="cx">
</span><span class="cx"> unsigned numVariables() { return m_unlinkedEvalCodeBlock->numVariables(); }
</span><span class="cx"> unsigned numberOfFunctionDecls() { return m_unlinkedEvalCodeBlock->numberOfFunctionDecls(); }
</span><span class="lines">@@ -456,7 +460,7 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class ExecutableBase;
</span><span class="cx"> friend class ScriptExecutable;
</span><del>- EvalExecutable(ExecState*, const SourceCode&, bool);
</del><ins>+ EvalExecutable(ExecState*, const SourceCode&, bool inStrictContext, bool isDerivedConstructorContext, bool isArrowFunctionContext);
</ins><span class="cx">
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="lines">@@ -501,7 +505,7 @@
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><del>- ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false); }
</del><ins>+ ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false, isDerivedConstructorContext(), false); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class ExecutableBase;
</span><span class="lines">@@ -542,7 +546,8 @@
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><del>- ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false); }
</del><ins>+ ExecutableInfo executableInfo() const { return ExecutableInfo(needsActivation(), usesEval(), isStrictMode(), false, false, ConstructorKind::None, false, isDerivedConstructorContext(), false); }
+
</ins><span class="cx"> UnlinkedModuleProgramCodeBlock* unlinkedModuleProgramCodeBlock() { return m_unlinkedModuleProgramCodeBlock.get(); }
</span><span class="cx">
</span><span class="cx"> SymbolTable* moduleEnvironmentSymbolTable() { return m_moduleEnvironmentSymbolTable.get(); }
</span><span class="lines">@@ -651,6 +656,7 @@
</span><span class="cx"> bool isBuiltinFunction() const { return m_unlinkedExecutable->isBuiltinFunction(); }
</span><span class="cx"> ConstructAbility constructAbility() const { return m_unlinkedExecutable->constructAbility(); }
</span><span class="cx"> bool isArrowFunction() const { return m_unlinkedExecutable->isArrowFunction(); }
</span><ins>+ bool isDerivedConstructorContext() const { return m_unlinkedExecutable->isDerivedConstructorContext(); }
</ins><span class="cx"> bool isClassConstructorFunction() const { return m_unlinkedExecutable->isClassConstructorFunction(); }
</span><span class="cx"> const Identifier& name() { return m_unlinkedExecutable->name(); }
</span><span class="cx"> const Identifier& inferredName() { return m_unlinkedExecutable->inferredName(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -949,14 +949,14 @@
</span><span class="cx"> return unlinkedCodeBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-UnlinkedEvalCodeBlock* JSGlobalObject::createEvalCodeBlock(CallFrame* callFrame, EvalExecutable* executable, ThisTDZMode thisTDZMode, const VariableEnvironment* variablesUnderTDZ)
</del><ins>+UnlinkedEvalCodeBlock* JSGlobalObject::createEvalCodeBlock(CallFrame* callFrame, EvalExecutable* executable, ThisTDZMode thisTDZMode, bool isArrowFunctionContext, const VariableEnvironment* variablesUnderTDZ)
</ins><span class="cx"> {
</span><span class="cx"> ParserError error;
</span><span class="cx"> JSParserStrictMode strictMode = executable->isStrictMode() ? JSParserStrictMode::Strict : JSParserStrictMode::NotStrict;
</span><span class="cx"> DebuggerMode debuggerMode = hasDebugger() ? DebuggerOn : DebuggerOff;
</span><span class="cx"> ProfilerMode profilerMode = hasProfiler() ? ProfilerOn : ProfilerOff;
</span><span class="cx"> UnlinkedEvalCodeBlock* unlinkedCodeBlock = vm().codeCache()->getEvalCodeBlock(
</span><del>- vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode, thisTDZMode, debuggerMode, profilerMode, error, variablesUnderTDZ);
</del><ins>+ vm(), executable, executable->source(), JSParserBuiltinMode::NotBuiltin, strictMode, thisTDZMode, isArrowFunctionContext, debuggerMode, profilerMode, error, variablesUnderTDZ);
</ins><span class="cx">
</span><span class="cx"> if (hasDebugger())
</span><span class="cx"> debugger()->sourceParsed(callFrame, executable->source().provider(), error.line(), error.message());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> unsigned weakRandomInteger() { return m_weakRandom.getUint32(); }
</span><span class="cx">
</span><span class="cx"> UnlinkedProgramCodeBlock* createProgramCodeBlock(CallFrame*, ProgramExecutable*, JSObject** exception);
</span><del>- UnlinkedEvalCodeBlock* createEvalCodeBlock(CallFrame*, EvalExecutable*, ThisTDZMode, const VariableEnvironment*);
</del><ins>+ UnlinkedEvalCodeBlock* createEvalCodeBlock(CallFrame*, EvalExecutable*, ThisTDZMode, bool isArrowFunctionContext, const VariableEnvironment*);
</ins><span class="cx"> UnlinkedModuleProgramCodeBlock* createModuleProgramCodeBlock(CallFrame*, ModuleProgramExecutable*);
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* calleeGlobalObject = exec->callee()->globalObject();
</span><span class="cx"> VariableEnvironment emptyTDZVariables; // Indirect eval does not have access to the lexical scope.
</span><del>- EvalExecutable* eval = EvalExecutable::create(exec, makeSource(s), false, ThisTDZMode::CheckIfNeeded, &emptyTDZVariables);
</del><ins>+ EvalExecutable* eval = EvalExecutable::create(exec, makeSource(s), false, ThisTDZMode::CheckIfNeeded, false, false, &emptyTDZVariables);
</ins><span class="cx"> if (!eval)
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> - path: es6/arrow_functions_lexical_arguments_binding.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/arrow_functions_lexical_new.target_binding.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/arrow_functions_lexical_super_binding.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/arrow_functions_no_prototype_property.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionactivationsinkosrexitjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink-osrexit.js (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink-osrexit.js 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink-osrexit.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-var n = 1000000;
</del><ins>+var n = 100000;
</ins><span class="cx">
</span><span class="cx"> function bar() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionactivationsinkjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink.js (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink.js 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-activation-sink.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-var n = 10000000;
</del><ins>+var n = 1000000;
</ins><span class="cx">
</span><span class="cx"> function bar(f) { f(10); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindnewtargetjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-newtarget.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-newtarget.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-newtarget.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+function getTarget(name) {
+ return x => new.target;
+}
+
+noInline(getTarget)
+
+for (var i=0; i < 1000; i++) {
+ var undefinedTarget = getTarget()();
+ testCase(undefinedTarget, undefined, "Error: new.target is not lexically binded inside of the arrow function #1");
+}
+
+for (var i = 0; i < 1000; i++) {
+ var newTarget = new getTarget()();
+ testCase(newTarget, getTarget, "Error: new.target is not lexically binded inside of the arrow function #2");
+}
+
+var passed = false;
+var A = class A {
+ constructor() {
+ this.idValue = 123;
+ passed = passed && new.target === B;
+ }
+};
+
+var B = class B extends A {
+ constructor() {
+ var f = () => {
+ passed = new.target === B;
+ super();
+ };
+ f();
+ }
+};
+
+for (var i = 0; i < 1000; i++) {
+ passed = false;
+ var b = new B();
+
+ testCase(passed, true, "Error: new.target is not lexically binded inside of the arrow function in constructor #3");
+}
+
+var C = class C extends A {
+ constructor(tryToAccessToVarInArrow) {
+ var f = () => {
+ super();
+ if (tryToAccessToVarInArrow)
+ this.id2 = newTargetLocal;
+ };
+
+ f();
+
+ if (!tryToAccessToVarInArrow)
+ this.id = newTargetLocal;
+ }
+};
+
+var tryToCreateClass = function (val) {
+ var result = false;
+ try {
+ new C(val);
+ }
+ catch (e) {
+ result = e instanceof ReferenceError;
+ }
+
+ return result;
+};
+
+for (var i = 0; i < 1000; i++) {
+ testCase(tryToCreateClass(true), true, "Error: newTargetLocal should be hided variable");
+ testCase(tryToCreateClass(false), true, "Error: newTargetLocal should be hided variable");
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall1js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-1.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-1.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-1.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var testValue = 'test-value';
+
+var A = class A {
+ constructor() {
+ this.idValue = testValue;
+ }
+};
+
+var B = class B extends A {
+ constructor (inArrowFuction, inConstructor) {
+ var arrow = () => {
+ if (inArrowFuction) {
+ super();
+ testCase(this.idValue, testValue, "Error: super() should create this and put value into idValue property");
+ }
+ }
+
+ if (inArrowFuction)
+ arrow();
+
+ if (inConstructor)
+ super();
+
+ testCase(this.idValue, testValue, "Error: arrow function should return this to constructor");
+ }
+};
+
+for (var i = 0; i < 1000; i++) {
+ new B(true, false);
+ new B(false, true);
+}
+
+var testException = function (value1, value2, index) {
+ var exception;
+ try {
+ new B(value1, value2);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration " + index;
+}
+
+for (var i=0; i < 1000; i++) {
+ testException(false, false, i);
+}
+
+var C = class C extends A {
+ constructor() {
+ eval("var x = 20");
+ super();
+ let f = () => this;
+ let xf = f();
+ xf.id = 'test-id';
+ }
+};
+
+var c = new C();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall2js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-2.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-2.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-2.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,176 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var testValue = 'test-value';
+
+var A = class A {
+ constructor() {
+ this.idValue = testValue;
+ }
+};
+
+var B = class B extends A {
+ constructor (inArrowFuction, inConstructor, setProtoToNull) {
+ var arrow = () => () => () => {
+ if (inArrowFuction) {
+ super();
+ testCase(this.idValue, testValue, "Error: super() should create this and put value into idValue property");
+ }
+ };
+
+ if (inArrowFuction)
+ arrow()()();
+
+ if (inConstructor)
+ super();
+
+ testCase(this.idValue, testValue, "Error: arrow function should return this to constructor");
+ }
+};
+
+for (var i=0; i < 1000; i++) {
+ new B(true, false);
+ new B(false, true);
+}
+
+var testException = function (index) {
+ var exception;
+ try {
+ new B(false, false);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a correct error. Expected ReferenceError but was " + e.name;
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration #" + index;
+}
+
+for (var i = 0; i < 1000; i++) {
+ testException(i, ReferenceError);
+}
+
+var C = class C extends A {
+ constructor () {
+ var arrow = () => {
+ let __proto__ = 'some-text';
+ var arr = () => {
+ testCase(typeof __proto__, 'string', "Erorr: __proto__ variable has wrong type");
+ super();
+ testCase(this.idValue, testValue, "Error: super() should create this and put value into idValue property");
+ };
+ arr();
+ };
+
+ arrow();
+
+ testCase(this.idValue, testValue, "Error: arrow function should return this to constructor");
+ }
+};
+
+for (var i = 0; i < 1000; i++) {
+ new C();
+}
+
+class D extends A {
+ constructor(doReplaceProto) {
+ var arrow = () => super();
+ if (doReplaceProto)
+ D.__proto__ = function () {};
+ arrow();
+ }
+}
+
+testCase((new D(false)).idValue, testValue, "Error: arrow function bound wrong super");
+testCase(typeof (new D(true)).idValue, "undefined" , "Error: arrow function bound wrong super");
+
+class E extends A {
+ constructor(doReplaceProto) {
+ var arrow = () => {
+ if (doReplaceProto)
+ E.__proto__ = function () {};
+ super();
+ };
+
+ arrow();
+ }
+}
+
+testCase((new E(false)).idValue, testValue, "Error: arrow function bound wrong super #1");
+testCase(typeof (new E(true)).idValue, "undefined" , "Error: arrow function bound wrong super #1");
+
+
+class F extends A {
+ constructor(doReplaceProto) {
+ var arrow = () => {
+ F.__proto__ = null;
+ super();
+ };
+
+ arrow();
+ }
+}
+
+var testTypeErrorException = function (index) {
+ var exception;
+ try {
+ new F();
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof TypeError))
+ throw "Exception thrown was not a correct error. Expected TypeError but was " + e.name;
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration #" + index;
+}
+
+for (var i = 0; i < 1000; i++) {
+ testTypeErrorException(i);
+}
+
+var errorStack;
+
+var ParentClass = class ParentClass {
+ constructor() {
+ try {
+ this.idValue = testValue;
+ throw new Error('Error');
+ } catch (e) {
+ errorStack = e.stack;
+ }
+ }
+};
+
+var ChildClass = class ChildClass extends ParentClass {
+ constructor () {
+ var arrowInChildConstructor = () => {
+ var nestedArrow = () => {
+ super();
+ }
+
+ nestedArrow();
+ };
+
+ arrowInChildConstructor();
+ }
+};
+
+for (var i = 0; i < 1000; i++) {
+ errorStack = '';
+ let c = new ChildClass();
+
+ let parentClassIndexOf = errorStack.indexOf('ParentClass');
+ let nestedArrowIndexOf = errorStack.indexOf('nestedArrow');
+ let arrowInChildConstructorIndexOf = errorStack.indexOf('arrowInChildConstructor');
+ let childClassIndexOf = errorStack.indexOf('ChildClass');
+
+ testCase(parentClassIndexOf > -1 && errorStack.indexOf('ParentClass', parentClassIndexOf + 1) === -1, true, "Error: stack of error should contain ParentClass text");
+ testCase(nestedArrowIndexOf > -1 && errorStack.indexOf('nestedArrow', nestedArrowIndexOf + 1) === -1, true, "Error: stack of error should contain nestedArrow text");
+ testCase(arrowInChildConstructorIndexOf > -1 && errorStack.indexOf('arrowInChildConstructor', arrowInChildConstructorIndexOf + 1) === -1, true, "Error: stack of error should contain arrowInChildConstructor text");
+ testCase(childClassIndexOf > -1 && errorStack.indexOf('ChildClass', childClassIndexOf + 1) === -1, true, "Error: stack of error should contains ChildClass text");
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall3js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-3.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-3.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-3.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var testValue = 'test-value';
+
+var A = class A {
+ constructor() {
+ this.idValue = testValue;
+ }
+};
+
+var B = class B extends A {
+ constructor (beforeSuper) {
+ var arrow = () => eval('(() => this.idValue)()');
+
+ if (beforeSuper) {
+ var result = arrow();
+ super();
+ testCase(result, testValue, "Error: has to be TDZ error");
+ } else {
+ super();
+ let result= arrow();
+ testCase(result, testValue, "Error: super() should create this and put value into idValue property");
+ }
+ }
+};
+
+for (var i = 0; i < 1000; i++) {
+ var b = new B(false);
+}
+
+var testException = function (value, index) {
+ var exception;
+ try {
+ new B(value);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration #" + index;
+}
+
+
+for (var i = 0; i < 1000; i++) {
+ testException(true, i);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindsupercall4js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-4.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-4.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-supercall-4.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var testValue = 'test-value';
+
+var A = class A {
+ constructor() {
+ this.idValue = testValue;
+ }
+};
+
+var B = class B extends A {
+ constructor (beforeSuper) {
+
+ var arrow = () => eval('(() => super())()');
+
+ if (beforeSuper) {
+ arrow();
+ testCase(this.idValue, testValue, "Error: super() should create this and put value into idValue property");
+ } else {
+ testCase(this.idValue, testValue, "Error: has to be TDZ error");
+ arrow();
+ }
+ }
+};
+
+var C = class C extends A {
+ constructor () {
+ var arrow = () => eval('(() => super())()');
+ arrow();
+ return {};
+ }
+};
+
+var D = class D extends A {
+ constructor () {
+ var arrow = () => eval('(() => super())()');
+ arrow();
+ eval('this.id="new-value"');
+ }
+};
+
+var E = class E extends A {
+ constructor () {
+ var arrow = () => eval("eval('(() => super())()')");
+ arrow();
+ eval('eval("this.id=\'new-value\'")');
+ }
+};
+
+for (var i=0; i < 1000; i++) {
+ new B(true);
+ var c = new C();
+ testCase(typeof c.id, 'undefined', 'Error during set value in eval #1');
+ var d = new D();
+ testCase(d.id, 'new-value', 'Error during set value in eval #2');
+ var e = new E();
+ testCase(e.id, 'new-value', 'Error during set value in eval #3');
+}
+
+var testException = function (value, index) {
+ var exception;
+ try {
+ new B(value);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration #" + index;
+}
+
+for (var i=0; i < 1000; i++) {
+ testException(false, i);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindthis1js"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-1.js (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-1.js 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-1.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> this.name = name;
</span><span class="cx"> this.getName = () => eval("this.name");
</span><span class="cx"> this.getNameHard = () => eval("(() => this.name)()");
</span><ins>+ this.getNameReallyHard = () => eval("eval('(() => this.name)()')");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> noInline(Dog)
</span><span class="lines">@@ -16,4 +17,5 @@
</span><span class="cx"> var d = new Dog("Max");
</span><span class="cx"> testCase(d.getName(), d.name, "Error: this is not lexically binded inside of the arrow function #1");
</span><span class="cx"> testCase(d.getNameHard(), d.name, "Error: this is not lexically binded inside of the arrow function #2");
</span><ins>+ testCase(d.getNameReallyHard(), d.name, "Error: this is not lexically binded inside of the arrow function #3");
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctionlexicalbindthis7js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-7.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-7.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-this-7.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var deepScope = function (x, y) {
+ var _x = x, _y = y;
+ return ()=> _x + _y + this.val;
+};
+
+var a = deepScope.call({val:'A'}, 'D', 'E');
+var b = deepScope.call({val:'B'}, 'D', 'F');
+var c = deepScope.call({val:'C'}, 'D', 'G');
+
+var anotherScope = function (_af) {
+ return _af();
+};
+
+for (var i = 0; i < 1000; i++) {
+ testCase(c(), anotherScope.call({val:'I'}, c), "Error: this is not lexically binded inside of the arrow function #1");
+ testCase(b(), anotherScope.call({val:'J'}, b), "Error: this is not lexically binded inside of the arrow function #2");
+ testCase(a(), anotherScope.call({val:'K'}, a), "Error: this is not lexically binded inside of the arrow function #3");
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontdz1js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-1.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-1.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-1.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+var A = class A { };
+var B = class B extends A {
+ constructor(beforeSuper, returnThis) {
+ var f = () => returnThis ? this : {};
+ if (beforeSuper) {
+ let val = f();
+ super();
+ } else {
+ super();
+ let val = f();
+ }
+ }
+};
+
+var exception = null;
+for (var i=0; i < 10000; i++) {
+ try {
+ new B(true, true);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration";
+
+ var a = new B(false, true);
+ var b = new B(false, false);
+ var c = new B(true, false);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontdz2js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-2.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-2.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-2.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+var A = class A { };
+var B = class B extends A {
+ constructor(beforeSuper, returnThis) {
+ var f = () => returnThis ? (() => this ) : (()=>{});
+ let af = f();
+ if (beforeSuper) {
+ let result = af();
+ super();
+ } else {
+ super();
+ let result = af();
+ }
+ }
+};
+
+var exception = null;
+for (var i = 0; i < 10000; i++) {
+ try {
+ new B(true, true);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration";
+
+ var a = new B(false, true);
+ var b = new B(false, false);
+ var c = new B(true, false);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontdz3js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-3.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-3.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-3.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,177 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var A = class A {
+ constructor() {
+ this.id = 'A'
+ }
+};
+
+var B = class B extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this.id === 'A') {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var C = class C extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this > 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var D = class D extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this < 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var E = class E extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this !== 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var F = class F extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this <= 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var G = class G extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this >= 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var G = class G extends A {
+ constructor(beforeSuper) {
+ var f = () => {
+ if (this === 5) {
+ return 'ok';
+ }
+ return 'ok';
+ };
+ let val;
+ if (beforeSuper) {
+ val = f();
+ super();
+ } else {
+ super();
+ val = f();
+ }
+ this.res = val;
+ }
+};
+
+var tryToCreate = function (classForCreate) {
+ var result = false;
+ try {
+ new classForCreate(true);
+ } catch (e) {
+ result = e instanceof ReferenceError;
+ }
+
+ return result;
+}
+
+var check = function (classForCheck) {
+ testCase(tryToCreate(classForCheck), true, 'Exception wasn\'t thrown or was not a reference error');
+ var result = new classForCheck(false);
+ testCase(result.res, 'ok', 'Error in setting id ');
+}
+
+for (var i = 0; i < 10000; i++) {
+ check(B);
+ check(C);
+ check(D);
+ check(E);
+ check(F);
+ check(G);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontdz4js"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-4.js (0 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-4.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz-4.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+var testCase = function (actual, expected, message) {
+ if (actual !== expected) {
+ throw message + ". Expected '" + expected + "', but was '" + actual + "'";
+ }
+};
+
+var testValue = 'test-value';
+
+var A = class A {
+ constructor() {
+ this.idValue = testValue;
+ }
+};
+
+var B = class B extends A {
+ constructor (doRunSuper) {
+ var arrow = () => {
+ if (doRunSuper) {
+ super();
+ testCase(this.idValue, testValue, "Error: super() should create this and put value into idValue property");
+ }
+ }
+
+ if (doRunSuper) {
+ arrow();
+ testCase(this.idValue, testValue, "Error: arrow function should return this to constructor");
+ } else {
+ var value = this.idValue;//force TDZ error
+ debug(value);
+ }
+ }
+};
+
+for (var i=0; i < 10000; i++) {
+ var exception;
+ try {
+ new B(false);
+ } catch (e) {
+ exception = e;
+ if (!(e instanceof ReferenceError))
+ throw "Exception thrown was not a reference error";
+ }
+
+ if (!exception)
+ throw "Exception not thrown for an unitialized this at iteration #" + i;
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressarrowfunctiontdzjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js (192875 => 192876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js 2015-12-01 09:24:49 UTC (rev 192875)
+++ trunk/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js 2015-12-01 09:46:12 UTC (rev 192876)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>-var A = class A { };
-var B = class B extends A {
- constructor(accessThisBeforeSuper) {
- if (accessThisBeforeSuper) {
- var f = () => this;
- super();
- } else {
- super();
- }
- }
-};
-
-var exception = null;
-for (var i=0; i<10000; i++) {
- try {
- new B(true);
- } catch (e) {
- exception = e;
- if (!(e instanceof ReferenceError))
- throw "Exception thrown was not a reference error";
- }
-
- if (!exception)
- throw "Exception not thrown for an unitialized this at iteration";
-
- var e = new B(false);
-}
</del></span></pre>
</div>
</div>
</body>
</html>