Attachment 255909 Details for Bug 144956 – Patch

[patch] Patch

bug-144956-20150701111250.patch (text/plain), 104.84 KB, created by GSkachkov on 2015-07-01 01:13:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: GSkachkov

Created: 2015-07-01 01:13:19 PDT

Size: 104.84 KB

patch

obsolete

>Subversion Revision: 186047
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index e51e6659f0eaf3fff2472fd57ea836dcc78caa44..2e7eb84c170ab2cfb9c9105021950ae5cbb84c02 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,138 @@
>+2015-06-26 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:
>+this - variable this is point to the this of the function where arrow function is declared
>+constructor - the using of the command new for arrow function leads to runtime error.
>+
>+        * jsc.cpp:
>+        (functionHasBasicBlockExecuted):
>+        * CMakeLists.txt:
>+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
>+        * JavaScriptCore.xcodeproj/project.pbxproj:
>+        * bytecode/BytecodeList.json:
>+        * bytecode/BytecodeUseDef.h:
>+        (JSC::computeUsesForBytecodeOffset):
>+        (JSC::computeDefsForBytecodeOffset):
>+        * bytecode/CodeBlock.cpp:
>+        (JSC::CodeBlock::dumpBytecode):
>+        * bytecompiler/BytecodeGenerator.cpp:
>+        (JSC::BytecodeGenerator::emitNewArrowFunctionExpression):
>+        * bytecompiler/BytecodeGenerator.h:
>+        * bytecompiler/NodesCodegen.cpp:
>+        (JSC::ArrowFuncExprNode::emitBytecode):
>+        * 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.cpp:
>+        (JSC::DFG::SpeculativeJIT::compileNewArrowFunction):
>+        * 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::DFG::LowerDFGToLLVM::compileNode):
>+        (JSC::FTL::DFG::LowerDFGToLLVM::compileNewArrowFunction):
>+        * interpreter/Interpreter.cpp:
>+        * jit/JIT.cpp:
>+        (JSC::JIT::privateCompileMainPass):
>+        * jit/JIT.h:
>+        * jit/JITInlines.h:
>+        (JSC::JIT::callOperation):
>+        * jit/JITOpcodes.cpp:
>+        (JSC::JIT::emit_op_new_arrow_func_exp):
>+        * jit/JITOperations.cpp:
>+        * jit/JITOperations.h:
>+        * llint/LLIntSlowPaths.cpp:
>+        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
>+        * llint/LLIntSlowPaths.h:
>+        * llint/LowLevelInterpreter.asm:
>+        * parser/ASTBuilder.h:
>+        (JSC::ASTBuilder::createArrowFunctionExpr):
>+        * parser/NodeConstructors.h:
>+        (JSC::ArrowFuncExprNode::ArrowFuncExprNode):
>+        * parser/Nodes.h:
>+        (JSC::ExpressionNode::isArrowFuncExprNode):
>+        * runtime/FunctionPrototype.cpp:
>+        * runtime/JSArrowFunction.cpp: Added.
>+        (JSC::arrowFunctionCall):
>+        (JSC::JSArrowFunction::destroy):
>+        (JSC::JSArrowFunction::JSArrowFunction):
>+        (JSC::JSArrowFunction::createWithInvalidatedReallocationWatchpoint):
>+        (JSC::JSArrowFunction::create):
>+        (JSC::JSArrowFunction::finishCreation):
>+        (JSC::JSArrowFunction::visitChildren):
>+        (JSC::JSArrowFunction::getConstructData):
>+        * runtime/JSArrowFunction.h: Added.
>+        (JSC::JSArrowFunction::allocationSize):
>+        (JSC::JSArrowFunction::createStructure):
>+        (JSC::JSArrowFunction::arrowFunction):
>+        (JSC::JSArrowFunction::boundThis):
>+        (JSC::JSArrowFunction::offsetOfThisValue):
>+        * runtime/JSFunction.h:
>+        * runtime/JSFunctionInlines.h:
>+        (JSC::JSFunction::JSFunction):
>+        * runtime/JSGlobalObject.cpp:
>+        (JSC::JSGlobalObject::init):
>+        (JSC::JSGlobalObject::addGlobalVar):
>+        (JSC::JSGlobalObject::haveABadTime):
>+        (JSC::JSGlobalObject::visitChildren):
>+        (JSC::JSGlobalObject::addStaticGlobals):
>+        (JSC::JSGlobalObject::createProgramCodeBlock):
>+        * runtime/JSGlobalObject.h:
>+        (JSC::JSGlobalObject::arrowFunctionStructure):
>+        (JSC::JSGlobalObject::profileGroup):
>+        (JSC::JSScope::globalThis):
>+        (JSC::JSGlobalObject::globalThis):
>+        * tests/controlFlowProfiler/arrowfunction-expression.js: Added.
>+        * tests/stress/arrowfunction-associativity-2.js: Added.
>+        * tests/stress/arrowfunction-bound.js: Added.
>+        * tests/stress/arrowfunction-call.js: Added.
>+        * tests/stress/arrowfunction-constructor.js: Added.
>+        * 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-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-06-28 Aleksandr Skachkov   <gskachkov@gmail.com>
> 
>         [ES6] Implement ES6 arrow function syntax. No Line terminator between function parameters and =>
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 3c940b4a5b2543cd14bced58b02c1b981569bc4b..ea3c2234a9a9fec777fc6fa28e82741f65b11fe1 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -482,6 +482,7 @@ set(JavaScriptCore_RUNTIME_SOURCES
>     runtime/JSArrayBufferPrototype.cpp
>     runtime/JSArrayBufferView.cpp
>     runtime/JSArrayIterator.cpp
>+    runtime/JSArrowFunction.cpp
>     runtime/JSBoundFunction.cpp
>     runtime/JSCJSValue.cpp
>     runtime/JSCallee.cpp
>diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>index b142a6a2c66743007ae9b5c2ab7cbd8d1d1d7910..cebaf527804378c2c896290899a8e86e8298a7e8 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>@@ -741,6 +741,7 @@
>     <ClCompile Include="..\runtime\JSArrayBufferView.cpp" />
>     <ClCompile Include="..\runtime\JSBoundFunction.cpp" />
>     <ClCompile Include="..\runtime\JSBoundSlotBaseFunction.cpp" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.cpp" />
>     <ClCompile Include="..\runtime\JSCJSValue.cpp" />
>     <ClCompile Include="..\runtime\JSCallee.cpp" />
>     <ClCompile Include="..\runtime\JSCatchScope.cpp" />
>@@ -1547,6 +1548,7 @@
>     <ClInclude Include="..\runtime\JSArrayIterator.h" />
>     <ClInclude Include="..\runtime\JSBoundFunction.h" />
>     <ClInclude Include="..\runtime\JSBoundSlotBaseFunction.h" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.h" />
>     <ClInclude Include="..\runtime\JSCInlines.h" />
>     <ClInclude Include="..\runtime\JSCJSValue.h" />
>     <ClInclude Include="..\runtime\JSCJSValueInlines.h" />
>diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
>index d3e02e3d43407db1f27b4a3bf340fa561ff3cb45..ca1c06685d61927456a8e9f5b767fe3ec8d7a74c 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
>+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
>@@ -2697,6 +2697,9 @@
>     <ClInclude Include="..\runtime\JSArray.h">
>       <Filter>runtime</Filter>
>     </ClInclude>
>+    <ClInclude Include="..\runtime\JSArrowFunction.h">
>+      <Filter>runtime</Filter>
>+    </ClInclude>
>     <ClInclude Include="..\runtime\JSBoundFunction.h">
>       <Filter>runtime</Filter>
>     </ClInclude>
>diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>index 288ea0088ebbb45b6135fb0feff0e7685ec52a4e..fcb6750b243f07a3d0dd9ee55b49f2b05ebe35c2 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>@@ -1120,6 +1120,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 */; };
>@@ -2878,6 +2880,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>"; };
>@@ -4492,6 +4496,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 */,
>@@ -7276,6 +7282,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 9a1fdd1be2039ccfa3d26fa1d772ac0f91ad880d..fc9be9f4a94a8f58b915deb6ee9041c1f13cd8bc 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeList.json
>+++ b/Source/JavaScriptCore/bytecode/BytecodeList.json
>@@ -97,6 +97,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 250d322ce1c0d4239eb7dfd4161f149ce5d8fcc0..11311f43eacb7ea5f16d38407f876643a19fb046 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>@@ -117,6 +117,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:
>@@ -310,6 +313,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 12439e08cae10866e93d9a746fc2c57bbfa82d0c..28936d16f884365528b8c45d553a7d94f033325a 100644
>--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>@@ -1321,6 +1321,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 827d05e4aa102423430b6683adf00c9ab358c902..f7d37fea6e7d3aeb64e664bea931d4897a1a5ccf 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>@@ -1817,6 +1817,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 f8cfc7ad063ff63f46283761f1026f91b400ddc6..1508f5d22a4e8bf9912bf485d4447034e0a641f6 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>@@ -457,6 +457,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 9eee332ad88c19ff58e1d0e79715399fb5336724..87355a87cc7eb65b554cf5d3d8ed13ed8ddaf84e 100644
>--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>@@ -3025,6 +3025,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 d5af9276b4530c0e1abe3274e036e05fe1f27ca8..a15f0994f791a44915038e8ceb2f0e01da5f1920 100644
>--- a/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
>+++ b/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
>@@ -1608,7 +1608,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 0c5eeb4d025aadb09464fcacc30c1c601d6bd956..7cdfda039f419796c5edda064f9734612ae0d011 100644
>--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>@@ -3806,6 +3806,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 5c6d17dcd854fa391e255065686daff09ccbf434..7e40527fda7aecffc7f4d245feaef0802a7ac07e 100644
>--- a/Source/JavaScriptCore/dfg/DFGClobberize.h
>+++ b/Source/JavaScriptCore/dfg/DFGClobberize.h
>@@ -951,7 +951,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 5946840d2f8809579691c68f96c00d75d15a6b84..675d5f21f16581f5ae44ce2ae7a095a551d1825a 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 1affa1ab8fe9c1302381e82a1e2ee47a2ffe62c0..793d43144b6a7f5545d6bc516d85ba96f8339279 100644
>--- a/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
>@@ -1262,7 +1262,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 5befd839ec8368a4f7d882a7d3f2b2564e6ed8d9..9076bc526e6ed344e7b86f9a4ee265333339e78a 100644
>--- a/Source/JavaScriptCore/dfg/DFGNode.h
>+++ b/Source/JavaScriptCore/dfg/DFGNode.h
>@@ -1281,6 +1281,7 @@ struct Node {
>         case CheckCell:
>         case NativeConstruct:
>         case NativeCall:
>+        case NewArrowFunction:
>         case NewFunction:
>         case CreateActivation:
>         case MaterializeCreateActivation:
>diff --git a/Source/JavaScriptCore/dfg/DFGNodeType.h b/Source/JavaScriptCore/dfg/DFGNodeType.h
>index 69f6ae5ec996bbc8c9450d3448b0684a829bf690..ccb457b286e464fe78642fa8bc3e81996fb86ccf 100644
>--- a/Source/JavaScriptCore/dfg/DFGNodeType.h
>+++ b/Source/JavaScriptCore/dfg/DFGNodeType.h
>@@ -295,6 +295,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 cde09bf121b21f8a4feb60dfa24fb420b6a9baba..9b0be56beda9f037e13b798f639946ca3ce6acfe 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 953b54c21f739d07de4645db6b7475c1f07bae61..06c53246a92a1f3dfa5b86a43328c413df166baa 100644
>--- a/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
>+++ b/Source/JavaScriptCore/dfg/DFGSafeToExecute.h
>@@ -230,6 +230,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 98db3e0bc66f22deec1fc5901ed1968f2742642b..55e4c1462c441e535457e3a494fdd2982ff8e1c0 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"
>@@ -4517,6 +4518,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 5d219daf827b59071b448b79e522bb89fadcd328..b8cad648d0249c28869a8b37f42e2d2afb4e0b8a 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.h
>@@ -1202,6 +1202,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)
>     {
>@@ -1608,6 +1614,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 UniquedStringImpl* uid)
>     {
>         m_jit.setupArgumentsWithExecState(TrustedImmPtr(stubInfo), arg1, TrustedImmPtr(uid));
>@@ -2211,6 +2222,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 7e08d9bfdb6571a84b243f519fc5ad7dfde55cdc..e231851cba203aeb10292642f6c05b9e979bb19e 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
>@@ -4306,7 +4306,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 2c78f9a2213859f7cd8d0ef017e561549f194d78..996e4b42b5f1f677f2e1b2bf83bb62aba733b87d 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
>@@ -4315,11 +4315,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 1fe7987f83d6efa7c2723598d65c39312970fffa..b282d609160ae775089e1b8ab1ee38e84f1212a4 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 3e62d302f8e4ca6f99b7db7280863c3b3f07c922..200cb35125910c4bac3f16f26389521577bdde75 100644
>--- a/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h
>+++ b/Source/JavaScriptCore/ftl/FTLIntrinsicRepository.h
>@@ -86,6 +86,7 @@ namespace JSC { namespace FTL {
>     macro(J_JITOperation_EJI, 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 d5ce0d7f1b245703634c0503577c2c5c1bd41b1d..03df65a1ee2029eff464df9e7acdc384f10c4cbb 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"
>@@ -615,6 +616,9 @@ private:
>         case CreateActivation:
>             compileCreateActivation();
>             break;
>+        case NewArrowFunction:
>+            compileNewArrowFunction();
>+            break;
>         case NewFunction:
>             compileNewFunction();
>             break;
>@@ -3138,6 +3142,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 c997d2c90d3eb01eb90e5828feadfe011b08e2ad..eb0cb312a30c5ce5371babcfea087242734d3cdb 100644
>--- a/Source/JavaScriptCore/interpreter/Interpreter.cpp
>+++ b/Source/JavaScriptCore/interpreter/Interpreter.cpp
>@@ -45,6 +45,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/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
>index 23d31da56360889fb87635a5b93950b0232d27b4..1b82b46bfd34ccadc19cd538fe4535842fa982fc 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 202c99c63559c33d3d093f66f3308ffa8bbe7e2a..24629149fb53ef8f7b455e56e59127cb31ee7ac2 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*);
>@@ -705,6 +706,7 @@ namespace JSC {
>         MacroAssembler::Call callOperation(J_JITOperation_EJJAp, int, GPRReg, GPRReg, ArrayProfile*);
>         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 a21c8088d78a0e8c6b50818c6ba1f5aa60d59126..c7f8306ac55283295abfd1d68c10e3acd336b8f7 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 0813b1555c83dabab5a0843aff9ea46998b2f439..49277ef6a93db34906bff66ea370f7d3b933bf7b 100644
>--- a/Source/JavaScriptCore/jit/JITOpcodes.cpp
>+++ b/Source/JavaScriptCore/jit/JITOpcodes.cpp
>@@ -999,6 +999,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 38015d2d804f935920f9756a71ca2fdfea179590..4b1ed90213383937399b5e533ad3607abbbd96ec 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.cpp
>+++ b/Source/JavaScriptCore/jit/JITOperations.cpp
>@@ -43,6 +43,7 @@
> #include "HostCallReturnValue.h"
> #include "JIT.h"
> #include "JITToDFGDeferredCompilationCallback.h"
>+#include "JSArrowFunction.h"
> #include "JSCInlines.h"
> #include "JSCatchScope.h"
> #include "JSFunctionNameScope.h"
>@@ -1020,6 +1021,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 7de77fc740856261d5856f427d45e1e37bdb3485..80b9067512668471fb8a14ae21287bad6ea7140b 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.h
>+++ b/Source/JavaScriptCore/jit/JITOperations.h
>@@ -120,6 +120,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*, UniquedStringImpl*);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESsiJI)(ExecState*, StructureStubInfo*, EncodedJSValue, UniquedStringImpl*);
>@@ -291,6 +292,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/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
>index f300d1dc7a2778159d2103a184fe68b2d4f39812..f0f5669a49b45483bde563d9284932972fa86e3c 100644
>--- a/Source/JavaScriptCore/jsc.cpp
>+++ b/Source/JavaScriptCore/jsc.cpp
>@@ -36,6 +36,9 @@
> #include "Interpreter.h"
> #include "JSArray.h"
> #include "JSArrayBuffer.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+#endif
> #include "JSCInlines.h"
> #include "JSFunction.h"
> #include "JSLock.h"
>@@ -1164,8 +1167,17 @@ EncodedJSValue JSC_HOST_CALL functionHasBasicBlockExecuted(ExecState* exec)
> 
>     JSValue functionValue = exec->argument(0);
>     RELEASE_ASSERT(functionValue.isFunction());
>-    FunctionExecutable* executable = (jsDynamicCast<JSFunction*>(functionValue.asCell()->getObject()))->jsExecutable();
>-
>+    FunctionExecutable* executable;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    if (functionValue.asCell()->inherits(JSC::JSArrowFunction::info())) {
>+        JSArrowFunction* arrowFunction = jsCast<JSArrowFunction*>(functionValue);
>+        executable = (jsDynamicCast<JSFunction*>(arrowFunction->arrowFunction()))->jsExecutable();
>+    } else
>+        executable = (jsDynamicCast<JSFunction*>(functionValue.asCell()->getObject()))->jsExecutable();
>+#else 
>+    executable = (jsDynamicCast<JSFunction*>(functionValue.asCell()->getObject()))->jsExecutable();
>+#endif
>+    
>     RELEASE_ASSERT(exec->argument(1).isString());
>     String substring = exec->argument(1).getString(exec);
>     String sourceCodeText = executable->source().toString();
>diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>index 9ccc1ce49788d710fc69a6915434271a8c09d2e4..70f52ebad28e99fbc733a62c08aab90ebad603b5 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();
>@@ -1029,16 +1040,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 f8f38641007af80fd091c48214f07ef1c86f08d9..3ccdb4b029ca66797bee53f98ae124987397c3b2 100644
>--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>@@ -98,6 +98,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 d9cd01b50c87fadc30cd38caec516781da6b4bf2..6cf17de5c68c105c8ea136c780fea611eb45547c 100644
>--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>@@ -1183,6 +1183,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 015b454c2ba17c1c1563cb8793145c02ac31eb01..9de46a4b9e6267ba7fc499647f9ff557e7f3a14a 100644
>--- a/Source/JavaScriptCore/parser/ASTBuilder.h
>+++ b/Source/JavaScriptCore/parser/ASTBuilder.h
>@@ -371,7 +371,7 @@ public:
>             ? m_sourceCode->subArrowExpression(info.arrowFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn)
>             : m_sourceCode->subExpression(info.startFunctionOffset, info.endFunctionOffset, info.bodyStartLine, info.bodyStartColumn);
> 
>-        FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *info.name, info.body, source, info.parameters);
>+        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;
>     }
>diff --git a/Source/JavaScriptCore/parser/NodeConstructors.h b/Source/JavaScriptCore/parser/NodeConstructors.h
>index 7e26ec3c8e455e89db1d20ae682a120827fce79d..535bae44819843f7d7c0ee1bcc2500eb586f7682 100644
>--- a/Source/JavaScriptCore/parser/NodeConstructors.h
>+++ b/Source/JavaScriptCore/parser/NodeConstructors.h
>@@ -843,6 +843,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 08fc488af51fac9c8cd4e4192fef4718f6418dbb..e9aad61ffaaf23a0e2a064745bb77766edf62b14 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; }
>@@ -1743,6 +1746,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/FunctionPrototype.cpp b/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
>index d082b12cf5bb3083834847bb0649f0d385205088..1628ede0e5c2916e52684fbcf1f5c2662ddc672e 100644
>--- a/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/FunctionPrototype.cpp
>@@ -25,6 +25,7 @@
> #include "BuiltinNames.h"
> #include "Error.h"
> #include "JSArray.h"
>+#include "JSArrowFunction.h"
> #include "JSBoundFunction.h"
> #include "JSFunction.h"
> #include "JSString.h"
>@@ -83,15 +84,29 @@ EncodedJSValue JSC_HOST_CALL functionProtoFuncToString(ExecState* exec)
> {
>     JSValue thisValue = exec->thisValue();
>     if (thisValue.inherits(JSFunction::info())) {
>+        FunctionExecutable* executable;
>         JSFunction* function = jsCast<JSFunction*>(thisValue);
>+        String functionTitle = "function ";
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (thisValue.inherits(JSArrowFunction::info())) {
>+            functionTitle = "";
>+            JSArrowFunction* arrowFunction = jsCast<JSArrowFunction*>(thisValue);
>+            executable = (jsDynamicCast<JSFunction*>(arrowFunction->arrowFunction()))->jsExecutable();
>+        } else {
>+            if (function->isHostOrBuiltinFunction())
>+                return JSValue::encode(jsMakeNontrivialString(exec, functionTitle, function->name(exec), "() {\n    [native code]\n}"));
>+            executable = function->jsExecutable();
>+        }
>+#else
>         if (function->isHostOrBuiltinFunction())
>-            return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(exec), "() {\n    [native code]\n}"));
>-
>-        FunctionExecutable* executable = function->jsExecutable();
>+            return JSValue::encode(jsMakeNontrivialString(exec, functionTitle, function->name(exec), "() {\n    [native code]\n}"));
>+        executable = function->jsExecutable();
>+#endif
>+        
>         String source = executable->source().provider()->getRange(
>             executable->parametersStartOffset(),
>             executable->typeProfilingEndOffset() + 1); // Type profiling end offset is the character before the '}'.
>-        return JSValue::encode(jsMakeNontrivialString(exec, "function ", function->name(exec), source));
>+        return JSValue::encode(jsMakeNontrivialString(exec, functionTitle, function->name(exec), source));
>     }
> 
>     if (thisValue.inherits(InternalFunction::info())) {
>diff --git a/Source/JavaScriptCore/runtime/JSArrowFunction.cpp b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..b7fe2bcc65e2e40dec508eeed2c3fc263da23b35
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>@@ -0,0 +1,112 @@
>+/*
>+ * Copyright (C) 2015 Aleksandr Skachkov <gskachkov@gmail.com>.
>+ *
>+ * 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()));
>+
>+    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*, ConstructData&)
>+{
>+    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..87bba4d2f059c9e2c3a2b67494314ee0e3a5db4b
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.h
>@@ -0,0 +1,88 @@
>+/*
>+ * Copyright (C) 2015 Aleksandr Skachkov <gskachkov@gmail.com>.
>+ *
>+ * 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_EXPORT_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 0b87d75c91450c5af1aaed27a61a748ef80f093e..a68927415c7d718ad044a98452a8156dc33ea13c 100644
>--- a/Source/JavaScriptCore/runtime/JSFunction.h
>+++ b/Source/JavaScriptCore/runtime/JSFunction.h
>@@ -141,6 +141,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 298d8e54230cf67648568a17203e56501cab8398..982fdd0335595ef5e02bc2cfd95e5571a1bf423e 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>@@ -59,6 +59,7 @@
> #include "JSArrayBufferConstructor.h"
> #include "JSArrayBufferPrototype.h"
> #include "JSArrayIterator.h"
>+#include "JSArrowFunction.h"
> #include "JSBoundFunction.h"
> #include "JSBoundSlotBaseFunction.h"
> #include "JSCInlines.h"
>@@ -243,6 +244,9 @@ void JSGlobalObject::init(VM& vm)
> 
>     m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
>     m_boundSlotBaseFunctionStructure.set(vm, this, JSBoundSlotBaseFunction::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()));
>@@ -779,6 +783,7 @@ void JSGlobalObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
>     visitor.append(&thisObject->m_functionStructure);
>     visitor.append(&thisObject->m_boundSlotBaseFunctionStructure);
>     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 9f5c6e85e42b429814833695e4952ee86207f0c1..1da8b0dfed12f43222d4bea7502fab4e6239f34e 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>@@ -239,6 +239,7 @@ protected:
>     WriteBarrier<Structure> m_functionStructure;
>     WriteBarrier<Structure> m_boundFunctionStructure;
>     WriteBarrier<Structure> m_boundSlotBaseFunctionStructure;
>+    WriteBarrier<Structure> m_arrowFunctionStructure;
>     WriteBarrier<Structure> m_namedFunctionStructure;
>     PropertyOffset m_functionNameOffset;
>     WriteBarrier<Structure> m_privateNameStructure;
>@@ -480,6 +481,7 @@ public:
>     Structure* functionStructure() const { return m_functionStructure.get(); }
>     Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
>     Structure* boundSlotBaseFunctionStructure() const { return m_boundSlotBaseFunctionStructure.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-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");
>diff --git a/LayoutTests/js/arrowfunction-tostring-expected.txt b/LayoutTests/js/arrowfunction-tostring-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..bc9b57b5fc2120357b1070565a6aef75e3914a64
>--- /dev/null
>+++ b/LayoutTests/js/arrowfunction-tostring-expected.txt
>@@ -0,0 +1,9 @@
>+Tests for ES6 arrow function calling
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS s is x => x.name
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>diff --git a/LayoutTests/js/arrowfunction-tostring.html b/LayoutTests/js/arrowfunction-tostring.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..49f8b0c3cfa343472ebc40edc2e98ded8f986b37
>--- /dev/null
>+++ b/LayoutTests/js/arrowfunction-tostring.html
>@@ -0,0 +1,10 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+<script src="script-tests/arrowfunction-tostring.js"></script>
>+<script src="../resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
>index 661b2b2170468620e36a275b10330d61437340c6..f7bc9f9cec2001ce2784dc85355fdf335ba31234 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
>@@ -32,6 +32,7 @@
>     <ENABLE_DOM4_EVENTS_CONSTRUCTOR>ENABLE_DOM4_EVENTS_CONSTRUCTOR</ENABLE_DOM4_EVENTS_CONSTRUCTOR>
>     <ENABLE_ENCRYPTED_MEDIA_V2>ENABLE_ENCRYPTED_MEDIA_V2</ENABLE_ENCRYPTED_MEDIA_V2>
>     <ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX>ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX</ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX>
>+    <ENABLE_ES6_ARROWFUNCTION_SYNTAX>ENABLE_ES6_ARROWFUNCTION_SYNTAX</ENABLE_ES6_ARROWFUNCTION_SYNTAX>
>     <ENABLE_FILE_SYSTEM />
>     <ENABLE_FULLSCREEN_API>ENABLE_FULLSCREEN_API</ENABLE_FULLSCREEN_API>
>     <ENABLE_GAMEPAD />
>@@ -93,7 +94,7 @@
>   </PropertyGroup>
>   <ItemDefinitionGroup>
>     <ClCompile>
>-      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX);$(ENABLE_ES6_ARROWFUNCTION_SYNTAX);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
>     </ClCompile>
>   </ItemDefinitionGroup>
>   <ItemGroup>
>@@ -221,6 +222,10 @@
>       <Value>$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX)</Value>
>       <EnvironmentVariable>true</EnvironmentVariable>
>     </BuildMacro>
>+    <BuildMacro Include="ENABLE_ES6_ARROWFUNCTION_SYNTAX">
>+      <Value>$(ENABLE_ES6_ARROWFUNCTION_SYNTAX)</Value>
>+      <EnvironmentVariable>true</EnvironmentVariable>
>+    </BuildMacro>
>     <BuildMacro Include="ENABLE_FILE_SYSTEM">
>       <Value>$(ENABLE_FILE_SYSTEM)</Value>
>       <EnvironmentVariable>true</EnvironmentVariable>
>diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
>index 6fe377e07a0e979cc1f74e1144137f1acfd420e7..1463ee3a952e8c9c737d244ff1096b82f72ab806 100644
>--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
>+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
>@@ -32,6 +32,7 @@
>     <ENABLE_DOM4_EVENTS_CONSTRUCTOR>ENABLE_DOM4_EVENTS_CONSTRUCTOR</ENABLE_DOM4_EVENTS_CONSTRUCTOR>
>     <ENABLE_ENCRYPTED_MEDIA_V2 />
>     <ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX>ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX</ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX>
>+    <ENABLE_ES6_ARROWFUNCTION_SYNTAX>ENABLE_ES6_ARROWFUNCTION_SYNTAX</ENABLE_ES6_ARROWFUNCTION_SYNTAX>
>     <ENABLE_FILE_SYSTEM />
>     <ENABLE_FULLSCREEN_API>ENABLE_FULLSCREEN_API</ENABLE_FULLSCREEN_API>
>     <ENABLE_GAMEPAD />
>@@ -93,7 +94,7 @@
>   </PropertyGroup>
>   <ItemDefinitionGroup>
>     <ClCompile>
>-      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>$(ENABLE_CSP_NEXT);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_DOM4_EVENTS_CONSTRUCTOR);$(ENABLE_ENCRYPTED_MEDIA_V2);$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX);$(ENABLE_ES6_ARROWFUNCTION_SYNTAX);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PICTURE_SIZES);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_OTF_CONVERTER);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
>     </ClCompile>
>   </ItemDefinitionGroup>
>   <ItemGroup>
>@@ -221,6 +222,10 @@
>       <Value>$(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX)</Value>
>       <EnvironmentVariable>true</EnvironmentVariable>
>     </BuildMacro>
>+    <BuildMacro Include="ENABLE_ES6_ARROWFUNCTION_SYNTAX">
>+      <Value>$(ENABLE_ES6_ARROWFUNCTION_SYNTAX)</Value>
>+      <EnvironmentVariable>true</EnvironmentVariable>
>+    </BuildMacro>
>     <BuildMacro Include="ENABLE_FILE_SYSTEM">
>       <Value>$(ENABLE_FILE_SYSTEM)</Value>
>       <EnvironmentVariable>true</EnvironmentVariable>

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