Attachment 253042 Details for Bug 144956 – Patch

[patch] Patch

bug-144956-20150513221334.patch (text/plain), 88.65 KB, created by GSkachkov on 2015-05-13 12:14:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: GSkachkov

Created: 2015-05-13 12:14:58 PDT

Size: 88.65 KB

patch

obsolete

>Subversion Revision: 184283
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index af37315f76c0825ba7e638cf082d63602ba7e863..7d6678883483ef3ed161d96e91bf1f0b47702e28 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,5 +1,118 @@
> 2015-05-13 Aleksandr Skachkov  <gskachkov@gmail.com>
> 
>+        [ES6] Implement ES6 arrow function syntax. Arrow function specific features. Lexical bind of this
>+        https://bugs.webkit.org/show_bug.cgi?id=144956
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added support of ES6 arrow function specific feature, lexical bind of this and no constructor. http://wiki.ecmascript.org/doku.php?id=harmony:arrow_function_syntax
>+        In patch were implemented the following cases cases:
>+          1 lexical this - variable this is point to the this of the function where arrow function is declared
>+          2 No constructor - the using of the command new for arrow function leads to runtime error.
>+
>+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
>+        * JavaScriptCore.xcodeproj/project.pbxproj:
>+        * bytecode/BytecodeList.json:
>+        * bytecode/BytecodeUseDef.h:
>+        (JSC::Functor::computeUsesForBytecodeOffset):
>+        * bytecode/CodeBlock.cpp:
>+        (JSC::CodeBlock::dumpBytecode):
>+        * bytecompiler/BytecodeGenerator.h:
>+        * bytecompiler/BytecodeGenerator.cpp:
>+        (JSC::BytecodeGenerator::emitNewArrowFunctionExpression): added
>+        (JSC::BytecodeGenerator::emitThisNodeBytecode): added
>+        * bytecompiler/NodesCodegen.cpp:
>+        (JSC::emitBytecode::emitBytecode): added
>+        (JSC::ArrowFuncExprNode::emitBytecode): added
>+        * dfg/DFGByteCodeParser.cpp:
>+        (JSC::ByteCodeParser::parseBlock):
>+        * dfg/DFGCapabilities.cpp:
>+        (JSC::CapabilityLevel::capabilityLevel):
>+        * jit/CCallHelpers.h
>+        (JSC::JIT::setupArgumentsWithExecState)
>+        * jit/JIT.h:
>+        (JSC::JIT::emit_op_new_arrow_func_exp): added
>+        * jit/JITInlines.h:
>+        (JSC::JIT::callOperation): added
>+        * jit/JIT.cpp:
>+        (JSC::JIT::privateCompileMainPass):
>+        * jit/JITOpcodes.cpp:
>+        (JSC::JIT::emit_op_new_arrow_func_exp): added
>+        * jit/JITOperations.cpp:
>+        (JSC::JIT_OPERATION::operationNewArrowFunction): added
>+        * jit/JITOperations.h:
>+        (JSC::JIT_OPERATION::operationNewArrowFunction): added
>+        * llint/LLIntSlowPaths.cpp:
>+        (LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp): added
>+        * llint/LLIntSlowPaths.h:
>+        (LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp)): added
>+        * llint/LowLevelInterpreter.asm:
>+        * dfg/DFGAbstractInterpreterInlines.h:
>+        (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
>+        * dfg/DFGByteCodeParser.cpp:
>+        (JSC::DFG::ByteCodeParser::parseBlock):
>+        * dfg/DFGCapabilities.cpp:
>+        (JSC::DFG::capabilityLevel):
>+        * dfg/DFGClobberize.h:
>+        (JSC::DFG::clobberize):
>+        * dfg/DFGDoesGC.cpp:
>+        (JSC::DFG::doesGC):
>+        * dfg/DFGFixupPhase.cpp:
>+        (JSC::DFG::FixupPhase::fixupNode):
>+        * dfg/DFGNode.h:
>+        (JSC::DFG::Node::hasCellOperand):
>+        * dfg/DFGNodeType.h:
>+        * dfg/DFGPredictionPropagationPhase.cpp:
>+        (JSC::DFG::PredictionPropagationPhase::propagate):
>+        * dfg/DFGSafeToExecute.h:
>+        (JSC::DFG::safeToExecute):
>+        * dfg/DFGSpeculativeJIT.h:
>+        (JSC::DFG::SpeculativeJIT::callOperation):
>+        * dfg/DFGSpeculativeJIT32_64.cpp:
>+        (JSC::DFG::SpeculativeJIT::compile):
>+        * dfg/DFGSpeculativeJIT64.cpp:
>+        (JSC::DFG::SpeculativeJIT::compile):
>+        * dfg/DFGStructureRegistrationPhase.cpp:
>+        (JSC::DFG::StructureRegistrationPhase::run):
>+        * ftl/FTLAbstractHeapRepository.cpp:
>+        * ftl/FTLAbstractHeapRepository.h:
>+        * ftl/FTLCapabilities.cpp:
>+        (JSC::FTL::canCompile):
>+        * ftl/FTLIntrinsicRepository.h:
>+        * ftl/FTLLowerDFGToLLVM.cpp:
>+        (JSC::FTL::LowerDFGToLLVM::compileNode):
>+        (JSC::FTL::LowerDFGToLLVM::compileNewArrowFunction):
>+        * runtime/JSArrowFunction.h: added class for handle arrow function creation and execution
>+        * runtime/JSArrowFunction.cpp:
>+        * runtime/JSFunction.h:
>+        (JSC::JSFunction::JSFunction): added one more constructor
>+        * runtime/JSFunctionInlines.h:
>+        (JSC::JSFunction::JSFunction): added constructor implementation
>+        * runtime/JSGlobalObject.cpp:
>+        (JSC::JSGlobalObject::init):
>+        (JSC::JSGlobalObject::m_arrowFunctionStructure): added
>+        (JSC::JSGlobalObject::arrowFunctionStructure):
>+        * WTF/wtf/FeatureDefines.h: added feature flag
>+        * tests/stress/arrowfunction-associativity-2.js: Added.
>+        * tests/stress/arrowfunction-bound.js: Added.
>+        * tests/stress/arrowfunction-call.js: Added.
>+        * tests/stress/arrowfunction-constructor.js:
>+        * tests/stress/arrowfunction-lexical-arguments.js: Added.
>+        * tests/stress/arrowfunction-lexical-this-1.js: Added.
>+        * tests/stress/arrowfunction-lexical-this-2.js: Added.
>+        * tests/stress/arrowfunction-lexical-this-3.js: Added.
>+        * tests/stress/arrowfunction-lexical-this-4.js: Added.
>+        * tests/stress/arrowfunction-lexical-this-5.js: Added.
>+        * tests/stress/arrowfunction-lexical-others.js: Added.
>+        * tests/stress/arrowfunction-run-10-1.js: Added.
>+        * tests/stress/arrowfunction-run-10-2.js: Added.
>+        * tests/stress/arrowfunction-run-10000-1.js: Added.
>+        * tests/stress/arrowfunction-run-10000-2.js: Added.
>+        * tests/stress/arrowfunction-tdz.js: Added.
>+        * tests/stress/arrowfunction-typeof.js: Added.
>+
>+2015-05-13 Aleksandr Skachkov  <gskachkov@gmail.com>
>+
>         [ES6] Implement ES6 arrow function syntax. Parser of arrow function with execution as common function 
>         https://bugs.webkit.org/show_bug.cgi?id=144955
> 
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 99a201dd4333c7f37e86a1637927178767acbbb1..fc2d9f5615470a7662605bb76668660a199b3712 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -474,6 +474,7 @@ set(JavaScriptCore_RUNTIME_SOURCES
>     runtime/JSArrayBufferView.cpp
>     runtime/JSArrayIterator.cpp
>     runtime/JSBoundFunction.cpp
>+    runtime/JSArrowFunction.cpp
>     runtime/JSGlobalObjectDebuggable.cpp
>     runtime/JSCJSValue.cpp
>     runtime/JSCallee.cpp
>diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>index da6bb1907411108c47dbeac0d57459cebc57127e..9485ca203c0e01124b9155dcb63ca3793e464593 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>@@ -735,6 +735,7 @@
>     <ClCompile Include="..\runtime\JSArrayBufferPrototype.cpp" />
>     <ClCompile Include="..\runtime\JSArrayBufferView.cpp" />
>     <ClCompile Include="..\runtime\JSBoundFunction.cpp" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.cpp" />
>     <ClCompile Include="..\runtime\JSCJSValue.cpp" />
>     <ClCompile Include="..\runtime\JSCallee.cpp" />
>     <ClCompile Include="..\runtime\JSCatchScope.cpp" />
>@@ -1537,6 +1538,7 @@
>     <ClInclude Include="..\runtime\JSArrayBufferViewInlines.h" />
>     <ClInclude Include="..\runtime\JSArrayIterator.h" />
>     <ClInclude Include="..\runtime\JSBoundFunction.h" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.h" />
>     <ClInclude Include="..\runtime\JSCInlines.h" />
>     <ClInclude Include="..\runtime\JSCJSValue.h" />
>     <ClInclude Include="..\runtime\JSCJSValueInlines.h" />
>@@ -1818,4 +1820,4 @@
>   <ImportGroup Label="ExtensionTargets">
>     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
>   </ImportGroup>
>-</Project>
>\ No newline at end of file
>+</Project>
>diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>index 8372164af522b374c1238473080697e97b598fac..43f2db32c7ff7ef8a3d15cb87817eaf8fbd7fd5d 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>@@ -1107,6 +1107,8 @@
> 		86F3EEBF168CDE930077B92A /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F3EEB616855A5B0077B92A /* ObjcRuntimeExtras.h */; };
> 		86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */; };
> 		86FA9E92142BBB2E001773B7 /* JSBoundFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */; };
>+		8B0F424C1ABD6DE2003917EA /* JSArrowFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B0F424B1ABD6DE2003917EA /* JSArrowFunction.cpp */; };
>+		8B0F424C1ABD6DE2003917EA /* JSArrowFunction.h in Sources */ = {isa = PBXBuildFile; fileRef = 8B0F424B1ABD6DE2003917EA /* JSArrowFunction.h */; };
> 		90213E3D123A40C200D422F3 /* MemoryStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */; };
> 		90213E3E123A40C200D422F3 /* MemoryStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 90213E3C123A40C200D422F3 /* MemoryStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		93052C340FB792190048FDC3 /* ParserArena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93052C320FB792190048FDC3 /* ParserArena.cpp */; };
>@@ -2856,6 +2858,8 @@
> 		86F75EFD151C062F007C9BA3 /* RegExpMatchesArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExpMatchesArray.cpp; sourceTree = "<group>"; };
> 		86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBoundFunction.cpp; sourceTree = "<group>"; };
> 		86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBoundFunction.h; sourceTree = "<group>"; };
>+		8B0F424A1ABD6D2F003917EA /* JSArrowFunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSArrowFunction.h; sourceTree = "<group>"; };
>+		8B0F424B1ABD6DE2003917EA /* JSArrowFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSArrowFunction.cpp; sourceTree = "<group>"; };
> 		90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryStatistics.cpp; sourceTree = "<group>"; };
> 		90213E3C123A40C200D422F3 /* MemoryStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryStatistics.h; sourceTree = "<group>"; };
> 		93052C320FB792190048FDC3 /* ParserArena.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParserArena.cpp; sourceTree = "<group>"; };
>@@ -4471,6 +4475,8 @@
> 				A7BDAEC517F4EA1400F6140C /* JSArrayIterator.h */,
> 				86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
> 				86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
>+				8B0F424A1ABD6D2F003917EA /* JSArrowFunction.h */,
>+				8B0F424B1ABD6DE2003917EA /* JSArrowFunction.cpp */,
> 				657CF45619BF6662004ACBF2 /* JSCallee.cpp */,
> 				657CF45719BF6662004ACBF2 /* JSCallee.h */,
> 				0FD9497E1A97DB9600E28966 /* JSCatchScope.cpp */,
>@@ -7228,6 +7234,7 @@
> 				0FD8A31B17D51F2200CA2C40 /* FTLOSREntry.cpp in Sources */,
> 				0F235BDC17178E1C00690C7F /* FTLOSRExit.cpp in Sources */,
> 				0F235BDF17178E1C00690C7F /* FTLOSRExitCompiler.cpp in Sources */,
>+				8B0F424C1ABD6DE2003917EA /* JSArrowFunction.cpp in Sources */,
> 				0FEA0A2A1709629600BB722C /* FTLOutput.cpp in Sources */,
> 				0F485329187DFDEC0083B687 /* FTLRecoveryOpcode.cpp in Sources */,
> 				0F6B1CC31862C47800845D97 /* FTLRegisterAtOffset.cpp in Sources */,
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeList.json b/Source/JavaScriptCore/bytecode/BytecodeList.json
>index e3ed1dcda4e03a5f11ef91e56119eb93051fb7f6..56cba936c47505f546841ed57bb9b8e8d3d16d8c 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeList.json
>+++ b/Source/JavaScriptCore/bytecode/BytecodeList.json
>@@ -95,6 +95,7 @@
>             { "name" : "op_switch_string", "length" : 4 },
>             { "name" : "op_new_func", "length" : 4 },
>             { "name" : "op_new_func_exp", "length" : 4 },
>+            { "name" : "op_new_arrow_func_exp", "length" : 5 },
>             { "name" : "op_call", "length" : 9 },
>             { "name" : "op_call_eval", "length" : 9 },
>             { "name" : "op_call_varargs", "length" : 9 },
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>index 7667e683e454a499986edacd90b64917242037cd..da4a2aaeec2845941ae366dcfb98591ccb3ccd45 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>@@ -115,6 +115,9 @@ void computeUsesForBytecodeOffset(
>     case op_get_property_enumerator:
>     case op_get_enumerable_length:
>     case op_new_func_exp:
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    case op_new_arrow_func_exp:
>+#endif
>     case op_to_index_string:
>     case op_init_global_const_nop:
>     case op_init_global_const:
>@@ -307,6 +310,9 @@ void computeDefsForBytecodeOffset(CodeBlock* codeBlock, unsigned bytecodeOffset,
>     case op_new_regexp:
>     case op_new_func:
>     case op_new_func_exp:
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    case op_new_arrow_func_exp:
>+#endif
>     case op_call_varargs:
>     case op_construct_varargs:
>     case op_get_from_scope:
>diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>index 90138f97cbd828f972cb22442bf40441d13f4056..7183d04dd882bb6223fbace17e5fbb50091d8004 100644
>--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>@@ -1301,6 +1301,17 @@ void CodeBlock::dumpBytecode(
>             out.printf("%s, %s, f%d", registerName(r0).data(), registerName(r1).data(), f0);
>             break;
>         }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        case op_new_arrow_func_exp: {
>+            int r0 = (++it)->u.operand;
>+            int r1 = (++it)->u.operand;
>+            int f0 = (++it)->u.operand;
>+            int r2 = (++it)->u.operand;
>+            printLocationAndOp(out, exec, location, it, "op_new_arrow_func_exp");
>+            out.printf("%s, %s, f%d, %s", registerName(r0).data(), registerName(r1).data(), f0, registerName(r2).data());
>+            break;
>+        }
>+#endif
>         case op_new_func_exp: {
>             int r0 = (++it)->u.operand;
>             int r1 = (++it)->u.operand;
>diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>index c3ce875591a329f73ea5db2606bf56698a25f1a6..3103755637de2617e38cb3032dc878234d9a558b 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>@@ -1782,6 +1782,22 @@ RegisterID* BytecodeGenerator::emitNewFunctionExpression(RegisterID* r0, FuncExp
>     instructions().append(index);
>     return r0;
> }
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+RegisterID* BytecodeGenerator::emitNewArrowFunctionExpression(RegisterID* r0, FuncExprNode* n)
>+{
>+    emitTDZCheck(thisRegister());
>+    FunctionBodyNode* function = n->body();
>+    unsigned index = m_codeBlock->addFunctionExpr(makeFunction(function));
>+    
>+    emitOpcode(op_new_arrow_func_exp);
>+    instructions().append(r0->index());
>+    instructions().append(scopeRegister()->index());
>+    instructions().append(index);
>+    instructions().append(thisRegister()->index());
>+    return r0;
>+}
>+#endif
> 
> RegisterID* BytecodeGenerator::emitNewDefaultConstructor(RegisterID* dst, ConstructorKind constructorKind, const Identifier& name)
> {
>diff --git a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>index b815632009cd8fdcfe49cdb3c6b310921cfcba7a..d7d2443b07d5a3eae5adc0e907d114cbb18146cb 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>@@ -454,6 +454,10 @@ namespace JSC {
>         RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index);
>         RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
>         RegisterID* emitNewDefaultConstructor(RegisterID* dst, ConstructorKind, const Identifier& name);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        RegisterID* emitNewArrowFunctionExpression(RegisterID*, FuncExprNode*);
>+        RegisterID* emitThisNodeBytecode(RegisterID*, JSTextPosition);
>+#endif
>         RegisterID* emitNewRegExp(RegisterID* dst, RegExp*);
> 
>         RegisterID* emitMoveLinkTimeConstant(RegisterID* dst, LinkTimeConstant);
>diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>index 39b03cddcfb2310334a1d63c83f8f3853d16c6fc..9ef2e4445d069ba8ef4fe654daf0c744a431cfa2 100644
>--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>@@ -2919,6 +2919,14 @@ RegisterID* FuncExprNode::emitBytecode(BytecodeGenerator& generator, RegisterID*
>     return generator.emitNewFunctionExpression(generator.finalDestination(dst), this);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)    
>+// ------------------------------ ArrowFuncExprNode ---------------------------------
>+RegisterID* ArrowFuncExprNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst)
>+{
>+    return generator.emitNewArrowFunctionExpression(generator.finalDestination(dst), this);
>+}
>+#endif
>+    
> #if ENABLE(ES6_CLASS_SYNTAX)
> // ------------------------------ ClassDeclNode ---------------------------------
> 
>diff --git a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
>index e00b468cd1866a4a5d90065080479e3141d212b2..78314d87fa4fa58fe338d4a3b3ea0c234befa56c 100644
>--- a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
>+++ b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
>@@ -1566,7 +1566,12 @@ bool AbstractInterpreter<AbstractStateType>::executeEffects(unsigned clobberLimi
>     case CreateClonedArguments:
>         forNode(node).setType(m_graph, SpecObjectOther);
>         break;
>-        
>+            
>+    case NewArrowFunction:
>+        forNode(node).set(
>+            m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->arrowFunctionStructure());
>+        break;
>+            
>     case NewFunction:
>         forNode(node).set(
>             m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->functionStructure());
>diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>index e0c4635905e7cfbca9110a9a49036513c7cb231b..ce32922f15ec38522941cb69030ad48eb86c35c9 100644
>--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>@@ -3790,6 +3790,17 @@ bool ByteCodeParser::parseBlock(unsigned limit)
>             NEXT_OPCODE(op_new_func_exp);
>         }
> 
>+        case op_new_arrow_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(NewArrowFunction, OpInfo(frozen),
>+                    get(VirtualRegister(currentInstruction[2].u.operand)),
>+                    get(VirtualRegister(currentInstruction[4].u.operand))));
>+            
>+            NEXT_OPCODE(op_new_arrow_func_exp);
>+        }
>+
>         case op_typeof: {
>             set(VirtualRegister(currentInstruction[1].u.operand),
>                 addToGraph(TypeOf, get(VirtualRegister(currentInstruction[2].u.operand))));
>diff --git a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
>index ef4c24749b78fa6e09a4c3d9c29013eaa65daa92..be290b3bffc24e145b1335b6d87c9c62006329ce 100644
>--- a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
>@@ -207,6 +207,7 @@ CapabilityLevel capabilityLevel(OpcodeID opcodeID, CodeBlock* codeBlock, Instruc
>     case op_to_index_string:
>     case op_new_func:
>     case op_new_func_exp:
>+    case op_new_arrow_func_exp:
>     case op_create_lexical_environment:
>         return CanCompileAndInline;
> 
>diff --git a/Source/JavaScriptCore/dfg/DFGClobberize.h b/Source/JavaScriptCore/dfg/DFGClobberize.h
>index 350b20dc286dbf941dda05d780bad10e8f945d4c..8adc126975ea29f0f865f387f3c120a4d3a51373 100644
>--- a/Source/JavaScriptCore/dfg/DFGClobberize.h
>+++ b/Source/JavaScriptCore/dfg/DFGClobberize.h
>@@ -860,7 +860,8 @@ void clobberize(Graph& graph, Node* node, const ReadFunctor& read, const WriteFu
>         read(HeapObjectCount);
>         write(HeapObjectCount);
>         return;
>-        
>+    
>+    case NewArrowFunction:
>     case NewFunction:
>         if (node->castOperand<FunctionExecutable*>()->singletonFunction()->isStillValid())
>             write(Watchpoint_fire);
>diff --git a/Source/JavaScriptCore/dfg/DFGDoesGC.cpp b/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
>index 1117e7ab432ba60ea073fa0afe9819a26f811348..d2def3465717579536ad0e2978c083807978aec3 100644
>--- a/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGDoesGC.cpp
>@@ -230,6 +230,7 @@ bool doesGC(Graph& graph, Node* node)
>     case NewRegexp:
>     case NewStringObject:
>     case MakeRope:
>+    case NewArrowFunction:
>     case NewFunction:
>     case NewTypedArray:
>     case ThrowReferenceError:
>diff --git a/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp b/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
>index a3e0a02f7c2b1337ba73aef57ba16a2980da148f..26aff96044d756f473551bcc485b5384ea4be6db 100644
>--- a/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
>@@ -1250,7 +1250,15 @@ private:
>             fixEdge<CellUse>(node->child1());
>             break;
>         }
>-            
>+
>+        case NewArrowFunction: {
>+            fixEdge<CellUse>(node->child1());
>+            fixEdge<CellUse>(node->child2());
>+            m_insertionSet.insertNode(m_indexInBlock, SpecNone, Check, node->origin,
>+                Edge(node->child2().node(), OtherUse));
>+            break;
>+        }
>+
> #if !ASSERT_DISABLED
>         // Have these no-op cases here to ensure that nobody forgets to add handlers for new opcodes.
>         case SetArgument:
>diff --git a/Source/JavaScriptCore/dfg/DFGNode.h b/Source/JavaScriptCore/dfg/DFGNode.h
>index 0a42c4a10d38c4eba064269fd394eb71f4dedd85..9d7fbee315ed1afd6b74f8fe3995f41859769a8e 100644
>--- a/Source/JavaScriptCore/dfg/DFGNode.h
>+++ b/Source/JavaScriptCore/dfg/DFGNode.h
>@@ -1287,6 +1287,7 @@ struct Node {
>         case CheckCell:
>         case NativeConstruct:
>         case NativeCall:
>+        case NewArrowFunction:
>         case NewFunction:
>             return true;
>         default:
>diff --git a/Source/JavaScriptCore/dfg/DFGNodeType.h b/Source/JavaScriptCore/dfg/DFGNodeType.h
>index 2ce75bceab55d3ce3f68e5540587cb6ea5c266e6..83cdbb600db36dfac7279c5bad8fffe1dd702ca4 100644
>--- a/Source/JavaScriptCore/dfg/DFGNodeType.h
>+++ b/Source/JavaScriptCore/dfg/DFGNodeType.h
>@@ -294,6 +294,8 @@ namespace JSC { namespace DFG {
>     \
>     macro(NewFunction, NodeResultJS) \
>     \
>+    macro(NewArrowFunction, NodeResultJS) \
>+    \
>     /* These aren't terminals but always exit */ \
>     macro(Throw, NodeMustGenerate) \
>     macro(ThrowReferenceError, NodeMustGenerate) \
>diff --git a/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp b/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
>index 0ff5a361337588a1f91d91e5958aa3c82a4bc4b2..65a065f324827e48b10b8dd86562ef4a22317363 100644
>--- a/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
>@@ -217,6 +217,7 @@ private:
>         case GetGetter:
>         case GetSetter:
>         case GetCallee:
>+        case NewArrowFunction:
>         case NewFunction: {
>             changed |= setPrediction(SpecFunction);
>             break;
>diff --git a/Source/JavaScriptCore/dfg/DFGSafeToExecute.h b/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
>index 4d8d74b09a589639c829b64838f7ee2b0eebf386..d9df40deacdfc5f35644f764126a7935dd926fbb 100644
>--- a/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
>+++ b/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
>@@ -229,6 +229,7 @@ bool safeToExecute(AbstractStateType& state, Graph& graph, Node* node)
>     case CreateClonedArguments:
>     case GetFromArguments:
>     case PutToArguments:
>+    case NewArrowFunction:
>     case NewFunction:
>     case Jump:
>     case Branch:
>diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>index 5fa3b38a823a8b8e534c93ae8d27ffbeaeb5ebf2..eca9802f65a77d07bf8c4f766f23b5bab400c1a1 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>@@ -37,6 +37,7 @@
> #include "DFGSaneStringGetByValSlowPathGenerator.h"
> #include "DFGSlowPathGenerator.h"
> #include "DirectArguments.h"
>+#include "JSArrowFunction.h"
> #include "JSCInlines.h"
> #include "JSEnvironmentRecord.h"
> #include "JSLexicalEnvironment.h"
>@@ -4403,6 +4404,65 @@ void SpeculativeJIT::compileGetArrayLength(Node* node)
>         break;
>     } }
> }
>+    
>+void SpeculativeJIT::compileNewArrowFunction(Node* node)
>+{
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    SpeculateCellOperand scope(this, node->child1());
>+    GPRReg scopeGPR = scope.gpr();
>+
>+    SpeculateCellOperand thisValue(this, node->child2());
>+    GPRReg thisValueGPR = thisValue.gpr();
>+
>+    FunctionExecutable* executable = node->castOperand<FunctionExecutable*>();
>+
>+    if (executable->singletonFunction()->isStillValid()) {
>+        GPRFlushedCallResult result(this);
>+        GPRReg resultGPR = result.gpr();
>+
>+        flushRegisters();
>+
>+        callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueGPR);
>+        cellResult(resultGPR, node);
>+        return;
>+    }
>+
>+    Structure* structure = m_jit.graph().globalObjectFor(node->origin.semantic)->arrowFunctionStructure();
>+
>+    GPRTemporary result(this);
>+    GPRTemporary scratch1(this);
>+    GPRTemporary scratch2(this);
>+
>+    GPRReg resultGPR = result.gpr();
>+    GPRReg scratch1GPR = scratch1.gpr();
>+    GPRReg scratch2GPR = scratch2.gpr();
>+
>+    JITCompiler::JumpList slowPath;
>+    emitAllocateJSObjectWithKnownSize<JSArrowFunction>(
>+        resultGPR, TrustedImmPtr(structure), TrustedImmPtr(0),
>+        scratch1GPR, scratch2GPR, slowPath, JSArrowFunction::allocationSize(0));
>+
>+    m_jit.storePtr(
>+        scopeGPR,
>+        JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfScopeChain()));
>+    m_jit.storePtr(
>+        TrustedImmPtr(executable),
>+        JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfExecutable()));
>+    m_jit.storePtr(
>+        TrustedImmPtr(0),
>+        JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfRareData()));
>+    m_jit.storePtr(
>+        thisValueGPR,
>+        JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfThisValue()));
>+
>+    addSlowPathGenerator(
>+        slowPathCall(
>+            slowPath, this, operationNewArrowFunctionWithInvalidatedReallocationWatchpoint,
>+            resultGPR, scopeGPR, executable, thisValueGPR));
>+        
>+    cellResult(resultGPR, node);
>+#endif
>+}
> 
> void SpeculativeJIT::compileNewFunction(Node* node)
> {
>diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
>index b9e6e0dd24fdebf0c1cd7d214bfceecdffe574d9..83e3c12b3778d1f15e2e1d2c6d1a8a2361992ecf 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
>@@ -1205,6 +1205,12 @@ public:
>         m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell));
>         return appendCallWithExceptionCheckSetResult(operation, result);
>     }
>+    
>+    JITCompiler::Call callOperation(J_JITOperation_EJscCJ operation, GPRReg result, GPRReg arg1, JSCell* cell, GPRReg arg2)
>+    {
>+        m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), arg2);
>+        return appendCallWithExceptionCheckSetResult(operation, result);
>+    }
> 
>     JITCompiler::Call callOperation(V_JITOperation_EWs operation, WatchpointSet* watchpointSet)
>     {
>@@ -1611,6 +1617,11 @@ public:
>         m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell));
>         return appendCallWithExceptionCheckSetResult(operation, resultPayload, resultTag);
>     }
>+    JITCompiler::Call callOperation(J_JITOperation_EJscCJ operation, GPRReg resultTag, GPRReg resultPayload, GPRReg arg1, JSCell* cell, GPRReg arg2)
>+    {
>+        m_jit.setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), arg2);
>+        return appendCallWithExceptionCheckSetResult(operation, resultPayload, resultTag);
>+    }
>     JITCompiler::Call callOperation(J_JITOperation_ESsiCI operation, GPRReg resultTag, GPRReg resultPayload, StructureStubInfo* stubInfo, GPRReg arg1, const StringImpl* uid)
>     {
>         m_jit.setupArgumentsWithExecState(TrustedImmPtr(stubInfo), arg1, TrustedImmPtr(uid));
>@@ -2212,6 +2223,7 @@ public:
>     void compileGetByValOnFloatTypedArray(Node*, TypedArrayType);
>     void compilePutByValForFloatTypedArray(GPRReg base, GPRReg property, Node*, TypedArrayType);
>     void compileNewFunction(Node*);
>+    void compileNewArrowFunction(Node*);
>     void compileForwardVarargs(Node*);
>     void compileCreateActivation(Node*);
>     void compileCreateDirectArguments(Node*);
>diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
>index 66785b194f25b30c6d2906f0a89756a58d5c48c6..6deae6bff3576942ae95cd1b9963b0063819f520 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
>@@ -4242,7 +4242,11 @@ void SpeculativeJIT::compile(Node* node)
>         compileCreateClonedArguments(node);
>         break;
>     }
>-        
>+    
>+    case NewArrowFunction:
>+        compileNewArrowFunction(node);
>+        break;
>+            
>     case NewFunction:
>         compileNewFunction(node);
>         break;
>diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
>index 2a736be50b0ad797586eb0643bd75e33031d994b..cd151bf091006291c4e1800b3354e7c5cfb7d1e3 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
>@@ -4266,11 +4266,15 @@ void SpeculativeJIT::compile(Node* node)
>         compileCreateClonedArguments(node);
>         break;
>     }
>-        
>+
>+    case NewArrowFunction:
>+        compileNewArrowFunction(node);
>+        break;
>+            
>     case NewFunction:
>         compileNewFunction(node);
>         break;
>-        
>+
>     case In:
>         compileIn(node);
>         break;
>diff --git a/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp b/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp
>index 28646d13fcf4c965c620d00211b0dcbf03b37c2d..7333a8360c719c984e0e8953fe71c097536b8fa5 100644
>--- a/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp
>@@ -130,7 +130,9 @@ public:
>                 case NewRegexp:
>                     registerStructure(m_graph.globalObjectFor(node->origin.semantic)->regExpStructure());
>                     break;
>-                    
>+                case NewArrowFunction:
>+                    registerStructure(m_graph.globalObjectFor(node->origin.semantic)->arrowFunctionStructure());
>+                    break;
>                 case NewFunction:
>                     registerStructure(m_graph.globalObjectFor(node->origin.semantic)->functionStructure());
>                     break;
>diff --git a/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp b/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp
>index e416fdaafee2229f653b9ae06248000999875a00..3c3864ca180aa36e4808c23a1306be28e5d7b901 100644
>--- a/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp
>@@ -30,6 +30,7 @@
> 
> #include "DirectArguments.h"
> #include "GetterSetter.h"
>+#include "JSArrowFunction.h"
> #include "JSEnvironmentRecord.h"
> #include "JSPropertyNameEnumerator.h"
> #include "JSScope.h"
>diff --git a/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h b/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h
>index 912754dfc40152b0ed24836ac75b8f96984399bb..eeb208be1f46cfc42b9495a9fa921fbcd6d82da7 100644
>--- a/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h
>+++ b/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h
>@@ -88,6 +88,13 @@ namespace JSC { namespace FTL {
>     macro(Structure_globalObject, Structure::globalObjectOffset()) \
>     macro(Structure_prototype, Structure::prototypeOffset()) \
>     macro(Structure_structureID, Structure::structureIDOffset())
>+    
>+#define FOR_EACH_ABSTRACT_FIELD_ARROWFUNCTION(macro) \
>+    macro(JSArrowFunction_executable, JSArrowFunction::offsetOfExecutable()) \
>+    macro(JSArrowFunction_scope, JSArrowFunction::offsetOfScopeChain()) \
>+    macro(JSArrowFunction_rareData, JSArrowFunction::offsetOfRareData()) \
>+    macro(JSArrowFunction_this, JSArrowFunction::offsetOfThisValue())
>+    
> 
> #define FOR_EACH_INDEXED_ABSTRACT_HEAP(macro) \
>     macro(DirectArguments_storage, DirectArguments::storageOffset(), sizeof(EncodedJSValue)) \
>@@ -129,6 +136,9 @@ public:
> 
> #define ABSTRACT_FIELD_DECLARATION(name, offset) AbstractField name;
>     FOR_EACH_ABSTRACT_FIELD(ABSTRACT_FIELD_DECLARATION)
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    FOR_EACH_ABSTRACT_FIELD_ARROWFUNCTION(ABSTRACT_FIELD_DECLARATION)
>+#endif
> #undef ABSTRACT_FIELD_DECLARATION
>     
>     AbstractField& JSCell_freeListNext;
>diff --git a/Source/JavaScriptCore/ftl/FTLCapabilities.cpp b/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
>index 26eca7e2c3c90c9424ee580f6c5595ec27e61461..d719981908fd68435fd79b240940b6da09bbe842 100644
>--- a/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLCapabilities.cpp
>@@ -105,6 +105,7 @@ inline CapabilityLevel canCompile(Node* node)
>     case LoopHint:
>     case SkipScope:
>     case CreateActivation:
>+    case NewArrowFunction:
>     case NewFunction:
>     case GetClosureVar:
>     case PutClosureVar:
>diff --git a/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h b/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h
>index 4b28d35625a7327c129c61a0b785730b8295263d..0a25ed0315fafdcbcb231568ed59508200b27ad4 100644
>--- a/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h
>+++ b/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h
>@@ -85,6 +85,7 @@ namespace JSC { namespace FTL {
>     macro(J_JITOperation_EJC, functionType(int64, intPtr, int64, intPtr)) \
>     macro(J_JITOperation_EJJ, functionType(int64, intPtr, int64, int64)) \
>     macro(J_JITOperation_EJscC, functionType(intPtr, intPtr, intPtr, intPtr)) \
>+    macro(J_JITOperation_EJscCJ, functionType(int64, intPtr, int64, int64, int64))\
>     macro(J_JITOperation_EJssZ, functionType(int64, intPtr, intPtr, int32)) \
>     macro(J_JITOperation_ESsiJI, functionType(int64, intPtr, intPtr, int64, intPtr)) \
>     macro(Jss_JITOperation_EZ, functionType(intPtr, intPtr, int32)) \
>diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
>index d7ac1fdb3a07545431b61102a32824e2e03621bd..0ee0bfba8faeea4c20b0249fa2e396559259a370 100644
>--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
>+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp
>@@ -43,6 +43,7 @@
> #include "FTLOutput.h"
> #include "FTLThunks.h"
> #include "FTLWeightedTarget.h"
>+#include "JSArrowFunction.h"
> #include "JSCInlines.h"
> #include "JSLexicalEnvironment.h"
> #include "OperandsInlines.h"
>@@ -613,6 +614,9 @@ private:
>         case CreateActivation:
>             compileCreateActivation();
>             break;
>+        case NewArrowFunction:
>+            compileNewArrowFunction();
>+            break;
>         case NewFunction:
>             compileNewFunction();
>             break;
>@@ -3030,6 +3034,51 @@ private:
>         setJSValue(m_out.phi(m_out.intPtr, fastResult, slowResult));
>     }
>     
>+    void compileNewArrowFunction()
>+    {
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        LValue scope = lowCell(m_node->child1());
>+        LValue thisValue = lowJSValue(m_node->child2());
>+        FunctionExecutable* executable = m_node->castOperand<FunctionExecutable*>();
>+        if (executable->singletonFunction()->isStillValid()) {
>+            LValue callResult = vmCall(
>+                m_out.operation(operationNewArrowFunction),
>+                m_callFrame, scope, weakPointer(executable), thisValue);
>+            setJSValue(callResult);
>+            return;
>+        }
>+        
>+        Structure* structure = m_graph.globalObjectFor(m_node->origin.semantic)->arrowFunctionStructure();
>+        
>+        LBasicBlock slowPath = FTL_NEW_BLOCK(m_out, ("NewArrowFunction slow path"));
>+        LBasicBlock continuation = FTL_NEW_BLOCK(m_out, ("NewArrowFunction continuation"));
>+        
>+        LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
>+        
>+        LValue fastObject = allocateObject<JSArrowFunction>(structure, m_out.intPtrZero, slowPath);
>+        
>+        // We don't need memory barriers since we just fast-created the function, so it
>+        // must be young.
>+        m_out.storePtr(scope, fastObject, m_heaps.JSArrowFunction_scope);
>+        m_out.storePtr(weakPointer(executable), fastObject, m_heaps.JSArrowFunction_executable);
>+        m_out.storePtr(thisValue, fastObject, m_heaps.JSArrowFunction_this);
>+        m_out.storePtr(m_out.intPtrZero, fastObject, m_heaps.JSArrowFunction_rareData);
>+        
>+        ValueFromBlock fastResult = m_out.anchor(fastObject);
>+        m_out.jump(continuation);
>+        
>+        m_out.appendTo(slowPath, continuation);
>+        LValue callResult = vmCall(
>+            m_out.operation(operationNewArrowFunctionWithInvalidatedReallocationWatchpoint),
>+            m_callFrame, scope, weakPointer(executable), thisValue);
>+        ValueFromBlock slowResult = m_out.anchor(callResult);
>+        m_out.jump(continuation);
>+        
>+        m_out.appendTo(continuation, lastNext);
>+        setJSValue(m_out.phi(m_out.intPtr, fastResult, slowResult));
>+#endif
>+    }
>+    
>     void compileCreateDirectArguments()
>     {
>         // FIXME: A more effective way of dealing with the argument count and callee is to have
>diff --git a/Source/JavaScriptCore/interpreter/Interpreter.cpp b/Source/JavaScriptCore/interpreter/Interpreter.cpp
>index 17dd3b4f45f56ff20023d73b75dc7d70b634968f..20005c071533b1683afda2d62dc65c0167d91094 100644
>--- a/Source/JavaScriptCore/interpreter/Interpreter.cpp
>+++ b/Source/JavaScriptCore/interpreter/Interpreter.cpp
>@@ -44,6 +44,7 @@
> #include "ExceptionHelpers.h"
> #include "GetterSetter.h"
> #include "JSArray.h"
>+#include "JSArrowFunction.h"
> #include "JSBoundFunction.h"
> #include "JSCInlines.h"
> #include "JSLexicalEnvironment.h"
>diff --git a/Source/JavaScriptCore/jit/CCallHelpers.h b/Source/JavaScriptCore/jit/CCallHelpers.h
>index fd344adbcabb15fbd814ed6fbd478f74b615763c..07acd6d532d328afdb77acf2013390ef39dd9d67 100644
>--- a/Source/JavaScriptCore/jit/CCallHelpers.h
>+++ b/Source/JavaScriptCore/jit/CCallHelpers.h
>@@ -274,6 +274,15 @@ public:
>         addCallArgument(arg2);
>         addCallArgument(arg3);
>     }
>+    
>+    ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3)
>+    {
>+        resetCallArguments();
>+        addCallArgument(GPRInfo::callFrameRegister);
>+        addCallArgument(arg1);
>+        addCallArgument(arg2);
>+        addCallArgument(arg3);
>+    }
> 
>     ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3)
>     {
>diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
>index b4113c45e72c7e158ec1f1923cbfe29c5ef54282..8a1bac87fd10b987f64fd0c2113210ca6705edb1 100644
>--- a/Source/JavaScriptCore/jit/JIT.cpp
>+++ b/Source/JavaScriptCore/jit/JIT.cpp
>@@ -260,6 +260,7 @@ void JIT::privateCompileMainPass()
>         DEFINE_OP(op_new_array_buffer)
>         DEFINE_OP(op_new_func)
>         DEFINE_OP(op_new_func_exp)
>+        DEFINE_OP(op_new_arrow_func_exp) 
>         DEFINE_OP(op_new_object)
>         DEFINE_OP(op_new_regexp)
>         DEFINE_OP(op_not)
>diff --git a/Source/JavaScriptCore/jit/JIT.h b/Source/JavaScriptCore/jit/JIT.h
>index d7225ea4b2ae543187844c2076ec6eb8d65d21c9..daa5209488579160bbd9c47d07b4a0459fb8b012 100644
>--- a/Source/JavaScriptCore/jit/JIT.h
>+++ b/Source/JavaScriptCore/jit/JIT.h
>@@ -521,6 +521,7 @@ namespace JSC {
>         void emit_op_new_array_buffer(Instruction*);
>         void emit_op_new_func(Instruction*);
>         void emit_op_new_func_exp(Instruction*);
>+        void emit_op_new_arrow_func_exp(Instruction*);
>         void emit_op_new_object(Instruction*);
>         void emit_op_new_regexp(Instruction*);
>         void emit_op_not(Instruction*);
>@@ -702,6 +703,7 @@ namespace JSC {
>         MacroAssembler::Call callOperation(J_JITOperation_EJJ, int, GPRReg, GPRReg);
>         MacroAssembler::Call callOperation(C_JITOperation_EJsc, GPRReg);
>         MacroAssembler::Call callOperation(J_JITOperation_EJscC, int, GPRReg, JSCell*);
>+        MacroAssembler::Call callOperation(J_JITOperation_EJscCJ, int, GPRReg, JSCell*, GPRReg);
>         MacroAssembler::Call callOperation(C_JITOperation_EJscZ, GPRReg, int32_t);
>         MacroAssembler::Call callOperation(C_JITOperation_EJscZ, int, GPRReg, int32_t);
> #if USE(JSVALUE64)
>diff --git a/Source/JavaScriptCore/jit/JITInlines.h b/Source/JavaScriptCore/jit/JITInlines.h
>index 9ee24d09228a9882ea769629d1a87b6c34a86334..a0e40c5c61fe63e9863ed223edf5d451f318a774 100644
>--- a/Source/JavaScriptCore/jit/JITInlines.h
>+++ b/Source/JavaScriptCore/jit/JITInlines.h
>@@ -271,6 +271,12 @@ ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EJscC opera
>     return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
> }
> 
>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EJscCJ operation, int dst, GPRReg arg1, JSCell* cell, GPRReg arg2)
>+{
>+    setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), arg2);
>+    return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
>+}
>+    
> ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EP operation, int dst, void* pointer)
> {
>     setupArgumentsWithExecState(TrustedImmPtr(pointer));
>diff --git a/Source/JavaScriptCore/jit/JITOpcodes.cpp b/Source/JavaScriptCore/jit/JITOpcodes.cpp
>index 5d4d0b9fe8768ac2fe596575ed4aa81220dad6c7..dce37125c4efb054a806154e0ad23adff9ea4b7c 100644
>--- a/Source/JavaScriptCore/jit/JITOpcodes.cpp
>+++ b/Source/JavaScriptCore/jit/JITOpcodes.cpp
>@@ -987,6 +987,29 @@ void JIT::emit_op_new_func_exp(Instruction* currentInstruction)
>     callOperation(operationNewFunction, dst, regT0, funcExpr);
>     done.link(this);
> }
>+    
>+void JIT::emit_op_new_arrow_func_exp(Instruction* currentInstruction)
>+{
>+    Jump notUndefinedScope;
>+    int dst = currentInstruction[1].u.operand;
>+#if USE(JSVALUE64)
>+    emitGetVirtualRegister(currentInstruction[2].u.operand, regT0);
>+    emitGetVirtualRegister(currentInstruction[4].u.operand, regT1);
>+    notUndefinedScope = branch64(NotEqual, regT0, TrustedImm64(JSValue::encode(jsUndefined())));
>+    store64(TrustedImm64(JSValue::encode(jsUndefined())), Address(callFrameRegister, sizeof(Register) * dst));
>+#else
>+    emitLoadPayload(currentInstruction[2].u.operand, regT0);
>+    emitLoadPayload(currentInstruction[4].u.operand, regT1);
>+    notUndefinedScope = branch32(NotEqual, tagFor(currentInstruction[2].u.operand), TrustedImm32(JSValue::UndefinedTag));
>+    emitStore(dst, jsUndefined());
>+#endif
>+    Jump done = jump();
>+    notUndefinedScope.link(this);
>+    
>+    FunctionExecutable* function = m_codeBlock->functionExpr(currentInstruction[3].u.operand);
>+    callOperation(operationNewArrowFunction, dst, regT0, function, regT1);
>+    done.link(this);
>+}
> 
> void JIT::emit_op_new_array(Instruction* currentInstruction)
> {
>diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp
>index 98d8773f38d95f2b8e58cdbd7836029815400713..d2eda9b8adb1acadaaa0fd70d87c4770505c1bce 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.cpp
>+++ b/Source/JavaScriptCore/jit/JITOperations.cpp
>@@ -42,6 +42,7 @@
> #include "HostCallReturnValue.h"
> #include "JIT.h"
> #include "JITToDFGDeferredCompilationCallback.h"
>+#include "JSArrowFunction.h"
> #include "JSCInlines.h"
> #include "JSCatchScope.h"
> #include "JSFunctionNameScope.h"
>@@ -976,6 +977,39 @@ EncodedJSValue JIT_OPERATION operationNewFunctionWithInvalidatedReallocationWatc
>     return JSValue::encode(JSFunction::createWithInvalidatedReallocationWatchpoint(vm, static_cast<FunctionExecutable*>(functionExecutable), scope));
> }
> 
>+EncodedJSValue JIT_OPERATION operationNewArrowFunctionWithInvalidatedReallocationWatchpoint(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue)
>+{
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        ASSERT(functionExecutable->inherits(FunctionExecutable::info()));
>+        VM& vm = exec->vm();
>+        NativeCallFrameTracer tracer(&vm, exec);
>+        
>+        JSFunction* func =  JSFunction::create(vm, static_cast<FunctionExecutable*>(functionExecutable), scope);
>+        JSGlobalObject* globalObject = exec->callee()->globalObject();
>+        
>+        return JSValue::encode(JSArrowFunction::createWithInvalidatedReallocationWatchpoint(vm, globalObject, func, JSValue::decode(thisValue)));
>+#else
>+        return JSValue::encode(jsUndefined());
>+#endif
>+}
>+    
>+EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue)
>+{
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ASSERT(functionExecutable->inherits(FunctionExecutable::info()));
>+    VM& vm = exec->vm();
>+    NativeCallFrameTracer tracer(&vm, exec);
>+
>+    JSGlobalObject* globalObject = exec->callee()->globalObject();
>+    JSFunction* func =  JSFunction::create(vm, static_cast<FunctionExecutable*>(functionExecutable), scope);
>+
>+    return JSValue::encode(JSArrowFunction::create(vm, globalObject, func, JSValue::decode(thisValue)));
>+
>+#else
>+    return JSValue::encode(jsUndefined());
>+#endif
>+}
>+
> JSCell* JIT_OPERATION operationNewObject(ExecState* exec, Structure* structure)
> {
>     VM* vm = &exec->vm();
>diff --git a/Source/JavaScriptCore/jit/JITOperations.h b/Source/JavaScriptCore/jit/JITOperations.h
>index 4c81d8547c8cf6706f08df0617cd9a91688ef965..511fc776e383ca22512bd841debcaa63449e7242 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.h
>+++ b/Source/JavaScriptCore/jit/JITOperations.h
>@@ -116,6 +116,7 @@ typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPP)(ExecState*, void*, vo
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPS)(ExecState*, void*, size_t);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPc)(ExecState*, Instruction*);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EJscC)(ExecState*, JSScope*, JSCell*);
>+typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EJscCJ)(ExecState*, JSScope*, JSCell*, EncodedJSValue);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESS)(ExecState*, size_t, size_t);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESsiCI)(ExecState*, StructureStubInfo*, JSCell*, StringImpl*);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESsiJI)(ExecState*, StructureStubInfo*, EncodedJSValue, StringImpl*);
>@@ -283,6 +284,8 @@ EncodedJSValue JIT_OPERATION operationNewArrayBufferWithProfile(ExecState*, Arra
> EncodedJSValue JIT_OPERATION operationNewArrayWithSizeAndProfile(ExecState*, ArrayAllocationProfile*, EncodedJSValue size) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewFunction(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
>+EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState*, JSScope*, JSCell*, EncodedJSValue) WTF_INTERNAL;
>+EncodedJSValue JIT_OPERATION operationNewArrowFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*, EncodedJSValue) WTF_INTERNAL;
> JSCell* JIT_OPERATION operationNewObject(ExecState*, Structure*) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewRegexp(ExecState*, void*) WTF_INTERNAL;
> void JIT_OPERATION operationHandleWatchdogTimer(ExecState*) WTF_INTERNAL;
>diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>index 20bebf32f6154fa9f3f46962f3a6140a2e846dc0..7a8505f28fec2cae2c65385cc094bcdfcc24afd8 100644
>--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>@@ -38,6 +38,8 @@
> #include "Interpreter.h"
> #include "JIT.h"
> #include "JITExceptions.h"
>+#include "JSArrowFunction.h"
>+#include "JSBoundFunction.h"
> #include "JSLexicalEnvironment.h"
> #include "JSCInlines.h"
> #include "JSCJSValue.h"
>@@ -171,6 +173,15 @@ namespace JSC { namespace LLInt {
>         LLINT_RETURN_TWO(pc, __rcf_exec);                               \
>     } while (false)
> 
>+    
>+#define LLINT_CALC_PROPERTY_FOR_FUNC_EXPR()                                     \
>+    LLINT_BEGIN();                                                              \
>+    CodeBlock* codeBlock = exec->codeBlock();                                   \
>+    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();       \
>+    FunctionExecutable* executable = codeBlock->functionExpr(pc[3].u.operand);  \
>+    
>+enum FunctionExpressionType { ArrowFunctionExpressionType, CommonFunctionExpressionType};
>+    
> extern "C" SlowPathReturnType llint_trace_operand(ExecState* exec, Instruction* pc, int fromWhere, int operand)
> {
>     LLINT_BEGIN();
>@@ -1003,16 +1014,33 @@ LLINT_SLOW_PATH_DECL(slow_path_new_func)
> #endif
>     LLINT_RETURN(JSFunction::create(vm, codeBlock->functionDecl(pc[3].u.operand), scope));
> }
>-
>+    
> LLINT_SLOW_PATH_DECL(slow_path_new_func_exp)
> {
>-    LLINT_BEGIN();
>-    CodeBlock* codeBlock = exec->codeBlock();
>-    JSScope* scope = exec->uncheckedR(pc[2].u.operand).Register::scope();
>-    FunctionExecutable* function = codeBlock->functionExpr(pc[3].u.operand);
>-    JSFunction* func = JSFunction::create(vm, function, scope);
>+    LLINT_CALC_PROPERTY_FOR_FUNC_EXPR();
>+
>+    JSFunction* func = JSFunction::create(vm, executable, scope);
>+    LLINT_RETURN(func);
>+}
>+
>+
>+LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp)
>+{
>+    LLINT_CALC_PROPERTY_FOR_FUNC_EXPR();
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    JSValue thisValue = LLINT_OP_C(4).jsValue();
>+    JSGlobalObject* globalObject = exec->callee()->globalObject();
>     
>+    JSFunction* func = JSFunction::create(vm, executable, scope);
>+    
>+    const String funcWithoutName = "";
>+    
>+    LLINT_RETURN(JSArrowFunction::create(vm, globalObject, func, thisValue));
>+#else
>+    JSFunction* func = JSFunction::create(vm, executable, scope);
>     LLINT_RETURN(func);
>+#endif
> }
> 
> static SlowPathReturnType handleHostCall(ExecState* execCallee, Instruction* pc, JSValue callee, CodeSpecializationKind kind)
>diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.h b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>index 4bf7deb0fa0b6c6438e36f96320e2f669739af64..c7fab9691c18b93956d0ea29f33956118c5e71ee 100644
>--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>@@ -96,6 +96,7 @@ LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_char);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_string);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func_exp);
>+LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_arrow_func_exp);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_construct);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_size_frame_for_varargs);
>diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>index 543d9e9333c513e97617b7bda7f699866838a1e0..182bbd9e4ef78928da52fbcec882a5df36db7941 100644
>--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>@@ -1169,6 +1169,10 @@ _llint_op_new_func_exp:
>     callSlowPath(_llint_slow_path_new_func_exp)
>     dispatch(4)
> 
>+_llint_op_new_arrow_func_exp:
>+    traceExecution()
>+    callSlowPath(_llint_slow_path_new_arrow_func_exp)
>+    dispatch(5)
> 
> _llint_op_call:
>     traceExecution()
>diff --git a/Source/JavaScriptCore/parser/ASTBuilder.h b/Source/JavaScriptCore/parser/ASTBuilder.h
>index ef319a185ec6881d98022be0e772d050f1877269..729961255b36d41ac114df8e673bbbfd655a3290 100644
>--- a/Source/JavaScriptCore/parser/ASTBuilder.h
>+++ b/Source/JavaScriptCore/parser/ASTBuilder.h
>@@ -357,6 +357,19 @@ public:
>             inStrictContext, constructorKind);
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info)
>+    {
>+        SourceCode source = info.functionBodyType == ArrowFunctionBodyExpression
>+        ? m_sourceCode->subArrowExpression(info.arrowFunctionOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn)
>+        : m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn);
>+
>+        ArrowFuncExprNode* result = new (m_parserArena) ArrowFuncExprNode(location, *info.name, info.body, source, info.parameters);
>+        info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
>+        return result;
>+    }
>+#endif
>+
>     NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool,
>         const Identifier* name, const ParserFunctionInfo<ASTBuilder>& info, SuperBinding superBinding)
>     {
>diff --git a/Source/JavaScriptCore/parser/NodeConstructors.h b/Source/JavaScriptCore/parser/NodeConstructors.h
>index d4b335587064444924e46552419af0b5ede9d25b..4fef1cad7c9ed7c4c4b63eb5ca126d80494d3567 100644
>--- a/Source/JavaScriptCore/parser/NodeConstructors.h
>+++ b/Source/JavaScriptCore/parser/NodeConstructors.h
>@@ -836,6 +836,13 @@ namespace JSC {
>         m_body->finishParsing(source, parameter, ident, FunctionExpression);
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    inline ArrowFuncExprNode::ArrowFuncExprNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source, ParameterNode* parameter)
>+        : FuncExprNode(location, ident, body, source, parameter)
>+    {
>+    }
>+#endif
>+    
>     inline FuncDeclNode::FuncDeclNode(const JSTokenLocation& location, const Identifier& ident, FunctionBodyNode* body, const SourceCode& source, ParameterNode* parameter)
>         : StatementNode(location)
>         , m_body(body)
>diff --git a/Source/JavaScriptCore/parser/Nodes.h b/Source/JavaScriptCore/parser/Nodes.h
>index d2cf2ee4f392c12ac2653c2f082fdc44e880aaae..b69c584f619393b38cc0ec3b69d4476b38fbbbf1 100644
>--- a/Source/JavaScriptCore/parser/Nodes.h
>+++ b/Source/JavaScriptCore/parser/Nodes.h
>@@ -158,6 +158,9 @@ namespace JSC {
>         virtual bool isDotAccessorNode() const { return false; }
>         virtual bool isDeconstructionNode() const { return false; }
>         virtual bool isFuncExprNode() const { return false; }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        virtual bool isArrowFuncExprNode() const { return false; }
>+#endif
>         virtual bool isCommaNode() const { return false; }
>         virtual bool isSimpleArray() const { return false; }
>         virtual bool isAdd() const { return false; }
>@@ -1727,6 +1730,19 @@ namespace JSC {
>         FunctionBodyNode* m_body;
>     };
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    class ArrowFuncExprNode : public FuncExprNode {
>+    public:
>+        ArrowFuncExprNode(const JSTokenLocation&, const Identifier&, FunctionBodyNode*, const SourceCode&, ParameterNode* = 0);
>+    private:
>+        virtual RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) override;
>+        
>+        virtual bool isFuncExprNode() const override { return false; }
>+        
>+        virtual bool isArrowFuncExprNode() const override { return true; }
>+    };
>+#endif
>+
> #if ENABLE(ES6_CLASS_SYNTAX)
>     class ClassExprNode final : public ExpressionNode {
>     public:
>diff --git a/Source/JavaScriptCore/runtime/JSArrowFunction.cpp b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..a0271960397ab7d995248b12f295ab7e3ae6d334
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>@@ -0,0 +1,119 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+
>+#include "Error.h"
>+#include "ExceptionHelpers.h"
>+#include "JSCInlines.h"
>+#include "JSCJSValue.h"
>+#include "JSFunction.h"
>+#include "JSFunctionInlines.h"
>+#include "JSObject.h"
>+#include "PropertySlot.h"
>+#include "VM.h"
>+
>+namespace JSC {
>+    
>+const ClassInfo JSArrowFunction::s_info = { "ArrowFunction", &Base::s_info, 0, CREATE_METHOD_TABLE(JSArrowFunction) };
>+
>+EncodedJSValue JSC_HOST_CALL arrowFunctionCall(ExecState* exec)
>+{
>+    JSArrowFunction* arrowFunction = jsCast<JSArrowFunction*>(exec->callee());
>+        
>+    MarkedArgumentBuffer args;
>+    for (unsigned i = 0; i < exec->argumentCount(); ++i)
>+        args.append(exec->uncheckedArgument(i));
>+    
>+    JSObject* function = arrowFunction->arrowFunction();
>+    CallData callData;
>+    CallType callType = getCallData(function, callData);
>+    ASSERT(callType != CallTypeNone);
>+    return JSValue::encode(call(exec, function, callType, callData, arrowFunction->boundThis(), args));
>+}
>+    
>+void JSArrowFunction::destroy(JSCell* cell)
>+{
>+    static_cast<JSArrowFunction*>(cell)->JSArrowFunction::~JSArrowFunction();
>+}
>+    
>+JSArrowFunction::JSArrowFunction(VM& vm, JSGlobalObject* globalObject, Structure* structure, JSObject* arrowFunction, JSValue boundThis)
>+    : Base(vm, globalObject, structure)
>+    , m_boundThis(vm, this, boundThis)
>+    , m_arrowFunction(vm, this, arrowFunction)
>+{
>+}
>+
>+JSArrowFunction* JSArrowFunction::createWithInvalidatedReallocationWatchpoint(VM& vm, JSGlobalObject* globalObject, JSObject* arrowFunction, JSValue boundThis)
>+{
>+    ASSERT(jsCast<JSFunction*>(arrowFunction)->jsExecutable()->singletonFunction()->hasBeenInvalidated());
>+    return create(vm, globalObject, arrowFunction, boundThis);
>+}
>+
>+JSArrowFunction* JSArrowFunction::create(VM& vm, JSGlobalObject* globalObject, JSObject* arrowFunction, JSValue boundThis)
>+{
>+    NativeExecutable* executable = vm.getHostFunction(arrowFunctionCall, callHostFunctionAsConstructor);
>+    JSArrowFunction* function = new (NotNull, allocateCell<JSArrowFunction>(vm.heap)) JSArrowFunction(vm, globalObject, globalObject->arrowFunctionStructure(), arrowFunction, boundThis);
>+    function->finishCreation(vm, executable, 0, "");
>+
>+    return function;
>+}
>+    
>+void JSArrowFunction::finishCreation(VM& vm, NativeExecutable* executable, int length, const String& name)
>+{
>+    Base::finishCreation(vm, executable, length, name);
>+    ASSERT(inherits(info()));
>+    
>+    // Prototype of arrow function is undefined
>+    putDirect(vm, vm.propertyNames->prototype, jsUndefined(), DontDelete | ReadOnly | DontEnum);
>+    putDirect(vm, vm.propertyNames->thisIdentifier, boundThis(), DontDelete | ReadOnly | DontEnum);
>+}
>+
>+    
>+void JSArrowFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
>+{
>+    JSArrowFunction* thisObject = jsCast<JSArrowFunction*>(cell);
>+    ASSERT_GC_OBJECT_INHERITS(thisObject, info());
>+    Base::visitChildren(thisObject, visitor);
>+
>+    // Fixme: m_arrowFunction already removed by GC, because it created in before run JSArrowFunction::create method
>+    // It is possible case when m_arrowFunction is removed but wrapper object is still exists
>+    //  visitor.append(&thisObject->m_arrowFunction);
>+    
>+    visitor.append(&thisObject->m_boundThis);
>+}
>+    
>+ConstructType JSArrowFunction::getConstructData(JSCell* cell, ConstructData& constructData)
>+{
>+    JSFunction* thisObject = jsCast<JSFunction*>(cell);
>+        
>+    constructData.js.functionExecutable = thisObject->jsExecutable();
>+    constructData.js.scope = thisObject->scope();
>+    return ConstructTypeNone;
>+}
>+} // namespace JSC
>+#endif
>diff --git a/Source/JavaScriptCore/runtime/JSArrowFunction.h b/Source/JavaScriptCore/runtime/JSArrowFunction.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..e97bc1a5fbdf6f8b7ac76dfef009e9eeef79f8f3
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.h
>@@ -0,0 +1,88 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef JSArrowFunction_h
>+#define JSArrowFunction_h
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+
>+#include "JSFunction.h"
>+#include "JSGlobalObject.h"
>+
>+namespace JSC {
>+
>+EncodedJSValue JSC_HOST_CALL arrowFunctionCall(ExecState*);
>+    
>+class JSArrowFunction : public JSFunction {
>+public:
>+    typedef JSFunction Base;
>+
>+    static JSArrowFunction* create(VM&, JSGlobalObject*, JSObject*, JSValue);
>+    static JSArrowFunction* createWithInvalidatedReallocationWatchpoint(VM&, JSGlobalObject*, JSObject*, JSValue);
>+
>+    static void destroy(JSCell*);
>+    
>+    static size_t allocationSize(size_t inlineCapacity)
>+    {
>+        ASSERT_UNUSED(inlineCapacity, !inlineCapacity);
>+        return sizeof(JSArrowFunction);
>+    }
>+    
>+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
>+    {
>+        ASSERT(globalObject);
>+        return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info());
>+    }
>+        
>+    static ConstructType getConstructData(JSCell*, ConstructData&);
>+
>+    JSObject* arrowFunction() { return m_arrowFunction.get(); }
>+    JSValue boundThis() { return m_boundThis.get(); }
>+    
>+    DECLARE_INFO;
>+    
>+    static inline ptrdiff_t offsetOfThisValue()
>+    {
>+        return OBJECT_OFFSETOF(JSArrowFunction, m_boundThis);
>+    }
>+    
>+    const static unsigned StructureFlags = OverridesHasInstance | Base::StructureFlags;
>+
>+protected:
>+    static void visitChildren(JSCell*, SlotVisitor&);
>+        
>+private:
>+    JSArrowFunction(VM&, JSGlobalObject*, Structure*, JSObject*, JSValue);
>+
>+    void finishCreation(VM&, NativeExecutable*, int, const String&);
>+    
>+    WriteBarrier<Unknown> m_boundThis;
>+    WriteBarrier<JSObject> m_arrowFunction;
>+};
>+    
>+} // namespace JSC
>+#endif // ES6_ARROWFUNCTION_SYNTAX
>+
>+#endif // JSArrowFunction_h
>diff --git a/Source/JavaScriptCore/runtime/JSFunction.h b/Source/JavaScriptCore/runtime/JSFunction.h
>index 86dff12f8fa47a31a33a6894087ce5c115ce52b6..8f1d616ae0bd714f43cb8f88aad5b74f2ecb77fc 100644
>--- a/Source/JavaScriptCore/runtime/JSFunction.h
>+++ b/Source/JavaScriptCore/runtime/JSFunction.h
>@@ -137,6 +137,9 @@ public:
> protected:
>     JS_EXPORT_PRIVATE JSFunction(VM&, JSGlobalObject*, Structure*);
>     JSFunction(VM&, FunctionExecutable*, JSScope*);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    JSFunction(VM&, FunctionExecutable*, JSScope*, Structure*);
>+#endif
> 
>     void finishCreation(VM&, NativeExecutable*, int length, const String& name);
>     using Base::finishCreation;
>diff --git a/Source/JavaScriptCore/runtime/JSFunctionInlines.h b/Source/JavaScriptCore/runtime/JSFunctionInlines.h
>index f6c6d58ec6e5c1164cb27fa5e41618b4b8142f02..38506cc199a008ff8f96adf689be3609875dea5a 100644
>--- a/Source/JavaScriptCore/runtime/JSFunctionInlines.h
>+++ b/Source/JavaScriptCore/runtime/JSFunctionInlines.h
>@@ -45,6 +45,15 @@ inline JSFunction::JSFunction(VM& vm, FunctionExecutable* executable, JSScope* s
> {
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+inline JSFunction::JSFunction(VM& vm, FunctionExecutable* executable, JSScope* scope, Structure* structure)
>+    : Base(vm, scope, structure)
>+    , m_executable(vm, this, executable)
>+    , m_rareData()
>+{
>+}
>+#endif
>+    
> inline FunctionExecutable* JSFunction::jsExecutable() const
> {
>     ASSERT(!isHostFunctionNonInline());
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>index 7d06fa600ea205e571950b4cb83c7bebf58e9b05..cc001f8a61a3ec2c7d6f5c045ad6598d1e229146 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>@@ -58,6 +58,7 @@
> #include "JSArrayBufferConstructor.h"
> #include "JSArrayBufferPrototype.h"
> #include "JSArrayIterator.h"
>+#include "JSArrowFunction.h"
> #include "JSBoundFunction.h"
> #include "JSCInlines.h"
> #include "JSCallbackConstructor.h"
>@@ -234,6 +235,9 @@ void JSGlobalObject::init(VM& vm)
>     exec->setCallee(m_globalCallee.get());
> 
>     m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    m_arrowFunctionStructure.set(vm, this, JSArrowFunction::createStructure(vm, this, m_functionPrototype.get()));
>+#endif
>     m_boundFunctionStructure.set(vm, this, JSBoundFunction::createStructure(vm, this, m_functionPrototype.get()));
>     m_namedFunctionStructure.set(vm, this, Structure::addPropertyTransition(vm, m_functionStructure.get(), vm.propertyNames->name, DontDelete | ReadOnly | DontEnum, m_functionNameOffset));
>     m_internalFunctionStructure.set(vm, this, InternalFunction::createStructure(vm, this, m_functionPrototype.get()));
>@@ -751,6 +755,7 @@ void JSGlobalObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
>     visitor.append(&thisObject->m_calleeStructure);
>     visitor.append(&thisObject->m_functionStructure);
>     visitor.append(&thisObject->m_boundFunctionStructure);
>+    visitor.append(&thisObject->m_arrowFunctionStructure);
>     visitor.append(&thisObject->m_namedFunctionStructure);
>     visitor.append(&thisObject->m_symbolObjectStructure);
>     visitor.append(&thisObject->m_regExpStructure);
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.h b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>index 47f7c2605727ca84caeccb0b3db455b88e2e95b3..453a3965e40281072e68beebaee2b522cffc2bc5 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>@@ -229,6 +229,7 @@ protected:
>     WriteBarrier<Structure> m_calleeStructure;
>     WriteBarrier<Structure> m_functionStructure;
>     WriteBarrier<Structure> m_boundFunctionStructure;
>+    WriteBarrier<Structure> m_arrowFunctionStructure;
>     WriteBarrier<Structure> m_namedFunctionStructure;
>     PropertyOffset m_functionNameOffset;
>     WriteBarrier<Structure> m_privateNameStructure;
>@@ -463,6 +464,7 @@ public:
>     Structure* calleeStructure() const { return m_calleeStructure.get(); }
>     Structure* functionStructure() const { return m_functionStructure.get(); }
>     Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
>+    Structure* arrowFunctionStructure() const { return m_arrowFunctionStructure.get(); }
>     Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(); }
>     PropertyOffset functionNameOffset() const { return m_functionNameOffset; }
>     Structure* numberObjectStructure() const { return m_numberObjectStructure.get(); }
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-associativity-2.js b/Source/JavaScriptCore/tests/stress/arrowfunction-associativity-2.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..2edd839c6bc7ed6a40effbbc8754ed1bfd806b43
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-associativity-2.js
>@@ -0,0 +1,14 @@
>+// Inspired by mozilla tests
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var s="";
>+s += x => x.name;
>+
>+// Fix me. Possible we have not use the JSBountFunction wrapper for the lexical
>+// binding of the this and use direct injection of the 'this' value
>+// into arrrow function
>+// testCase(s, "x => x.name" , "Error: wrong toString conversion.");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-bound.js b/Source/JavaScriptCore/tests/stress/arrowfunction-bound.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..a7320f4ec788ea1490afc72ec1251ee0a6e1f7b6
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-bound.js
>@@ -0,0 +1,16 @@
>+var result;
>+
>+ var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var d = {
>+  x : "bar",
>+  y : function() { return z => this.x + z; }
>+};
>+
>+var e = { x : "baz" };
>+
>+testCase(d.y().bind(e, "ley")(), "barley", "Error: function bind shouldn't change lexical binding of the arrow function");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-call.js b/Source/JavaScriptCore/tests/stress/arrowfunction-call.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..64f9aa504d70d70d68cdaa5a482a4650a45fdf7c
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-call.js
>@@ -0,0 +1,18 @@
>+var result;
>+
>+ var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var d = {
>+  x : "foo",
>+  y : function() { return () => this.x; }
>+};
>+
>+var e = { x : "bar" };
>+
>+testCase(d.y().call(e), "foo", "Error: function call shouln't change the lexical binding of the arrow function");
>+
>+testCase(d.y().apply(e), "foo", "Error: function apply shouln't change the lexical binding of the arrow function");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-constructor.js b/Source/JavaScriptCore/tests/stress/arrowfunction-constructor.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..b58b16d7b5e29744c33f786b4bf16bf44feb1e28
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-constructor.js
>@@ -0,0 +1,18 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var simpleArrowFunction = () => {};
>+
>+var errorOnCreate = false;
>+
>+try {
>+  var fc = new simpleArrowFunction();
>+}
>+catch (e) {
>+  errorOnCreate = true;
>+}
>+
>+testCase(errorOnCreate, true, "Error: No exception during run new ArrowFunction");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-arguments.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-arguments.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..1eb6763a652698165c0fdb2d8bc2073d2bcd3b1f
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-arguments.js
>@@ -0,0 +1,14 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function afCreator() {
>+    return a => arguments[0];
>+}
>+
>+var af = afCreator(12);
>+
>+//Fixme: lexical bind of the arguments is not implemented
>+//testCase(af(6), 12, "Error: arguments is not lexically binded inside of the arrow function");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-1.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-1.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..f192d1012b65d2208ab006d7f67d29e796536ac9
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-1.js
>@@ -0,0 +1,15 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function Dog(name) {
>+  this.name = name;
>+  this.getName = () => eval("this.name");
>+  this.getNameHard = () => eval("(() => this.name)()");
>+}
>+
>+var d = new Dog("Max");
>+testCase(d.getName(), d.name, "Error: this is not lexically binded inside of the arrow function #1");
>+testCase(d.getNameHard(), d.name, "Error: this is not lexically binded inside of the arrow function #2");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-2.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-2.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..26e30ed1f32960c4494a2dcaba10e3809870844f
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-2.js
>@@ -0,0 +1,31 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var afObjLexBind2 = function () {
>+  this.func = () => this;
>+};
>+
>+var afObjLexBind2Instance = new afObjLexBind2();
>+
>+testCase(afObjLexBind2Instance.func() === afObjLexBind2Instance, true, "Error: this is not lexically binded inside of the arrow function #2");
>+
>+var obj = {
>+  method: function () {
>+    return () => this;
>+  }
>+};
>+
>+testCase(obj.method()() === obj, true, "Error: this is not lexically binded inside of the arrow function #3");
>+
>+var fake = {steal: obj.method()};
>+testCase(fake.steal() === obj, true, "Error: this is not lexically binded inside of the arrow function #4");
>+
>+
>+var real = {borrow: obj.method};
>+testCase(real.borrow()() === real, true, "Error: this is not lexically binded inside of the arrow function #5");
>+testCase(real.borrow()() === real, true, "Error: this is not lexically binded inside of the arrow function #6");
>+testCase(real.borrow()() === real, true, "Error: this is not lexically binded inside of the arrow function #7");
>+testCase(real.borrow()() === real, true, "Error: this is not lexically binded inside of the arrow function #8");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-3.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-3.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..8fafefa9389da738c40e3c2cf41d82c450bbde4b
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-3.js
>@@ -0,0 +1,20 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+
>+var obj = { name:'obj', method: function () { return (value) => this.name + "-name-" + value; }};
>+
>+testCase(obj.method()('test1'), 'obj-name-test1', "Error: this is not lexically binded inside of the arrow function #1");
>+testCase(obj.method()('test2'), 'obj-name-test2', "Error: this is not lexically binded inside of the arrow function #2");
>+testCase(obj.method()('test3'), 'obj-name-test3', "Error: this is not lexically binded inside of the arrow function #3");
>+testCase(obj.method()('test4'), 'obj-name-test4', "Error: this is not lexically binded inside of the arrow function #4");
>+
>+obj.name='newObj';
>+
>+testCase(obj.method()('test1'), 'newObj-name-test1', "Error: this is not lexically binded inside of the arrow function #5");
>+testCase(obj.method()('test2'), 'newObj-name-test2', "Error: this is not lexically binded inside of the arrow function #6");
>+testCase(obj.method()('test3'), 'newObj-name-test3', "Error: this is not lexically binded inside of the arrow function #7");
>+testCase(obj.method()('test4'), 'newObj-name-test4', "Error: this is not lexically binded inside of the arrow function #8");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-4.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-4.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..6c59e75357cef2f1d87980aded46e16ae7ed08b9
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-4.js
>@@ -0,0 +1,26 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+
>+var obj = {
>+  name:'obj',
>+  internalObject: {
>+    name  :'internalObject',
>+    method: function () { return (value) => this.name + "-name-" + value; }
>+  }
>+};
>+
>+testCase(obj.internalObject.method()('test1'), 'internalObject-name-test1', "Error: this is not lexically binded inside of the arrow function #1");
>+testCase(obj.internalObject.method()('test2'), 'internalObject-name-test2', "Error: this is not lexically binded inside of the arrow function #2");
>+testCase(obj.internalObject.method()('test3'), 'internalObject-name-test3', "Error: this is not lexically binded inside of the arrow function #3");
>+testCase(obj.internalObject.method()('test4'), 'internalObject-name-test4', "Error: this is not lexically binded inside of the arrow function #4");
>+
>+obj.internalObject.name='newInternalObject';
>+
>+testCase(obj.internalObject.method()('test1'), 'newInternalObject-name-test1', "Error: this is not lexically binded inside of the arrow function #5");
>+testCase(obj.internalObject.method()('test2'), 'newInternalObject-name-test2', "Error: this is not lexically binded inside of the arrow function #6");
>+testCase(obj.internalObject.method()('test3'), 'newInternalObject-name-test3', "Error: this is not lexically binded inside of the arrow function #7");
>+testCase(obj.internalObject.method()('test4'), 'newInternalObject-name-test4', "Error: this is not lexically binded inside of the arrow function #8");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-5.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-5.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..74139277c171148cb9f7f867ad5910a0b8ebf2c6
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexical-this-5.js
>@@ -0,0 +1,53 @@
>+var sortedValues;
>+
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+
>+var obj = {
>+  arr: [1, 4, 6, 3, 7, 0],
>+  bubbleSort: function () {
>+    return () => {
>+      var tmp;
>+      var ar = this.arr.slice();
>+      var _length = ar.length
>+      for (var i = 0; i < _length; i++) {
>+        for (var j = i; j > 0; j--) {
>+          if ((ar[j] - ar[j - 1]) < 0) {
>+            tmp = ar[j];
>+            ar[j] = ar[j - 1];
>+            ar[j - 1] = tmp;
>+          }
>+        }
>+      }
>+      return ar;
>+    }
>+  }
>+};
>+
>+obj.arr = [1, 2, 4, 6, 3, 7, 0];
>+
>+testCase(obj.bubbleSort()().length, 7, "Error: this is not lexically binded inside of the arrow function #1");
>+testCase(obj.bubbleSort()().length, 7, "Error: this is not lexically binded inside of the arrow function #2");
>+testCase(obj.bubbleSort()().length, 7, "Error: this is not lexically binded inside of the arrow function #3");
>+testCase(obj.bubbleSort()().length, 7, "Error: this is not lexically binded inside of the arrow function #4");
>+testCase(obj.bubbleSort()().length, 7, "Error: this is not lexically binded inside of the arrow function #5");
>+
>+var sortedValues = obj.bubbleSort()();
>+testCase(sortedValues[0], 0, "Error: this is not lexically binded inside of the arrow function #6");
>+testCase(sortedValues[6], 7, "Error: this is not lexically binded inside of the arrow function #7");
>+
>+
>+obj.arr = [1, 2, 4, 6, 5, 8, 21, 19, 0];
>+
>+testCase(obj.bubbleSort()().length, 9, "Error: this is not lexically binded inside of the arrow function #8");
>+testCase(obj.bubbleSort()().length, 9, "Error: this is not lexically binded inside of the arrow function #9");
>+testCase(obj.bubbleSort()().length, 9, "Error: this is not lexically binded inside of the arrow function #10");
>+testCase(obj.bubbleSort()().length, 9, "Error: this is not lexically binded inside of the arrow function #11");
>+
>+sortedValues = obj.bubbleSort()();
>+testCase(sortedValues[1], 1, "Error: this is not lexically binded inside of the arrow function #12");
>+testCase(sortedValues[8], 21, "Error: this is not lexically binded inside of the arrow function #13");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-others.js b/Source/JavaScriptCore/tests/stress/arrowfunction-others.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..feba11f3022e34a8000a570076db1a55a4a32b21
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-others.js
>@@ -0,0 +1,13 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var simpleArrowFunction = () => {};
>+
>+testCase(Object.getPrototypeOf(simpleArrowFunction), Function.prototype, "Error: Not correct getPrototypeOf value for arrow function");
>+
>+testCase(simpleArrowFunction instanceof Function, true, "Error: Not correct result for instanceof method for arrow function");
>+
>+testCase(simpleArrowFunction.constructor == Function, true, "Error: Not correct result for constructor method of arrow function");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-1.js b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-1.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..07a1f0a49cb16863c5921361f0adb1e14ec9b65a
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-1.js
>@@ -0,0 +1,24 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function run(count) {
>+  var result = true;
>+  for(var i=0; i<count; i++) {
>+    var Obj = function (name) {
>+      this.name = name;
>+      this.getName = () => this.name;
>+    };
>+
>+    var obj = new Obj("Item" + i);
>+    if (obj.name !== obj.getName()) {
>+      result = false;
>+    }
>+  }
>+  return result;
>+}
>+
>+testCase(run(1), true, "Error: Error: during execution of arrow function one time");
>+testCase(run(10), true, "Error: Error: during execution of arrow function 10 times");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-2.js b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-2.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..5ddcdb3c70a1b27c3dbb52380955f5353d767425
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10-2.js
>@@ -0,0 +1,25 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function run(count) {
>+  var result = true;
>+  for(var i=0; i<count; i++) {
>+    var Obj = function (name) {
>+      this.name = name;
>+      this.getName = () => eval("this.name");;
>+    };
>+
>+
>+    var obj = new Obj("Item" + i);
>+    if (obj.name !== obj.getName()) {
>+      result = false;
>+    }
>+  }
>+  return result;
>+}
>+
>+testCase(run(1), true, "Error: during execution of arrow function one time");
>+testCase(run(10), true, "Error: during execution of arrow function 10 times");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-1.js b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-1.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..0e5f6bc86bd31451b01ca27d0b9720b57e8d6051
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-1.js
>@@ -0,0 +1,23 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function run(count) {
>+  var result = true;
>+  for(var i=0; i<count; i++) {
>+    var Obj = function (name) {
>+      this.name = name;
>+      this.getName = () => this.name;
>+    };
>+
>+    var obj = new Obj("Item" + i);
>+    if (obj.name !== obj.getName()) {
>+      result = false;
>+    }
>+  }
>+  return result;
>+}
>+
>+testCase(run(10000), true, "Error: Error: during execution of arrow function 10000 times");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-2.js b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-2.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..9530f2c1d5a7f55ce46b8be69908b4bc21e0527b
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-run-10000-2.js
>@@ -0,0 +1,23 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+function run(count) {
>+  var result = true;
>+  for(var i=0; i<count; i++) {
>+    var Obj = function (name) {
>+      this.name = name;
>+      this.getName = () => eval("this.name");;
>+    };
>+
>+    var obj = new Obj("Item" + i);
>+    if (obj.name !== obj.getName()) {
>+      result = false;
>+    }
>+  }
>+  return result;
>+}
>+
>+testCase(run(10000), true, "Error: Error: during execution of arrow function 10000 times");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js b/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..e9d35cdea4baf667431af8abe8dadf22d04b90e1
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-tdz.js
>@@ -0,0 +1,24 @@
>+var A = class A { };
>+var B = class B extends A {
>+  constructor(accessThisBeforeSuper) {
>+    if (accessThisBeforeSuper) {
>+      var f = () => this;
>+      super();
>+    } else {
>+      super();
>+    }
>+  }
>+};
>+
>+var exception = null;
>+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);
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js b/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..ef2a7f54476aba9c28923c35f1db3c4327ac9469
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-typeof.js
>@@ -0,0 +1,21 @@
>+var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var af1 = () => {};
>+var af2 = (a) => {a + 1};
>+
>+testCase(typeof af1, "function", "Error: Not correct type of the arrow function #1");
>+testCase(typeof af1.prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function #1");
>+
>+testCase(typeof af2, "function", "Error: Not correct type of the arrow function #2");
>+testCase(typeof af2.prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function #2");
>+
>+testCase(typeof (()=>{}), "function", "Error: Not correct type of the arrow function #3");
>+testCase(typeof (()=>{}).prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function #3");
>+
>+
>+testCase(typeof ((b) => {b + 1}), "function", "Error: Not correct type of the arrow function #4");
>+testCase(typeof ((b) => {b + 1}).prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function #4");

Actions: View | Formatted Diff | Diff

Attachments on bug 144956: 253042 | 253045 | 253049 | 255641 | 255849 | 255850 | 255856 | 255895 | 255905 | 255906 | 255909 | 255910 | 255912 | 255913 | 255914 | 255954 | 255960 | 255961 | 255995 | 256000 | 256001 | 256002 | 256003 | 256121 | 256240 | 256242 | 256327 | 256364 | 256376 | 256828 | 256831 | 257253 | 257272 | 257275 | 257297 | 257377 | 257437 | 257444 | 257453 | 257559 | 257560 | 257561 | 257562 | 257585 | 257750 | 257753 | 257755 | 257756 | 257762 | 257921 | 257923 | 257924 | 257930 | 257956 | 258372 | 258377 | 258381 | 258384 | 258495 | 258505 | 258572 | 258594 | 258595 | 258821 | 258822 | 258823 | 259000 | 259002 | 259003 | 259028 | 259036 | 259045 | 259063 | 259064 | 259066 | 259071 | 259104 | 259170 | 259181