Attachment 249940 Details for Bug 140855 – Patch

[patch] Patch

bug-140855-20150401235222.patch (text/plain), 130.30 KB, created by GSkachkov on 2015-04-01 13:53:08 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: GSkachkov

Created: 2015-04-01 13:53:08 PDT

Size: 130.30 KB

patch

obsolete

>Subversion Revision: 182207
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 3fcc3d157bbc278ade2912977eb9301a09a2cb08..554ab13ebd6b28e85f894630ab950f8045abfe08 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,115 @@
>+2015-04-01  Alexandr Skachkov  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+        Added support of ES6 arrow function. Changes were made according following spec http://wiki.ecmascript.org/doku.php?id=harmony:arrow_function_syntax
>+        In patch were implemented the simplest cases:
>+          1 no parameters                () => 10 + 20
>+          2 single parameter              x => x + 20
>+          3 multiple parameters      (x, y) => x + y
>+          4 arrow function with block     x => { return x*10; }
>+          5 lexical this - variable this is point to the this of the function where arrow function is declared
>+          6 No constructor - the using of the command new for arrow function leads to runtime error. 
>+
>+         Not yet implemented:
>+          1 the variable with name arguments inside of the arrow function should point to list of arguments of function where arrow function is declared
>+          2 parser will parse the statement x, y => x + y instead of raising exception
>+          3 method call, apply, bind should not override the this variable inside of the arrow function
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
>+        * bytecode/BytecodeList.json:
>+        * bytecode/BytecodeUseDef.h:
>+        (JSC::Functor::computeUsesForBytecodeOffset):
>+        * bytecode/CodeBlock.cpp:
>+        (JSC::CodeBlock::dumpBytecode):
>+        * bytecompiler/BytecodeGenerator.h:
>+        * bytecompiler/BytecodeGenerator.cpp:
>+        (JSC::BytecodeGenerator::emitNewArrowFunctionExpression): added
>+        (JSC::BytecodeGenerator::emitThisNodeBytecode): added
>+        * bytecompiler/NodesCodegen.cpp:
>+        (JSC::emitBytecode::emitBytecode): added
>+        (JSC::ArrowFuncExprNode::emitBytecode): added
>+        * dfg/DFGByteCodeParser.cpp:
>+        (JSC::ByteCodeParser::parseBlock):
>+        * dfg/DFGCapabilities.cpp:
>+        (JSC::CapabilityLevel::capabilityLevel):
>+        * jit/JIT.h:
>+        (JSC::JIT::emit_op_new_arrow_func_exp): added
>+        * jit/JITInlines.h:
>+        (JSC::JIT::callOperation): added
>+        * jit/JIT.cpp:
>+        (JSC::JIT::privateCompileMainPass):
>+        * jit/JITOpcodes.cpp:
>+        (JSC::JIT::emit_op_new_arrow_func_exp): added
>+        * jit/JITOperations.cpp:
>+        (JSC::JIT_OPERATION::operationNewArrowFunction): added
>+        * jit/JITOperations.h:
>+        (JSC::JIT_OPERATION::operationNewArrowFunction): added
>+        * llint/LLIntSlowPaths.cpp:
>+        (LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp): added
>+        * llint/LLIntSlowPaths.h:
>+        (LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp)): added
>+        * llint/LowLevelInterpreter.asm:
>+        * parser/ASTBuilder.h:
>+        (JSC::ASTBuilder::createArrowFunctionExpr):
>+        * parser/Lexer.cpp:
>+        (JSC::Lexer<T>::setTokenPosition):
>+        (JSC::Lexer<T>::lex):
>+        * parser/Lexer.h:
>+        (JSC::Lexer<T>::setTokenPosition):
>+        * parser/NodeConstructors.h:
>+        (JSC::ArrowFuncExprNode::ArrowFuncExprNode): added
>+        * parser/Nodes.h:
>+        (JSC::Node::isArrowFuncExprNode): added
>+        (JSC::ArrowFuncExprNode): added class
>+        * parser/Parser.cpp:
>+        (JSC::Parser<LexerType>::parseSourceElements):
>+        (JSC::Parser<LexerType>::parsePrimaryExpression):
>+        (JSC::Parser::parseSourceElement):
>+        (JSC::Parser::parseStatement):
>+        (JSC::Parser::parseAssignmentExpression):
>+        (JSC::Parser::parsePrimaryExpression):
>+        (JSC::Parser::parseArrowExpression):
>+        (JSC::Parser::setEndOfStatement):
>+        (JSC::Parser::parseArrowFunctionWrapper):
>+        (JSC::Parser::parseArrowFunctionInfo):
>+        (JSC::Parser::parseArrowFunctionBody):
>+        * parser/Parser.h:
>+        (JSC::Parser::FunctionParseType):
>+        (JSC::Parser::parseSourceElement):
>+        (JSC::Parser::parseStatement):
>+        (JSC::Parser::parseArrowExpression):
>+        (JSC::Parser::setEndOfStatement):
>+        (JSC::Parser::parseArrowFunctionWrapper):
>+        * parser/ParserFunctionInfo.h:
>+        * parser/ParserTokens.h:
>+        (JSC::ParserFunctionInfo::arrowFunctionOffset): added
>+        (JSC::ParserFunctionInfo::isArrowFunction): added
>+        (JSC::ParserFunctionInfo::arrowFunctionBodyType): added
>+        * parser/SourceCode.h:
>+        (JSC::SourceCode::subArrowExpression):
>+        * parser/SyntaxChecker.h:
>+        (JSC::SyntaxChecker::createArrowFunctionExpr):
>+        * parser/SourceProviderCacheItem:
>+        (JSC::SourceProviderCacheItemCreationParameters):
>+        (JSC::SourceProviderCacheItem):
>+        (JSC::SourceProviderCacheItem::endArrowFunctionToken):
>+        * runtime/JSArrowFunction.h: added class for handle arrow function creation and execution
>+        * runtime/JSArrowFunction.cpp:
>+        * runtime/JSFunction.h:
>+        (JSC::JSFunction::JSFunction): added one more constructor
>+        * runtime/JSFunctionInlines.h:
>+        (JSC::JSFunction::JSFunction): added constructor implementation
>+        * runtime/JSGlobalObject.cpp:
>+        (JSC::JSGlobalObject::init):
>+        (JSC::JSGlobalObject::m_arrowFunctionStructure): added
>+        (JSC::JSGlobalObject::arrowFunctionStructure):
>+        * tests/stress/js/arrowfunction.js:
>+
> 2015-03-31  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Clean up Identifier factories to clarify the meaning of StringImpl*
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 873f685056bb7e477b6b695dfacb0aeba58ea447..37438f4412ad639a74968f3f3ec97c3d3a3efb20 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-04-01  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Configurations/FeatureDefines.xcconfig:
>+
> 2015-03-31  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         Move ExpansionBehaviorFlags and TextDirection to their own file
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index 757ea49d0a30f94d5622b83535c1bebd0431e956..ef87c75e0049b6c9d84d14cea4015f50aae2d528 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-04-01  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Configurations/FeatureDefines.xcconfig:
>+
> 2015-03-31  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Clean up Identifier factories to clarify the meaning of StringImpl*
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index 721127652d888f501ab6c217b8334419043f5864..5053dc17e6d58b111c730a94cc074b0cbe5078a9 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -466,6 +466,7 @@ set(JavaScriptCore_RUNTIME_SOURCES
>     runtime/JSArrayBufferView.cpp
>     runtime/JSArrayIterator.cpp
>     runtime/JSBoundFunction.cpp
>+    runtime/JSArrowFunction.cpp
>     runtime/JSGlobalObjectDebuggable.cpp
>     runtime/JSCJSValue.cpp
>     runtime/JSCallee.cpp
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index 8b112fae45b957dd2641fdb6f4689880589af860..1148a76972f114c383d32629f1f093c68550a051 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ENABLE_ES6_CLASS_SYNTAX;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
>@@ -214,4 +215,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>index 74330e703dac4d3600eab27a0ad8eb4af00e0b32..622873dd2f9470a91318acccd4709dceae72608e 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
>@@ -734,6 +734,7 @@
>     <ClCompile Include="..\runtime\JSArrayBufferPrototype.cpp" />
>     <ClCompile Include="..\runtime\JSArrayBufferView.cpp" />
>     <ClCompile Include="..\runtime\JSBoundFunction.cpp" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.cpp" />
>     <ClCompile Include="..\runtime\JSCJSValue.cpp" />
>     <ClCompile Include="..\runtime\JSCallee.cpp" />
>     <ClCompile Include="..\runtime\JSCatchScope.cpp" />
>@@ -1526,6 +1527,7 @@
>     <ClInclude Include="..\runtime\JSArrayBufferViewInlines.h" />
>     <ClInclude Include="..\runtime\JSArrayIterator.h" />
>     <ClInclude Include="..\runtime\JSBoundFunction.h" />
>+    <ClCompile Include="..\runtime\JSArrowFunction.h" />
>     <ClInclude Include="..\runtime\JSCInlines.h" />
>     <ClInclude Include="..\runtime\JSCJSValue.h" />
>     <ClInclude Include="..\runtime\JSCJSValueInlines.h" />
>@@ -1800,4 +1802,4 @@
>   <ImportGroup Label="ExtensionTargets">
>     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
>   </ImportGroup>
>-</Project>
>\ No newline at end of file
>+</Project>
>diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>index ba2d136eb95b5a9fd354ab30a8f3691bf78ceb86..e9d6f2465e33855d368b4d204e0d7646c56e989f 100644
>--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
>@@ -1092,6 +1092,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 */; };
>@@ -2824,6 +2826,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>"; };
>@@ -4438,6 +4442,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 */,
>@@ -7166,6 +7172,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 6b2439156ab3afae6b558ab9066d222515d59e45..4360709d8f7e418215ab2af959bf6448af038028 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeList.json
>+++ b/Source/JavaScriptCore/bytecode/BytecodeList.json
>@@ -95,6 +95,7 @@
>             { "name" : "op_switch_string", "length" : 4 },
>             { "name" : "op_new_func", "length" : 4 },
>             { "name" : "op_new_func_exp", "length" : 4 },
>+            { "name" : "op_new_arrow_func_exp", "length" : 5 },
>             { "name" : "op_call", "length" : 9 },
>             { "name" : "op_call_eval", "length" : 9 },
>             { "name" : "op_call_varargs", "length" : 9 },
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>index 85f2915c7e8f601ad3ec178bf69e3544f754c2cf..17b6bed81fe25b62330baa3fd031c716ab88f9bf 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>@@ -116,6 +116,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:
>@@ -308,6 +311,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 9e9517e781be557f04f17f93dec71b916cc9a2ad..115420ce11b0859f6ee33a829c430d1907bf1efe 100644
>--- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>+++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp
>@@ -1274,6 +1274,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 8872d777d3e59211c916d4780d0e0427ed398f86..a7964bb5bc32ae75da35003d6fde464a2c9e0663 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
>@@ -1754,6 +1754,34 @@ RegisterID* BytecodeGenerator::emitNewFunctionExpression(RegisterID* r0, FuncExp
>     instructions().append(index);
>     return r0;
> }
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+RegisterID* BytecodeGenerator::emitNewArrowFunctionExpression(RegisterID* r0, FuncExprNode* n)
>+{
>+    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;
>+}
>+    
>+RegisterID* BytecodeGenerator::emitThisNodeBytecode(RegisterID* dst, JSTextPosition position)
>+{
>+    if (dst == ignoredResult())
>+        return 0;
>+    RegisterID* result = moveToDestinationIfNeeded(dst, thisRegister());
>+    if (vm()->typeProfiler()) {
>+        emitProfileType(thisRegister(), ProfileTypeBytecodeDoesNotHaveGlobalID, nullptr);
>+        static const unsigned thisLength = 4;
>+        emitTypeProfilerExpressionInfo(position, JSTextPosition(-1, position.offset + thisLength, -1));
>+    }
>+    return result;
>+}
>+#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 4ffef6b4097f0246dc1bae89ee8aab8ec95c60fa..378a19eaaeddfbdb4f512280e9089438577a7494 100644
>--- a/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>+++ b/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.h
>@@ -454,6 +454,10 @@ namespace JSC {
>         RegisterID* emitNewFunctionInternal(RegisterID* dst, unsigned index);
>         RegisterID* emitNewFunctionExpression(RegisterID* dst, FuncExprNode* func);
>         RegisterID* emitNewDefaultConstructor(RegisterID* dst, ConstructorKind, const Identifier& name);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        RegisterID* emitNewArrowFunctionExpression(RegisterID*, FuncExprNode*);
>+        RegisterID* emitThisNodeBytecode(RegisterID*, JSTextPosition);
>+#endif
>         RegisterID* emitNewRegExp(RegisterID* dst, RegExp*);
> 
>         RegisterID* emitMoveEmptyValue(RegisterID* dst);
>diff --git a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>index 4f7476ca33c9131bb73dfa896a600575626581b7..de5491cc702e6712eaeca501ee48b5907796f344 100644
>--- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
>@@ -149,7 +149,9 @@ RegisterID* ThisNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst
> 
>     if (dst == generator.ignoredResult())
>         return 0;
>-
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    return generator.emitThisNodeBytecode(dst, position());
>+#else
>     RegisterID* result = generator.moveToDestinationIfNeeded(dst, generator.thisRegister());
>     if (generator.vm()->typeProfiler()) {
>         generator.emitProfileType(generator.thisRegister(), ProfileTypeBytecodeDoesNotHaveGlobalID, nullptr);
>@@ -157,6 +159,7 @@ RegisterID* ThisNode::emitBytecode(BytecodeGenerator& generator, RegisterID* dst
>         generator.emitTypeProfilerExpressionInfo(position(), JSTextPosition(-1, position().offset + thisLength, -1));
>     }
>     return result;
>+#endif
> }
> 
> // ------------------------------ SuperNode -------------------------------------
>@@ -2833,6 +2836,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/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>index 53ac177461969eefb66adf6090681e6e5b76b032..fd737a3f78e9c2b9f1a9919788d123e6b2d9330b 100644
>--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
>@@ -3675,6 +3675,15 @@ bool ByteCodeParser::parseBlock(unsigned limit)
>             NEXT_OPCODE(op_new_func_exp);
>         }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        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(NewFunction, OpInfo(frozen), get(VirtualRegister(currentInstruction[2].u.operand))));
>+            NEXT_OPCODE(op_new_arrow_func_exp);
>+        }
>+#endif
>         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 8ef4dcf1568bd5eda4b897e7684a8cbb91bf6e08..7f45a831ea6e6273bacd2e3f8336ddc562c8cc8d 100644
>--- a/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
>@@ -208,6 +208,9 @@ CapabilityLevel capabilityLevel(OpcodeID opcodeID, CodeBlock* codeBlock, Instruc
>     case op_new_func:
>     case op_new_func_exp:
>     case op_create_lexical_environment:
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    case op_new_arrow_func_exp:
>+#endif
>         return CanCompileAndInline;
> 
>     case op_put_to_scope: {
>diff --git a/Source/JavaScriptCore/interpreter/Interpreter.cpp b/Source/JavaScriptCore/interpreter/Interpreter.cpp
>index ecfce91bd3c030853a394032ba5cd282a1a3cd8e..3ac93a9fab248248075e21803327374435c990ce 100644
>--- a/Source/JavaScriptCore/interpreter/Interpreter.cpp
>+++ b/Source/JavaScriptCore/interpreter/Interpreter.cpp
>@@ -45,6 +45,9 @@
> #include "GetterSetter.h"
> #include "JSArray.h"
> #include "JSBoundFunction.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+#endif
> #include "JSCInlines.h"
> #include "JSLexicalEnvironment.h"
> #include "JSNameScope.h"
>diff --git a/Source/JavaScriptCore/jit/JIT.cpp b/Source/JavaScriptCore/jit/JIT.cpp
>index 42a82d43946162f95fa47467567139d4aaf2386b..1860a0aa33b0819c4f855085f5e8b70fa232a433 100644
>--- a/Source/JavaScriptCore/jit/JIT.cpp
>+++ b/Source/JavaScriptCore/jit/JIT.cpp
>@@ -253,6 +253,9 @@ void JIT::privateCompileMainPass()
>         DEFINE_OP(op_new_array_buffer)
>         DEFINE_OP(op_new_func)
>         DEFINE_OP(op_new_func_exp)
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        DEFINE_OP(op_new_arrow_func_exp)
>+#endif  
>         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 ee4855dc2e78b55acc4599ebdb99a0d8e08be7cc..5638d5c7c74aec7c0ab195f97bb321bee03c737a 100644
>--- a/Source/JavaScriptCore/jit/JIT.h
>+++ b/Source/JavaScriptCore/jit/JIT.h
>@@ -522,6 +522,9 @@ namespace JSC {
>         void emit_op_new_array_buffer(Instruction*);
>         void emit_op_new_func(Instruction*);
>         void emit_op_new_func_exp(Instruction*);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        void emit_op_new_arrow_func_exp(Instruction*);
>+#endif
>         void emit_op_new_object(Instruction*);
>         void emit_op_new_regexp(Instruction*);
>         void emit_op_not(Instruction*);
>@@ -705,6 +708,7 @@ namespace JSC {
>         MacroAssembler::Call callOperation(J_JITOperation_EJJ, int, GPRReg, GPRReg);
>         MacroAssembler::Call callOperation(C_JITOperation_EJsc, GPRReg);
>         MacroAssembler::Call callOperation(J_JITOperation_EJscC, int, GPRReg, JSCell*);
>+        MacroAssembler::Call callOperation(J_JITOperation_EJscCJ, int, GPRReg, JSCell*, GPRReg);
>         MacroAssembler::Call callOperation(C_JITOperation_EJscZ, GPRReg, int32_t);
>         MacroAssembler::Call callOperation(C_JITOperation_EJscZ, int, GPRReg, int32_t);
> #if USE(JSVALUE64)
>diff --git a/Source/JavaScriptCore/jit/JITInlines.h b/Source/JavaScriptCore/jit/JITInlines.h
>index 9ee24d09228a9882ea769629d1a87b6c34a86334..a0e40c5c61fe63e9863ed223edf5d451f318a774 100644
>--- a/Source/JavaScriptCore/jit/JITInlines.h
>+++ b/Source/JavaScriptCore/jit/JITInlines.h
>@@ -271,6 +271,12 @@ ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EJscC opera
>     return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
> }
> 
>+ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EJscCJ operation, int dst, GPRReg arg1, JSCell* cell, GPRReg arg2)
>+{
>+    setupArgumentsWithExecState(arg1, TrustedImmPtr(cell), arg2);
>+    return appendCallWithExceptionCheckSetJSValueResult(operation, dst);
>+}
>+    
> ALWAYS_INLINE MacroAssembler::Call JIT::callOperation(J_JITOperation_EP operation, int dst, void* pointer)
> {
>     setupArgumentsWithExecState(TrustedImmPtr(pointer));
>diff --git a/Source/JavaScriptCore/jit/JITOpcodes.cpp b/Source/JavaScriptCore/jit/JITOpcodes.cpp
>index d3d580e9e2600853b6649e285918f8538be6944c..4883a83d17648ddde9cada076e17603e37836a84 100644
>--- a/Source/JavaScriptCore/jit/JITOpcodes.cpp
>+++ b/Source/JavaScriptCore/jit/JITOpcodes.cpp
>@@ -972,6 +972,31 @@ void JIT::emit_op_new_func_exp(Instruction* currentInstruction)
>     callOperation(operationNewFunction, dst, regT0, funcExpr);
>     done.link(this);
> }
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+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);
>+}
>+#endif
> 
> void JIT::emit_op_new_array(Instruction* currentInstruction)
> {
>diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp
>index 58b8636d886dbb2e85291b29350d9cf4e1424171..9f524c8bd9968576120c03651778255027646f1b 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.cpp
>+++ b/Source/JavaScriptCore/jit/JITOperations.cpp
>@@ -42,6 +42,10 @@
> #include "HostCallReturnValue.h"
> #include "JIT.h"
> #include "JITToDFGDeferredCompilationCallback.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+#endif
>+#include "JSBoundFunction.h"
> #include "JSCInlines.h"
> #include "JSCatchScope.h"
> #include "JSFunctionNameScope.h"
>@@ -933,6 +937,21 @@ EncodedJSValue JIT_OPERATION operationNewFunction(ExecState* exec, JSScope* scop
>     return JSValue::encode(JSFunction::create(vm, static_cast<FunctionExecutable*>(functionExecutable), scope));
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue)
>+{
>+    ASSERT(functionExecutable->inherits(FunctionExecutable::info()));
>+    VM& vm = exec->vm();
>+    NativeCallFrameTracer tracer(&vm, exec);
>+    JSGlobalObject* globalObject = exec->callee()->globalObject();
>+    JSFunction* func = JSArrowFunction::create(vm, scope, static_cast<FunctionExecutable*>(functionExecutable), globalObject);
>+    
>+    JSArray* boundArgs = JSArray::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
>+    
>+    return JSValue::encode(JSBoundFunction::create(vm, globalObject, func, JSValue::decode(thisValue), boundArgs, 0, ""));
>+}
>+#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 4decef4eb8b48bb937d54d0b604b9b7767a4ea61..85f4caf8cee4cdbc50c4de3bc7c7abe440b8cefc 100644
>--- a/Source/JavaScriptCore/jit/JITOperations.h
>+++ b/Source/JavaScriptCore/jit/JITOperations.h
>@@ -116,6 +116,7 @@ typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPP)(ExecState*, void*, vo
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPS)(ExecState*, void*, size_t);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EPc)(ExecState*, Instruction*);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EJscC)(ExecState*, JSScope*, JSCell*);
>+typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_EJscCJ)(ExecState*, JSScope*, JSCell*, EncodedJSValue);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESS)(ExecState*, size_t, size_t);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESsiCI)(ExecState*, StructureStubInfo*, JSCell*, StringImpl*);
> typedef EncodedJSValue JIT_OPERATION (*J_JITOperation_ESsiJI)(ExecState*, StructureStubInfo*, EncodedJSValue, StringImpl*);
>@@ -278,6 +279,9 @@ EncodedJSValue JIT_OPERATION operationNewArrayWithProfile(ExecState*, ArrayAlloc
> EncodedJSValue JIT_OPERATION operationNewArrayBufferWithProfile(ExecState*, ArrayAllocationProfile*, const JSValue* values, int32_t size) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewArrayWithSizeAndProfile(ExecState*, ArrayAllocationProfile*, EncodedJSValue size) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewFunction(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState*, JSScope*, JSCell*, EncodedJSValue) WTF_INTERNAL;
>+#endif
> JSCell* JIT_OPERATION operationNewObject(ExecState*, Structure*) WTF_INTERNAL;
> EncodedJSValue JIT_OPERATION operationNewRegexp(ExecState*, void*) WTF_INTERNAL;
> void JIT_OPERATION operationHandleWatchdogTimer(ExecState*) WTF_INTERNAL;
>diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>index 279285a46806cc689d05d13cf46342d06b5efd64..8cd1cacd3e58da194d4bddf9ff4dc7c7b553569b 100644
>--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
>@@ -38,6 +38,10 @@
> #include "Interpreter.h"
> #include "JIT.h"
> #include "JITExceptions.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+#include "JSBoundFunction.h"
>+#endif
> #include "JSLexicalEnvironment.h"
> #include "JSCInlines.h"
> #include "JSCJSValue.h"
>@@ -171,6 +175,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();
>@@ -985,18 +998,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);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+LLINT_SLOW_PATH_DECL(slow_path_new_arrow_func_exp)
>+{
>+    LLINT_CALC_PROPERTY_FOR_FUNC_EXPR();
>+    
>+    JSValue thisValue = LLINT_OP_C(4).jsValue();
>+    JSGlobalObject* globalObject = exec->callee()->globalObject();
>+    
>+    JSFunction* func = JSArrowFunction::create(vm, scope, executable, globalObject);
>+    
>+    JSArray* boundArgs = JSArray::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
>+    
>+    const String funcWithoutName = "";
>+    
>+    LLINT_RETURN(JSBoundFunction::create(vm, globalObject, func, thisValue, boundArgs, 0, funcWithoutName));
>+}
>+#endif
>+
> static SlowPathReturnType handleHostCall(ExecState* execCallee, Instruction* pc, JSValue callee, CodeSpecializationKind kind)
> {
>     UNUSED_PARAM(pc);
>diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.h b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>index 4bf7deb0fa0b6c6438e36f96320e2f669739af64..c7fab9691c18b93956d0ea29f33956118c5e71ee 100644
>--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.h
>@@ -96,6 +96,7 @@ LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_char);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_switch_string);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_func_exp);
>+LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_new_arrow_func_exp);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_call);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_construct);
> LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_size_frame_for_varargs);
>diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>index fda91ed5990cb6e4f2cb78aa6a4b2d8c2c0c472a..8227134982db7581dc8a225cd4232820092fb73e 100644
>--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
>@@ -1171,6 +1171,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 b8fe4b8485a097688f5c630bd8c3c96764fc4649..cb8e0dc1ddbec7586635e1b4342c9e55c6614e21 100644
>--- a/Source/JavaScriptCore/parser/ASTBuilder.h
>+++ b/Source/JavaScriptCore/parser/ASTBuilder.h
>@@ -313,6 +313,19 @@ public:
>             inStrictContext, constructorKind);
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info)
>+    {
>+        SourceCode source = info.arrowFunctionBodyType == ArrowFunctionBodyExpression
>+        ? m_sourceCode->subArrowExpression(info.arrowFunctionOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn)
>+        : m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn);
>+
>+        ArrowFuncExprNode* result = new (m_parserArena) ArrowFuncExprNode(location, *info.name, info.body, source, info.parameters);
>+        info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
>+        return result;
>+    }
>+#endif
>+
>     NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool,
>         const Identifier* name, const ParserFunctionInfo<ASTBuilder>& info, SuperBinding superBinding)
>     {
>diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
>index 7de14220bbda72738b573a4b9788ce0b32cc7ce3..540f9ffb7bb51829d67deedec5e6a8ed51cc4414 100644
>--- a/Source/JavaScriptCore/parser/Lexer.cpp
>+++ b/Source/JavaScriptCore/parser/Lexer.cpp
>@@ -1430,6 +1430,18 @@ bool Lexer<T>::nextTokenIsColon()
>     return code < m_codeEnd && *code == ':';
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename T>
>+void Lexer<T>::setTokenPosition(JSToken* tokenRecord)
>+{
>+    JSTokenData* tokenData = &tokenRecord->m_data;
>+    tokenData->line = lineNumber();
>+    tokenData->offset = currentOffset();
>+    tokenData->lineStartOffset = currentLineStartOffset();
>+    ASSERT(tokenData->offset >= tokenData->lineStartOffset);
>+}
>+#endif
>+
> template <typename T>
> JSTokenType Lexer<T>::lex(JSToken* tokenRecord, unsigned lexerFlags, bool strictMode)
> {
>@@ -1493,7 +1505,12 @@ start:
>         }
>         token = GT;
>         break;
>-    case CharacterEqual:
>+    case CharacterEqual: {
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        uint32_t savedlineNumber = tokenData->line;
>+        uint32_t savedOffset = currentOffset();
>+        uint32_t savedLineStartOffset = currentLineStartOffset();
>+#endif
>         shift();
>         if (m_current == '=') {
>             shift();
>@@ -1505,8 +1522,22 @@ start:
>             token = EQEQ;
>             break;
>         }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (m_current == '>') {
>+            shift();
>+            token = ARROWFUNCTION;
>+
>+            tokenData->line = savedlineNumber;
>+            tokenData->offset = savedOffset;
>+            tokenData->lineStartOffset = savedLineStartOffset;
>+
>+            ASSERT(tokenData->offset >= tokenData->lineStartOffset);
>+            break;
>+        }
>+#endif
>         token = EQUAL;
>         break;
>+    }
>     case CharacterLess:
>         shift();
>         if (m_current == '!' && peek(1) == '-' && peek(2) == '-') {
>diff --git a/Source/JavaScriptCore/parser/Lexer.h b/Source/JavaScriptCore/parser/Lexer.h
>index 2df521399578200785a166e22a73275e0ea6304d..cb3f25f7c08f82581af2ce8fa99997fade0766f2 100644
>--- a/Source/JavaScriptCore/parser/Lexer.h
>+++ b/Source/JavaScriptCore/parser/Lexer.h
>@@ -85,6 +85,9 @@ public:
>     void setIsReparsing() { m_isReparsing = true; }
>     bool isReparsing() const { return m_isReparsing; }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    void setTokenPosition(JSToken* tokenRecord);
>+#endif
>     JSTokenType lex(JSToken*, unsigned, bool strictMode);
>     bool nextTokenIsColon();
>     int lineNumber() const { return m_lineNumber; }
>diff --git a/Source/JavaScriptCore/parser/NodeConstructors.h b/Source/JavaScriptCore/parser/NodeConstructors.h
>index 3bdab61a522e0ce2c3397f80f4fa184d1d42160e..b58e1fe1af90e660b0842ea7e99f07ae6acbb95e 100644
>--- a/Source/JavaScriptCore/parser/NodeConstructors.h
>+++ b/Source/JavaScriptCore/parser/NodeConstructors.h
>@@ -781,6 +781,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 6b37329c09bfc42beccc3caa983597c35402b6c9..5b7741e1ccc8d515ff14c153172d7bda053f5868 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; }
>@@ -1652,6 +1655,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/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
>index 5f4480b49cad5d49156c625fa484af7a1dc8b3cf..a69d41c680edf4f3de8f0d7ad52b61c1d02bcdac 100644
>--- a/Source/JavaScriptCore/parser/Parser.cpp
>+++ b/Source/JavaScriptCore/parser/Parser.cpp
>@@ -329,8 +329,13 @@ bool Parser<LexerType>::allowAutomaticSemicolon()
>     return match(CLOSEBRACE) || match(EOFTOK) || m_lexer->prevTerminator();
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode, FunctionParseType functionParseType)
>+#else
> template <typename LexerType>
> template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode)
>+#endif
> {
>     const unsigned lengthOfUseStrictLiteral = 12; // "use strict".length
>     TreeSourceElements sourceElements = context.createSourceElements();
>@@ -339,7 +344,11 @@ template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceEl
>     unsigned directiveLiteralLength = 0;
>     auto savePoint = createSavePoint();
>     bool hasSetStrict = false;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    while (TreeStatement statement = parseStatement(context, directive, &directiveLiteralLength, functionParseType)) {
>+#else
>     while (TreeStatement statement = parseStatement(context, directive, &directiveLiteralLength)) {
>+#endif
>         if (mode == CheckForStrictMode && !seenNonDirective) {
>             if (directive) {
>                 // "use strict" must be the exact literal without escape sequences or line continuation.
>@@ -571,6 +580,31 @@ template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::create
>     return context.createBindingLocation(token.m_location, name, token.m_startPosition, token.m_endPosition);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseArrowFunctionStatement(TreeBuilder& context)
>+{
>+    ASSERT(match(ARROWFUNCTION));
>+
>+    JSTokenLocation location(tokenLocation());
>+    JSTextPosition start = tokenStartPosition();
>+    JSTextPosition end = tokenEndPosition();
>+
>+    next();
>+    TreeExpression expr = parseArrowFunctionExpression(context);
>+    failIfFalse(expr, "Cannot parse the arrow function expression");
>+    end = lastTokenEndPosition();
>+
>+    bool correcArrowFinish = isEndOfArrowFunction() || match(EOFTOK);
>+    failIfFalse(correcArrowFinish, "Expected a ';', ']', '}', ')', or ',' following a arrow function statement");
>+
>+    end = tokenEndPosition();
>+    setEndOfStatement();
>+
>+    return context.createReturnStatement(location, expr, start, end);
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::tryParseDeconstructionPatternExpression(TreeBuilder& context)
> {
>@@ -1144,8 +1178,13 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseBlockStatemen
>     return result;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength, FunctionParseType type)
>+#else
> template <typename LexerType>
> template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength)
>+#endif
> {
>     DepthManager statementDepth(&m_statementDepth);
>     m_statementDepth++;
>@@ -1154,6 +1193,27 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>     failIfStackOverflow();
>     TreeStatement result = 0;
>     bool shouldSetEndOffset = true;
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool handled = false;
>+    if (type == ArrowFunctionParseType) {
>+        switch (m_token.m_type) {
>+        case CLOSEPAREN:
>+        case CLOSEBRACKET:
>+        case COMMA:
>+        case SEMICOLON: {
>+            result = 0;
>+            handled = true;
>+            break;
>+        }
>+        default:
>+            break;
>+        }
>+
>+        if (handled)
>+            goto endStatemenet;
>+    }
>+#endif
>     switch (m_token.m_type) {
>     case OPENBRACE:
>         result = parseBlockStatement(context);
>@@ -1199,6 +1259,11 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>     case BREAK:
>         result = parseBreakStatement(context);
>         break;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    case ARROWFUNCTION:
>+        result = parseArrowFunctionStatement(context);
>+        break;
>+#endif
>     case RETURN:
>         result = parseReturnStatement(context);
>         break;
>@@ -1240,6 +1305,8 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>         break;
>     }
> 
>+endStatemenet:
>+
>     if (result && shouldSetEndOffset)
>         context.setEndOffset(result, m_lastTokenEndPosition.offset);
>     return result;
>@@ -1260,23 +1327,44 @@ template <class TreeBuilder> TreeFormalParameterList Parser<LexerType>::parseFor
>     return list;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
> template <typename LexerType>
> template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseFunctionBody(
>     TreeBuilder& context, int functionKeywordStart, int functionNameStart, 
>+    int parametersStart, ConstructorKind constructorKind, FunctionParseType parseType)
>+#else
>+template <typename LexerType>
>+template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseFunctionBody(
>+    TreeBuilder& context, int functionKeywordStart, int functionNameStart,
>     int parametersStart, ConstructorKind constructorKind)
>+#endif
> {
>     JSTokenLocation startLocation(tokenLocation());
>     unsigned startColumn = tokenColumn();
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    if (parseType == StandardFunctionParseType) {
>+        next();
>+        if (match(CLOSEBRACE)) {
>+            unsigned endColumn = tokenColumn();
>+            return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind);
>+        }
>+    }
>+#else
>     next();
>-
>     if (match(CLOSEBRACE)) {
>         unsigned endColumn = tokenColumn();
>         return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind);
>     }
>+#endif
>+
>     DepthManager statementDepth(&m_statementDepth);
>     m_statementDepth = 0;
>     typename TreeBuilder::FunctionBodyBuilder bodyBuilder(const_cast<VM*>(m_vm), m_lexer.get());
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode, parseType), parseType == StandardFunctionParseType ? "Cannot parse body of this function" : "Cannot parse body of this arrow function");
>+#else
>     failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode), "Cannot parse body of this function");
>+#endif
>     unsigned endColumn = tokenColumn();
>     return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, functionKeywordStart, functionNameStart, parametersStart, strictMode(), constructorKind);
> }
>@@ -1297,60 +1385,103 @@ static const char* stringForFunctionMode(FunctionParseMode mode)
>     return nullptr;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode,
>+    bool nameIsInContainingScope, ConstructorKind ownerClassKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& info, FunctionParseType parseType)
>+#else
> template <typename LexerType>
> template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuilder& context, FunctionRequirements requirements, FunctionParseMode mode,
>     bool nameIsInContainingScope, ConstructorKind ownerClassKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>& info)
>+#endif
> {
>     AutoPopScopeRef functionScope(this, pushScope());
>     functionScope->setIsFunction();
>     int functionNameStart = m_token.m_location.startOffset;
>     const Identifier* lastFunctionName = m_lastFunctionName;
>     m_lastFunctionName = nullptr;
>-    if (match(IDENT)) {
>-        info.name = m_token.m_data.ident;
>-        m_lastFunctionName = info.name;
>-        next();
>-        if (!nameIsInContainingScope)
>-            failIfFalseIfStrict(functionScope->declareVariable(info.name), "'", info.name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
>-    } else if (requirements == FunctionNeedsName) {
>+    int parametersStart;
>+    bool isClassConstructor;
>+    
>+    if (parseType == StandardFunctionParseType) {
>+        if (match(IDENT)) {
>+            info.name = m_token.m_data.ident;
>+            m_lastFunctionName = info.name;
>+            next();
>+            if (!nameIsInContainingScope)
>+                failIfFalseIfStrict(functionScope->declareVariable(info.name), "'", info.name->impl(), "' is not a valid ", stringForFunctionMode(mode), " name in strict mode");
>+        } else if (requirements == FunctionNeedsName) {
>         if (match(OPENPAREN) && mode == FunctionMode)
>             semanticFail("Function statements must have a name");
>-        semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>-        failDueToUnexpectedToken();
>-        return false;
>-    }
>-    int parametersStart = m_token.m_location.startOffset;
>-    if (!consume(OPENPAREN)) {
>-        semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>-        failWithMessage("Expected an opening '(' before a ", stringForFunctionMode(mode), "'s parameter list");
>-    }
>-
>-    if (mode == GetterMode)
>-        consumeOrFail(CLOSEPAREN, "getter functions must have no parameters");
>-    else if (mode == SetterMode) {
>-        failIfTrue(match(CLOSEPAREN), "setter functions must have one parameter");
>-        auto parameter = parseDeconstructionPattern(context, DeconstructToParameters);
>-        failIfFalse(parameter, "setter functions must have one parameter");
>-        info.parameters = context.createFormalParameterList(parameter);
>-        failIfTrue(match(COMMA), "setter functions must have one parameter");
>-        consumeOrFail(CLOSEPAREN, "Expected a ')' after a parameter declaration");
>-    } else {
>-        if (!match(CLOSEPAREN)) {
>-            info.parameters = parseFormalParameters(context);
>-            failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+            semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>+            failDueToUnexpectedToken();
>+            return false;
>+        }
>+        parametersStart = m_token.m_location.startOffset;
>+        
>+        if (!consume(OPENPAREN)) {
>+            semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>+            failWithMessage("Expected an opening '(' before a ", stringForFunctionMode(mode), "'s parameter list");
>         }
>-        consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
>-    }
> 
>-    matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
>+        if (mode == GetterMode)
>+            consumeOrFail(CLOSEPAREN, "getter functions must have no parameters");
>+        else if (mode == SetterMode) {
>+            failIfTrue(match(CLOSEPAREN), "setter functions must have one parameter");
>+            auto parameter = parseDeconstructionPattern(context, DeconstructToParameters);
>+            failIfFalse(parameter, "setter functions must have one parameter");
>+            info.parameters = context.createFormalParameterList(parameter);
>+            failIfTrue(match(COMMA), "setter functions must have one parameter");
>+            consumeOrFail(CLOSEPAREN, "Expected a ')' after a parameter declaration");
>+        } else {
>+            if (!match(CLOSEPAREN)) {
>+                info.parameters = parseFormalParameters(context);
>+                failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+            }
>+            consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
>+        }
> 
>-    // BytecodeGenerator emits code to throw TypeError when a class constructor is "call"ed.
>-    // Set ConstructorKind to None for non-constructor methods of classes.
>-    bool isClassConstructor = mode == MethodMode && info.name && *info.name == m_vm->propertyNames->constructor;
>-    if (m_defaultConstructorKind != ConstructorKind::None) {
>-        ownerClassKind = m_defaultConstructorKind;
>-        isClassConstructor = true;
>+        matchOrFail(OPENBRACE, "Expected an opening '{' at the start of a ", stringForFunctionMode(mode), " body");
>+        // BytecodeGenerator emits code to throw TypeError when a class constructor is "call"ed.
>+        // Set ConstructorKind to None for non-constructor methods of classes.
>+        isClassConstructor = mode == MethodMode && info.name && *info.name == m_vm->propertyNames->constructor;
>+        if (m_defaultConstructorKind != ConstructorKind::None) {
>+            ownerClassKind = m_defaultConstructorKind;
>+            isClassConstructor = true;
>+        }
>     }
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    if (parseType == ArrowFunctionParseType) {
>+        parametersStart = m_token.m_location.startOffset;
>+        if (!match(IDENT) && !match(OPENPAREN)) {
>+            semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>+            failWithMessage("Expected an arrow function input parameter");
>+        } else {
>+            if (match(OPENPAREN)) {
>+                consume(OPENPAREN);
>+                
>+                if (!match(CLOSEPAREN)) {
>+                    info.parameters = parseFormalParameters(context);
>+                    failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+                }
>+                
>+                consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
>+            } else {
>+                auto parameter = parseDeconstructionPattern(context, DeconstructToParameters);
>+                failIfFalse(parameter, "Cannot parse parameter pattern");
>+                info.parameters = context.createFormalParameterList(parameter);
>+                failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+            }
>+        }
>+        
>+        matchOrFail(ARROWFUNCTION, "Expected a '=>' after arrow function parameter declaration");
>+        isClassConstructor = false;
>+        
>+        info.arrowFunctionOffset = m_token.m_data.offset;
>+    }
>+#endif
>+    
>     ConstructorKind constructorKind = isClassConstructor ? ownerClassKind : ConstructorKind::None;
> 
>     info.openBraceOffset = m_token.m_data.offset;
>@@ -1384,8 +1515,17 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
>         failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
>         
>         info.closeBraceOffset = cachedInfo->closeBraceOffset;
>-
>+        
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (parseType == ArrowFunctionParseType) {
>+            info.arrowFunctionBodyType = cachedInfo->isBodyArrowFunctionBlock ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
>+            m_token = info.arrowFunctionBodyType == ArrowFunctionBodyBlock ? cachedInfo->closeBraceToken() : cachedInfo->endArrowFunctionToken();
>+        } else
>+            m_token = cachedInfo->closeBraceToken();
>+#else   
>         m_token = cachedInfo->closeBraceToken();
>+#endif
>+        
>         if (endColumnIsOnStartLine)
>             m_token.m_location.lineStartOffset = currentLineStartOffset;
> 
>@@ -1394,13 +1534,48 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
> 
>         context.setEndOffset(info.body, m_lexer->currentOffset());
>         
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (parseType == ArrowFunctionParseType) {
>+            if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock)
>+                next();
>+        } else
>+            next();
>+#else
>         next();
>+#endif
>         info.bodyEndLine = m_lastTokenEndPosition.line;
>         return true;
>     }
>+    
>+    
>     m_lastFunctionName = lastFunctionName;
>     ParserState oldState = saveState();
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    if (parseType == ArrowFunctionParseType) {
>+        SavePoint savePoint = createSavePoint();
>+        next();
>+        // Check if arrow body start with {. If it true it mean that arrow function is Fat arrow function
>+        // and we need use common approach to parse function body
>+        info.arrowFunctionBodyType = match(OPENBRACE) ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
>+    
>+        if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock) {
>+            info.openBraceOffset = m_token.m_data.offset;
>+            info.bodyStartLine = tokenLine();
>+            info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
>+        
>+            info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind);
>+        } else {
>+            restoreSavePoint(savePoint);
>+            info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind, ArrowFunctionParseType);
>+        }
>+    } else
>+        info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind);
>+#else
>     info.body = parseFunctionBody(context, functionKeywordStart, functionNameStart, parametersStart, constructorKind);
>+#endif
>+    
>+    
>     restoreState(oldState);
>     failIfFalse(info.body, "Cannot parse the body of this ", stringForFunctionMode(mode));
>     context.setEndOffset(info.body, m_lexer->currentOffset());
>@@ -1431,18 +1606,38 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
>         parameters.closeBraceLine = closeBraceLine;
>         parameters.closeBraceOffset = info.closeBraceOffset;
>         parameters.closeBraceLineStartOffset = closeBraceLineStartOffset;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (parseType == ArrowFunctionParseType) {
>+            parameters.isBodyArrowFunctionBlock = info.arrowFunctionBodyType == ArrowFunctionBodyBlock;
>+            parameters.tokenType = m_token.m_type;
>+        }
>+#endif
>         functionScope->fillParametersForSourceProviderCache(parameters);
>         newInfo = SourceProviderCacheItem::create(parameters);
> 
>     }
>     
>     failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
>+    
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    if (parseType == ArrowFunctionParseType) {
>+        if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock) {
>+            matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
>+            next();
>+        } else
>+            failIfFalse(isEndOfArrowFunction(), "Expected the closing ';' ',' ']' ')' '}' after arrow function");
>+    } else {
>+        matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
>+        next();
>+    }
>+#else
>     matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
>+    next();
>+#endif
>     
>     if (newInfo)
>         m_functionCache->add(info.openBraceOffset, WTF::move(newInfo));
>     
>-    next();
>     info.bodyEndLine = m_lastTokenEndPosition.line;
>     return true;
> }
>@@ -1767,6 +1962,18 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseIfStatement(T
>     return context.createIfStatement(ifLocation, condition, trueBlock, statementStack.last(), start, end);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrowFunctionExpression(TreeBuilder& context)
>+{
>+    failIfStackOverflow();
>+    TreeExpression node = parseAssignmentExpression(context);
>+    failIfFalse(node, "Cannot parse expression");
>+    context.setEndOffset(node, m_lastTokenEndPosition.offset);
>+    return node;
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeExpression Parser<LexerType>::parseExpression(TreeBuilder& context)
> {
>@@ -1814,6 +2021,41 @@ template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmen
>         }
>         restoreSavePoint(savePoint);
>     }
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    SavePoint saveArrowFunctionPoint = createSavePoint();
>+    bool arrowFunctionEmptyList = false;
>+    if (match(OPENPAREN)) {
>+        next();
>+        if (match(CLOSEPAREN)) {
>+            next();
>+
>+            if (match(ARROWFUNCTION))
>+                arrowFunctionEmptyList = true;
>+        }
>+
>+        if (!arrowFunctionEmptyList)
>+            restoreSavePoint(saveArrowFunctionPoint);
>+    }
>+
>+    TreeExpression lhs;
>+    if (!arrowFunctionEmptyList) {
>+        lhs = parseConditionalExpression(context);
>+        failIfFalse(lhs, "Cannot parse expression");
>+        if (initialNonLHSCount != m_nonLHSCount) {
>+            if (m_token.m_type >= EQUAL && m_token.m_type <= OREQUAL)
>+                semanticFail("Left hand side of operator '", getToken(), "' must be a reference");
>+
>+            return lhs;
>+        }
>+    }
>+
>+    if (match(ARROWFUNCTION)) {
>+        restoreSavePoint(saveArrowFunctionPoint);
>+        lhs = parseArrowFunctionWrapper(context);
>+        return lhs;
>+    }
>+#else
>     TreeExpression lhs = parseConditionalExpression(context);
>     failIfFalse(lhs, "Cannot parse expression");
>     if (initialNonLHSCount != m_nonLHSCount) {
>@@ -1822,7 +2064,8 @@ template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmen
> 
>         return lhs;
>     }
>-    
>+#endif
>+
>     int assignmentStack = 0;
>     Operator op;
>     bool hadAssignment = false;
>@@ -2297,6 +2540,23 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePrimaryExpre
>         return context.thisExpr(location, m_thisTDZMode);
>     }
>     case IDENT: {
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        SavePoint saveArrowFunctionPoint = createSavePoint();
>+        JSTextPosition start = tokenStartPosition();
>+        const Identifier* ident = m_token.m_data.ident;
>+        JSTokenLocation location(tokenLocation());
>+        next();
>+
>+        if (!match(ARROWFUNCTION)) {
>+            currentScope()->useVariable(ident, m_vm->propertyNames->eval == *ident);
>+            m_lastIdentifier = ident;
>+            return context.createResolve(location, ident, start);
>+        }
>+
>+        restoreSavePoint(saveArrowFunctionPoint);
>+        TreeExpression lhs = parseArrowFunctionWrapper(context);
>+        return lhs;
>+#else
>         JSTextPosition start = tokenStartPosition();
>         const Identifier* ident = m_token.m_data.ident;
>         JSTokenLocation location(tokenLocation());
>@@ -2304,6 +2564,7 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePrimaryExpre
>         currentScope()->useVariable(ident, m_vm->propertyNames->eval == *ident);
>         m_lastIdentifier = ident;
>         return context.createResolve(location, ident, start);
>+#endif
>     }
>     case STRING: {
>         const Identifier* ident = m_token.m_data.ident;
>@@ -2491,6 +2752,32 @@ endMemberExpression:
>     return base;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrowFunctionWrapper(TreeBuilder& context)
>+{
>+    TreeExpression base = 0;
>+    JSTextPosition expressionStart = tokenStartPosition();
>+    int newCount = 0;
>+    JSTokenLocation location;
>+
>+    if (match(IDENT) || match(OPENPAREN)) {
>+        unsigned functionKeywordStart = tokenStart();
>+        location = tokenLocation();
>+        ParserFunctionInfo<TreeBuilder> info;
>+        info.name = &m_vm->propertyNames->nullIdentifier;
>+        failIfFalse((parseFunctionInfo(context, FunctionNoRequirements, FunctionMode, true, ConstructorKind::None, functionKeywordStart, info, ArrowFunctionParseType)), "Cannot parse arrow function expression");
>+        base = context.createArrowFunctionExpr(location, info);
>+    } else
>+        base = parsePrimaryExpression(context);
>+
>+    failIfFalse(base, "Cannot parse base expression");
>+    while (newCount--)
>+        base = context.createNewExpr(location, base, expressionStart, lastTokenEndPosition());
>+    return base;
>+}
>+#endif
>+
> static const char* operatorString(bool prefix, unsigned tok)
> {
>     switch (tok) {
>diff --git a/Source/JavaScriptCore/parser/Parser.h b/Source/JavaScriptCore/parser/Parser.h
>index 0f2728f8621f8010c410bf7987619bf23e50af8b..1f7d8aa73bcb6e5287a846944b30ccf7e45bdc92 100644
>--- a/Source/JavaScriptCore/parser/Parser.h
>+++ b/Source/JavaScriptCore/parser/Parser.h
>@@ -80,6 +80,9 @@ class SourceCode;
> COMPILE_ASSERT(LastUntaggedToken < 64, LessThan64UntaggedTokens);
> 
> enum SourceElementsMode { CheckForStrictMode, DontCheckForStrictMode };
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+enum FunctionParseType { StandardFunctionParseType, ArrowFunctionParseType };
>+#endif
> enum FunctionRequirements { FunctionNoRequirements, FunctionNeedsName };
> enum FunctionParseMode {
>     FunctionMode,
>@@ -618,6 +621,13 @@ private:
>         return m_token.m_type == IDENT && *m_token.m_data.ident == m_vm->propertyNames->of;
>     }
>     
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ALWAYS_INLINE bool isEndOfArrowFunction()
>+    {
>+        return match(SEMICOLON) || match(COMMA) || match(CLOSEPAREN) || match(CLOSEBRACE) || match(CLOSEBRACKET);
>+    }
>+#endif
>+    
>     ALWAYS_INLINE unsigned tokenStart()
>     {
>         return m_token.m_location.startOffset;
>@@ -721,9 +731,14 @@ private:
>         }
>         return result;
>     }
>-    
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode, FunctionParseType functionParseType = StandardFunctionParseType);
>+    template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0, FunctionParseType functionParseType = StandardFunctionParseType);
>+#else
>     template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode);
>     template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0);
>+#endif
> #if ENABLE(ES6_CLASS_SYNTAX)
>     template <class TreeBuilder> TreeStatement parseClassDeclaration(TreeBuilder&);
> #endif
>@@ -762,19 +777,31 @@ private:
>     template <class TreeBuilder> TreeProperty parseProperty(TreeBuilder&, bool strict);
>     template <class TreeBuilder> TreeExpression parsePropertyMethod(TreeBuilder& context, const Identifier* methodName);
>     template <class TreeBuilder> TreeProperty parseGetterSetter(TreeBuilder&, bool strict, PropertyNode::Type, unsigned getterOrSetterStartOffset, ConstructorKind = ConstructorKind::None, SuperBinding = SuperBinding::NotNeeded);
>-    template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&, int functionKeywordStart, int functionNameStart, int parametersStart, ConstructorKind);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&, int functionKeywordStart, int functionNameStart, int parametersStart, ConstructorKind, FunctionParseType functionParseType = StandardFunctionParseType);
>+#else
>+        template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&, int functionKeywordStart, int functionNameStart, int parametersStart, ConstructorKind);
>+#endif
>     template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
>     enum VarDeclarationListContext { ForLoopContext, VarDeclarationContext };
>     template <class TreeBuilder> TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd, VarDeclarationListContext);
>     template <class TreeBuilder> NEVER_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    template <class TreeBuilder> TreeExpression parseArrowFunctionExpression(TreeBuilder&);
>+    template <class TreeBuilder> TreeStatement parseArrowFunctionStatement(TreeBuilder&);
>+    template <class TreeBuilder> TreeExpression parseArrowFunctionWrapper(TreeBuilder&);
>+#endif
>+
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, DeconstructionKind, const Identifier&, int depth, JSToken);
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, DeconstructionKind, int depth = 0);
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern tryParseDeconstructionPatternExpression(TreeBuilder&);
> 
>-    template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, ConstructorKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>&);
> #if ENABLE(ES6_CLASS_SYNTAX)
>+    template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, ConstructorKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>&, FunctionParseType functionParseType = StandardFunctionParseType);
>     template <class TreeBuilder> NEVER_INLINE TreeClassExpression parseClass(TreeBuilder&, FunctionRequirements, ParserClassInfo<TreeBuilder>&);
>+#else
>+    template <class TreeBuilder> NEVER_INLINE bool parseFunctionInfo(TreeBuilder&, FunctionRequirements, FunctionParseMode, bool nameIsInContainingScope, ConstructorKind, int functionKeywordStart, ParserFunctionInfo<TreeBuilder>&);
> #endif
> 
>     ALWAYS_INLINE int isBinaryOperator(JSTokenType);
>@@ -789,6 +816,14 @@ private:
>         return allowAutomaticSemicolon();
>     }
>     
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    void setEndOfStatement()
>+    {
>+        m_lexer->setTokenPosition(&m_token);
>+    }
>+#endif
>+
>     bool canRecurse()
>     {
>         return m_vm->isSafeToRecurse();
>diff --git a/Source/JavaScriptCore/parser/ParserFunctionInfo.h b/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>index 6b736282e2d2a81bc63dc2f3c0e5ae8c858cd1f8..d752a610a9b6eb0c6a11495465ca7dbd768cd520 100644
>--- a/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>+++ b/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>@@ -28,6 +28,10 @@
> 
> namespace JSC {
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+enum ArrowFunctionBodyType { ArrowFunctionBodyExpression, ArrowFunctionBodyBlock};
>+#endif
>+
> template <class TreeBuilder>
> struct ParserFunctionInfo {
>     const Identifier* name = 0;
>@@ -38,6 +42,11 @@ struct ParserFunctionInfo {
>     int bodyStartLine = 0;
>     int bodyEndLine = 0;
>     unsigned bodyStartColumn = 0;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    unsigned arrowFunctionOffset = 0;
>+    bool isArrowFunction = false;
>+    ArrowFunctionBodyType arrowFunctionBodyType = ArrowFunctionBodyExpression;
>+#endif
> };
> 
> #if ENABLE(ES6_CLASS_SYNTAX)
>diff --git a/Source/JavaScriptCore/parser/ParserTokens.h b/Source/JavaScriptCore/parser/ParserTokens.h
>index 8329f82a9b2ff915d1f241c1f8bffad4247a5f0b..c8b166e0ead7d2da719e76c4a2f09aff1d74d7ac 100644
>--- a/Source/JavaScriptCore/parser/ParserTokens.h
>+++ b/Source/JavaScriptCore/parser/ParserTokens.h
>@@ -75,6 +75,9 @@ enum JSTokenType {
>     FINALLY,
>     DEBUGGER,
>     ELSE,
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ARROWFUNCTION,
>+#endif
> #if ENABLE(ES6_CLASS_SYNTAX)
>     CLASSTOKEN,
>     EXTENDS,
>diff --git a/Source/JavaScriptCore/parser/SourceCode.h b/Source/JavaScriptCore/parser/SourceCode.h
>index 73d23db82af25ea46c0f89785ce424bb60eb61a7..928e712a90e348988bc355489875b09077675523 100644
>--- a/Source/JavaScriptCore/parser/SourceCode.h
>+++ b/Source/JavaScriptCore/parser/SourceCode.h
>@@ -105,6 +105,9 @@ namespace JSC {
>         
>         SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn);
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        SourceCode subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn);
>+#endif
>     private:
>         RefPtr<SourceProvider> m_provider;
>         int m_startChar;
>@@ -118,6 +121,17 @@ namespace JSC {
>         return SourceCode(StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    inline SourceCode SourceCode::subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn)
>+    {
>+        ASSERT(provider()->source()[startArrowFunction] == '=' && provider()->source()[startArrowFunction + 1] == '>');
>+        // Fixme: Use better approach to check symbol
>+        ASSERT(provider()->source()[endArrowFunction - 1] == ',' || provider()->source()[endArrowFunction - 1] == ';' || provider()->source()[endArrowFunction - 1] == ')' || provider()->source()[endArrowFunction - 1] == ']' || provider()->source()[endArrowFunction - 1] == '}');
>+        startColumn += 1; // Convert to base 1.
>+        return SourceCode(provider(), startArrowFunction, endArrowFunction - 1, firstLine, startColumn);
>+    }
>+#endif
>+
>     inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn)
>     {
>         ASSERT(provider()->source()[openBrace] == '{');
>diff --git a/Source/JavaScriptCore/parser/SourceProviderCacheItem.h b/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>index 635379e3f445668c52b872f7616dcb5921a82944..8346485219d0acf6b326972da279721d3655db00 100644
>--- a/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>+++ b/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>@@ -40,6 +40,10 @@ struct SourceProviderCacheItemCreationParameters {
>     bool needsFullActivation;
>     bool usesEval;
>     bool strictMode;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool isBodyArrowFunctionBlock;
>+    JSTokenType tokenType;
>+#endif
>     Vector<RefPtr<StringImpl>> usedVariables;
>     Vector<RefPtr<StringImpl>> writtenVariables;
> };
>@@ -69,6 +73,21 @@ public:
>         return token;
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    JSToken endArrowFunctionToken() const
>+    {
>+        JSToken token;
>+        token.m_type = tokenType;
>+        token.m_data.offset = closeBraceOffset;
>+        token.m_location.startOffset = closeBraceOffset;
>+        token.m_location.endOffset = closeBraceOffset + 1;
>+        token.m_location.line = closeBraceLine;
>+        token.m_location.lineStartOffset = closeBraceLineStartOffset;
>+
>+        return token;
>+    }
>+#endif
>+
>     unsigned functionNameStart : 31;
>     bool needsFullActivation : 1;
>     
>@@ -82,6 +101,11 @@ public:
>     unsigned usedVariablesCount;
>     unsigned writtenVariablesCount;
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool isBodyArrowFunctionBlock;
>+    JSTokenType tokenType;
>+#endif
>+
>     StringImpl** usedVariables() const { return const_cast<StringImpl**>(m_variables); }
>     StringImpl** writtenVariables() const { return const_cast<StringImpl**>(&m_variables[usedVariablesCount]); }
> 
>@@ -115,6 +139,10 @@ inline SourceProviderCacheItem::SourceProviderCacheItem(const SourceProviderCach
>     , closeBraceLineStartOffset(parameters.closeBraceLineStartOffset)
>     , usedVariablesCount(parameters.usedVariables.size())
>     , writtenVariablesCount(parameters.writtenVariables.size())
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    , isBodyArrowFunctionBlock(parameters.isBodyArrowFunctionBlock)
>+    , tokenType(parameters.tokenType)
>+#endif
> {
>     unsigned j = 0;
>     for (unsigned i = 0; i < usedVariablesCount; ++i, ++j) {
>diff --git a/Source/JavaScriptCore/parser/SyntaxChecker.h b/Source/JavaScriptCore/parser/SyntaxChecker.h
>index 8e4f61b949890b9bf54029e96661eef53a17b584..5f8e211ee4b53b394eb5ae2190b83c8c4f844cfd 100644
>--- a/Source/JavaScriptCore/parser/SyntaxChecker.h
>+++ b/Source/JavaScriptCore/parser/SyntaxChecker.h
>@@ -170,6 +170,10 @@ public:
> #endif
>     ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
>     int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, int, int, int, ConstructorKind) { return FunctionBodyResult; }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ExpressionType createArrowFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&) { return FunctionExpr; }
>+#endif 
>+    void setFunctionNameStart(int, int) { }
>     int createArguments() { return ArgumentsResult; }
>     int createArguments(int) { return ArgumentsResult; }
>     ExpressionType createSpreadExpression(const JSTokenLocation&, ExpressionType, int, int, int) { return SpreadExpr; }
>diff --git a/Source/JavaScriptCore/runtime/JSArrowFunction.cpp b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..2cdb3df0d7052e88f9a0e09257fd9edcbc93043a
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.cpp
>@@ -0,0 +1,75 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#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) };
>+
>+void JSArrowFunction::destroy(JSCell* cell)
>+{
>+    static_cast<JSArrowFunction*>(cell)->JSArrowFunction::~JSArrowFunction();
>+}
>+
>+JSArrowFunction::JSArrowFunction(VM& vm, JSScope* scope, FunctionExecutable* executable, Structure* structure)
>+    : Base(vm, executable, scope, structure)
>+{
>+}
>+    
>+void JSArrowFunction::finishCreation(VM& vm)
>+{
>+    Base::finishCreation(vm);
>+// Prototype of arrow function is undefined
>+    putDirect(vm, vm.propertyNames->prototype, jsUndefined(), 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);
>+}
>+    
>+ConstructType JSArrowFunction::getConstructData(JSCell* cell, ConstructData& constructData)
>+{
>+    JSFunction* thisObject = jsCast<JSFunction*>(cell);
>+        
>+    constructData.js.functionExecutable = thisObject->jsExecutable();
>+    constructData.js.scope = thisObject->scope();
>+    return ConstructTypeNone;
>+}
>+} // namespace JSC
>diff --git a/Source/JavaScriptCore/runtime/JSArrowFunction.h b/Source/JavaScriptCore/runtime/JSArrowFunction.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..f109a4a2b519f5abc25ad36f0f25c4093581dc91
>--- /dev/null
>+++ b/Source/JavaScriptCore/runtime/JSArrowFunction.h
>@@ -0,0 +1,71 @@
>+/*
>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#ifndef JSArrowFunction_h
>+#define JSArrowFunction_h
>+
>+#include "JSFunction.h"
>+#include "JSGlobalObject.h"
>+
>+namespace JSC {
>+
>+class JSArrowFunction : public JSFunction {
>+public:
>+    typedef JSFunction Base;
>+        
>+    static JSArrowFunction* create(VM& vm, JSScope* scope, FunctionExecutable* executable, JSGlobalObject* globalObject)
>+    {
>+        JSArrowFunction* function = new (NotNull, allocateCell<JSArrowFunction>(vm.heap)) JSArrowFunction(vm, scope, executable, globalObject->arrowFunctionStructure());
>+        ASSERT(function->structure()->globalObject());
>+        function->finishCreation(vm);
>+        return function;
>+    }
>+    
>+    static void destroy(JSCell*);
>+        
>+    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&);
>+        
>+    DECLARE_INFO;
>+
>+protected:
>+    const static unsigned StructureFlags = OverridesHasInstance | Base::StructureFlags;
>+        
>+    static void visitChildren(JSCell*, SlotVisitor&);
>+        
>+private:
>+    JSArrowFunction(VM&, JSScope*, FunctionExecutable*, Structure*);
>+
>+    void finishCreation(VM&);
>+};
>+    
>+} // namespace JSC
>+
>+#endif // JSArrowFunction_h
>diff --git a/Source/JavaScriptCore/runtime/JSFunction.h b/Source/JavaScriptCore/runtime/JSFunction.h
>index 9ab9dc2777babf896381dcf402c013090f95e30c..3a0ae01135bcb9640b0502a31651af8fcaa2c4ad 100644
>--- a/Source/JavaScriptCore/runtime/JSFunction.h
>+++ b/Source/JavaScriptCore/runtime/JSFunction.h
>@@ -132,6 +132,9 @@ 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 37b281aa5d0c1b86164519fd7c566e37f0f13401..7b3490beb94a3593ee17bc3b16b32c7dfaf9573d 100644
>--- a/Source/JavaScriptCore/runtime/JSFunctionInlines.h
>+++ b/Source/JavaScriptCore/runtime/JSFunctionInlines.h
>@@ -38,6 +38,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_allocationProfileWatchpoint(ClearWatchpoint)
>+{
>+}
>+#endif
>+    
> inline FunctionExecutable* JSFunction::jsExecutable() const
> {
>     ASSERT(!isHostFunctionNonInline());
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>index d39618ab7eaf55974daac23b81333eb0051ebe73..f941ad187968bcd87e2f49c8b7875054dc7d6047 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
>@@ -62,6 +62,9 @@
> #include "JSArrayBufferPrototype.h"
> #include "JSArrayIterator.h"
> #include "JSBoundFunction.h"
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+#include "JSArrowFunction.h"
>+#endif
> #include "JSCInlines.h"
> #include "JSCallbackConstructor.h"
> #include "JSCallbackFunction.h"
>@@ -233,6 +236,9 @@ void JSGlobalObject::init(VM& vm)
>     exec->setCallee(m_globalCallee.get());
> 
>     m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    m_arrowFunctionStructure.set(vm, this, JSArrowFunction::createStructure(vm, this, m_functionPrototype.get()));
>+#endif
>     m_boundFunctionStructure.set(vm, this, JSBoundFunction::createStructure(vm, this, m_functionPrototype.get()));
>     m_namedFunctionStructure.set(vm, this, Structure::addPropertyTransition(vm, m_functionStructure.get(), vm.propertyNames->name, DontDelete | ReadOnly | DontEnum, m_functionNameOffset));
>     m_internalFunctionStructure.set(vm, this, InternalFunction::createStructure(vm, this, m_functionPrototype.get()));
>@@ -725,6 +731,9 @@ void JSGlobalObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
>     visitor.append(&thisObject->m_calleeStructure);
>     visitor.append(&thisObject->m_functionStructure);
>     visitor.append(&thisObject->m_boundFunctionStructure);
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    visitor.append(&thisObject->m_arrowFunctionStructure);
>+#endif
>     visitor.append(&thisObject->m_namedFunctionStructure);
>     visitor.append(&thisObject->m_symbolObjectStructure);
>     visitor.append(&thisObject->m_regExpMatchesArrayStructure);
>diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.h b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>index 74966b7bd06bacd8661c9bf4abe45ceb3b5118b4..817f257660700799018614a0296abc3c95302591 100644
>--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
>+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
>@@ -225,6 +225,9 @@ protected:
>     WriteBarrier<Structure> m_calleeStructure;
>     WriteBarrier<Structure> m_functionStructure;
>     WriteBarrier<Structure> m_boundFunctionStructure;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    WriteBarrier<Structure> m_arrowFunctionStructure;
>+#endif
>     WriteBarrier<Structure> m_namedFunctionStructure;
>     PropertyOffset m_functionNameOffset;
>     WriteBarrier<Structure> m_privateNameStructure;
>@@ -456,6 +459,9 @@ public:
>     Structure* calleeStructure() const { return m_calleeStructure.get(); }
>     Structure* functionStructure() const { return m_functionStructure.get(); }
>     Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    Structure* arrowFunctionStructure() const { return m_arrowFunctionStructure.get(); }
>+#endif
>     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-lexicalthis.js b/Source/JavaScriptCore/tests/stress/arrowfunction-lexicalthis.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..612fbaf804482c7761c37dd693a8485e5511573e
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-lexicalthis.js
>@@ -0,0 +1,31 @@
>+var result;
>+
>+ 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");
>+
>+
>+// Fixme: following test fails in dfg-eager-no-cjit-validate & ftl-eager-no-cjit mode
>+var real = {borrow: obj.method};
>+testCase(real.borrow()() === real, true, "Error: this is not lexically binded inside of the arrow function #5");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction-others.js b/Source/JavaScriptCore/tests/stress/arrowfunction-others.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..ebbf859e203eb1f54acae1d4083ca3dd3dc9761f
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction-others.js
>@@ -0,0 +1,30 @@
>+var result;
>+
>+ var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var simpleArrowFunction = () => {};
>+
>+testCase(typeof simpleArrowFunction, "function", "Error: Not correct type of the arrow function");
>+
>+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");
>+
>+testCase(typeof simpleArrowFunction.prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function");
>+
>+var errorOnCreate = false;
>+
>+try {
>+  var fc = new simpleArrowFunction();
>+}
>+catch (e) {
>+  errorOnCreate = true;
>+}
>+
>+testCase(errorOnCreate, true, "Error: No error during run new ArrowFunction");
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction.js b/Source/JavaScriptCore/tests/stress/arrowfunction.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..0687b3aab1d27f453f90761cec1ad4d05cf03b35
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction.js
>@@ -0,0 +1,154 @@
>+var result;
>+
>+ var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+var arrowFunction0 = v => v + 1;
>+result = arrowFunction0(10);
>+testCase(result, 11 ,"Error: Not correct execution of the arrow function: v => v + 1");
>+
>+var arrowFunction1 = (v) => v * 2;
>+result = arrowFunction1(10);
>+testCase(result, 20 ,"Error: Not correct execution of the arrow function: (v) => v + 1");
>+
>+var arrowFunction2 = () => 1000;
>+result = arrowFunction2(1212);
>+testCase(result, 1000 ,"Error: Not correct execution of the arrow function: () => 1000");
>+
>+var tmpVarialve2_1 = 151;
>+var arrowFunction2_1 = () => tmpVarialve2_1;
>+result = arrowFunction2_1(121);
>+testCase(result, tmpVarialve2_1 ,"Error: Not correct execution of the arrow function: () => variable");
>+
>+var arrowFunction3 = (v, x) => v + x;
>+result = arrowFunction3(11,12);
>+testCase(result, 23 ,"Error: Not correct execution of the arrow function: (x, y) => x + y");
>+
>+var arrowFunctionWrapper = function (cl, paramter) { return cl(paramter); };
>+
>+result = arrowFunctionWrapper(x => 1234);
>+testCase(result, 1234 ,"Error: Not correct execution of the arrow function as paramter: f(x => c)");
>+
>+ result = arrowFunctionWrapper(x => 1234, 2345);
>+testCase(result, 1234 ,"Error: Not correct execution of the arrow function as paramter: f(x => c, y)");
>+
>+ result = arrowFunctionWrapper(x => 121 + 232);
>+testCase(result, 353 ,"Error: Not correct execution of the arrow function as paramter: f(x => c1 + c2)");
>+
>+ result = arrowFunctionWrapper(x => 123 + 321, 9999);
>+testCase(result, 444 ,"Error: Not correct execution of the arrow function as paramter: f(x => c1 + c2, y)");
>+
>+ result = arrowFunctionWrapper(x => x + 12, 21);
>+testCase(result, 33 ,"Error: Not correct execution of the arrow function as paramter: f(x => x + c1, y)");
>+
>+ result = arrowFunctionWrapper((x) => x + 21, 32);
>+testCase(result, 53, "Error: Not correct execution of the arrow function as paramter: f((x) => c1 + c2, y)");
>+
>+ result = arrowFunctionWrapper(() => 100);
>+testCase(result, 100, "Error: Not correct execution of the arrow function as paramter: f(() => c)");
>+
>+ var ext_value = 121;
>+result = arrowFunctionWrapper(() => ext_value);
>+testCase(result, 121, "Error: Not correct execution of the arrow function as paramter: f(() => v)");
>+
>+ result = arrowFunctionWrapper(() => ext_value * 10);
>+testCase(result, 1210 ,"Error: Not correct execution of the arrow function as paramter: f(() => v*x)");
>+
>+ result = arrowFunctionWrapper((x) => ext_value * x, 30);
>+testCase(result, 30*ext_value ,"Error: Not correct execution of the arrow function as paramter: f((x) => v*x, y)");
>+
>+ result = arrowFunctionWrapper(() => 100, 11);
>+testCase(result, 100 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1, y)");
>+
>+ result = arrowFunctionWrapper(() => 100 + 10);
>+testCase(result, 110 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1 + c2)");
>+
>+ result = arrowFunctionWrapper(() => 100 + 11, 12);
>+testCase(result, 111 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1 + c2, y)");
>+
>+ var arrowFunction4 = v => v + 1, xyz1 = 10101;
>+result = arrowFunction4(1011);
>+testCase(result, 1012 ,"Error: Not correct parsing of th arrow function inside of the list of vars: var af = v=> v + 1; zxc=c;");
>+testCase(xyz1, 10101 ,"Error: Not correct parsing of th arrow function inside of the list of vars: var af = v=> v + 1; zxc=c;");
>+
>+ var arrowFunctionWrapper2 = function (cl, paramter1, paramter2) { return cl(paramter1, paramter2); };
>+result = arrowFunctionWrapper2((x, y) => x + y, 12 ,43);
>+testCase(result, 55 ,"Error: Not correct execution of the arrow function as parameter: f((x, y) => x + y, c1, c2)");
>+
>+ var arrowFunctioArray0 = [v => v * 10];
>+result = arrowFunctioArray0[0](10);
>+testCase(result, 100 ,"Error: Not correct execution of the arrow function as item in array: [v=>v*10]");
>+
>+ var arrowFunctioArray1 = [v => v + 1, v => v + 2];
>+result = arrowFunctioArray1[0](10);
>+testCase(result, 11 ,"Error: Not correct execution of the arrow function as item in array: [v => v + 1,  v => v + 2]");
>+result = arrowFunctioArray1[1](11);
>+testCase(result, 13 ,"Error: Not correct execution of the arrow function as item in array: [v => v + 1,  v => v + 2]");
>+
>+ var arrowFunctioArray2 = [(v) => v + 1, (v) => v + 2];
>+result = arrowFunctioArray2[0](11);
>+testCase(result, 12 ,"Error: Not correct execution of the arrow function as item in array: [(v) => v + 1,  (v) => v + 2]");
>+result = arrowFunctioArray2[1](11);
>+testCase(result, 13 ,"Error: Not correct execution of the arrow function as item in array: [(v) => v + 1,  (v) => v + 2]");
>+
>+ var arrowFunctioArray3 = [() => 101, () => 12323];
>+result = arrowFunctioArray3[0](11);
>+testCase(result, 101, "Error: Not correct execution of the arrow function as item in array: [() => c1,  () => c2]");
>+result = arrowFunctioArray3[1](11);
>+testCase(result, 12323, "Error: Not correct execution of the arrow function as item in array: [() => c1,  () => c2]");
>+
>+var arrowFunctionObj = {func : y => y + 12};
>+result = arrowFunctionObj.func(11);
>+testCase(result, 23 , "Error: Not correct execution of the arrow function as property: {func : y => y + 12 }");
>+
>+var afObjLexBind2 = function () {
>+  this.func = () => this;
>+};
>+
>+var arrowFatFunction0 = () => { return 1000; };
>+result = arrowFatFunction0(11);
>+testCase(result, 1000 ,"Error: Not correct execution of the arrow function with body as block: () => { return 1000; }");
>+
>+var arrowFatFunction1 = v => { var intval = 100; return v * intval; };
>+result = arrowFatFunction1(11);
>+testCase(result, 1100 ,"Error: Not correct execution of the arrow function with body as block: x => { var v=1000; return v*x; }");
>+
>+var arrowFatFunction2 = (v) => { var int = 200; return v * int; };
>+result = arrowFatFunction2(11);
>+testCase(result, 2200 ,"Error: Not correct execution of the arrow function with body as block: (x) => { var v=1000; return v*x; }");
>+
>+var arrowFatFunction3 = (v, x) => { var result = x * v; return result; };
>+result = arrowFatFunction3(11, 12222);
>+testCase(result, 134442 ,"Error: Not correct execution of the arrow function with body as block: (v, x) => { var result = x * v; return result; }");
>+
>+result = arrowFunctionWrapper(x=>{return x * 25;}, 121);
>+testCase(result, 25*121 ,"Error: Not correct execution of the arrow function with body as block: f(x => {return x * 25;}, 121)");
>+
>+result = arrowFunctionWrapper2((x, y)=>{return x * y;}, 14, 12);
>+testCase(result, 14*12 ,"Error: Not correct execution of the arrow function with body as block: f((x, y)=>{return x * y;}, 14, 121))");
>+
>+var simpleArrowFunction = () => {};
>+
>+testCase(typeof simpleArrowFunction, "function", "Error: Not correct type of the arrow function");
>+
>+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");
>+
>+testCase(typeof simpleArrowFunction.prototype === 'undefined', true, "Error: Not correct result for prototype of arrow function");
>+
>+var errorOnCreate = false;
>+
>+try {
>+  var fc = new simpleArrowFunction();
>+}
>+catch (e) {
>+  errorOnCreate = true;
>+}
>+
>+testCase(errorOnCreate, true, "Error: No error during run new ArrowFunction");
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index 8b112fae45b957dd2641fdb6f4689880589af860..1148a76972f114c383d32629f1f093c68550a051 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ENABLE_ES6_CLASS_SYNTAX;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
>@@ -214,4 +215,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index 8b112fae45b957dd2641fdb6f4689880589af860..1148a76972f114c383d32629f1f093c68550a051 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ENABLE_ES6_CLASS_SYNTAX;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
>@@ -214,4 +215,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index 8b112fae45b957dd2641fdb6f4689880589af860..1148a76972f114c383d32629f1f093c68550a051 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ENABLE_ES6_CLASS_SYNTAX;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
>@@ -214,4 +215,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(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_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 32c235d98b5a420ebe334834c7b6a4182b22220a..a67537145627cd38a27079cd5dfe98682c91f465 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -28,6 +28,7 @@ macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_ES6_CLASS_SYNTAX "Toggle ES6 class syntax support" ON)
>+    WEBKIT_OPTION_DEFINE(ENABLE_ES6_ARROWFUNCTION_SYNTAX "Toggle ES6 arrow function syntax support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 21d3fcc5d983f9595def3510568cdc98965246ed..cf1afe56c5f0f26099090e51b7b2a6603ea07321 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -13,6 +13,7 @@
> #cmakedefine01 ENABLE_CANVAS_PROXY
> #cmakedefine01 ENABLE_CHANNEL_MESSAGING
> #cmakedefine01 ENABLE_ES6_CLASS_SYNTAX
>+#cmakedefine01 ENABLE_ES6_ARROWFUNCTION_SYNTAX
> #cmakedefine01 ENABLE_CONTENT_FILTERING
> #cmakedefine01 ENABLE_CONTEXT_MENUS
> #cmakedefine01 ENABLE_CREDENTIAL_STORAGE
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 16fd649c68d6b3d43d0b31e3357904fc8724a7eb..223b311bcfbab2c268a7f2652d14ed19637fdfce 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -44,6 +44,7 @@ BEGIN {
> my (
>     $threeDRenderingSupport,
>     $accelerated2DCanvasSupport,
>+    $arrowfunctionSyntax,
>     $batteryStatusSupport,
>     $canvasPathSupport,
>     $canvasProxySupport,
>@@ -154,6 +155,9 @@ my @features = (
>     { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
>       define => "ENABLE_ACCELERATED_2D_CANVAS", default => isGtk(), value => \$accelerated2DCanvasSupport },
> 
>+    { option => "arrowfunction-syntax", desc => "Toggle ES6 arrow function syntax support",
>+      define => "ENABLE_ES6_ARROWFUNCTION_SYNTAX", default => 1, value => \$arrowfunctionSyntax },
>+
>     { option => "battery-status", desc => "Toggle Battery Status support",
>       define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
> 
>diff --git a/ChangeLog b/ChangeLog
>index 4ed86a6f8898d31e38050b32a54ca76be1d616df..e91c7ca200be714c6899657e96c252b0d09eda49 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2015-04-01   Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+        [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag to switch on/off es6 arrow function ENABLE_ES6_ARROWFUNCTION_SYNTAX
>+
>+         * Source/cmake/WebKitFeatures.cmake:
>+         * Source/cmakeconfig.h.cmake:
>+
> 2015-03-29  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
> 
>         [CMake] Update old CMakeList.txt in gtest

Actions: View | Formatted Diff | Diff

Attachments on bug 140855: 247543 | 247579 | 247598 | 247599 | 247600 | 247601 | 247886 | 247894 | 247906 | 247909 | 247934 | 248363 | 248414 | 249479 | 249529 | 249563 | 249565 | 249587 | 249664 | 249862 | 249940 | 249942 | 249946 | 249965 | 249966 | 249967 | 249968 | 250421 | 250425 | 250430 | 250437 | 250438 | 250618 | 250626 | 250628 | 250629 | 250633 | 250643 | 250647 | 250649 | 250651 | 250656 | 250911 | 250912 | 251029 | 251037 | 251050 | 251055 | 251056 | 251057 | 251059 | 251061 | 251063 | 251129 | 252149 | 252164 | 252174 | 252175 | 252184 | 252189 | 252191 | 252199 | 252201 | 252204 | 252205 | 252411 | 252412 | 252416 | 252606 | 252633 | 252637