<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194835] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194835">194835</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-10 17:38:36 -0800 (Sun, 10 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Arrow function syntax. Get rid of JSArrowFunction and use standard JSFunction class
https://bugs.webkit.org/show_bug.cgi?id=149855
Patch by Skachkov Oleksandr <gskachkov@gmail.com> on 2016-01-10
Reviewed by Saam Barati.
JSArrowFunction.h/cpp were removed from JavaScriptCore, because now is used new approach for storing
'this', 'arguments' and 'super'
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileNewFunction):
* dfg/DFGStructureRegistrationPhase.cpp:
(JSC::DFG::StructureRegistrationPhase::run):
* ftl/FTLAbstractHeapRepository.cpp:
* ftl/FTLAbstractHeapRepository.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileNewFunction):
* interpreter/Interpreter.cpp:
* interpreter/Interpreter.h:
* jit/JITOpcodes.cpp:
* jit/JITOpcodes32_64.cpp:
* jit/JITOperations.cpp:
* jit/JITOperations.h:
* llint/LLIntOffsetsExtractor.cpp:
* llint/LLIntSlowPaths.cpp:
* runtime/JSArrowFunction.cpp: Removed.
* runtime/JSArrowFunction.h: Removed.
* runtime/JSGlobalObject.cpp:
* runtime/JSGlobalObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh">trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodescpp">trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOpcodes32_64cpp">trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationsh">trunk/Source/JavaScriptCore/jit/JITOperations.h</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntOffsetsExtractorcpp">trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrowFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSArrowFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrowFunctionh">trunk/Source/JavaScriptCore/runtime/JSArrowFunction.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -634,7 +634,6 @@
</span><span class="cx"> runtime/JSArrayBufferPrototype.cpp
</span><span class="cx"> runtime/JSArrayBufferView.cpp
</span><span class="cx"> runtime/JSArrayIterator.cpp
</span><del>- runtime/JSArrowFunction.cpp
</del><span class="cx"> runtime/JSBoundFunction.cpp
</span><span class="cx"> runtime/JSCJSValue.cpp
</span><span class="cx"> runtime/JSCallee.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-01-10 Skachkov Oleksandr <gskachkov@gmail.com>
+
+ [ES6] Arrow function syntax. Get rid of JSArrowFunction and use standard JSFunction class
+ https://bugs.webkit.org/show_bug.cgi?id=149855
+
+ Reviewed by Saam Barati.
+
+ JSArrowFunction.h/cpp were removed from JavaScriptCore, because now is used new approach for storing
+ 'this', 'arguments' and 'super'
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileNewFunction):
+ * dfg/DFGStructureRegistrationPhase.cpp:
+ (JSC::DFG::StructureRegistrationPhase::run):
+ * ftl/FTLAbstractHeapRepository.cpp:
+ * ftl/FTLAbstractHeapRepository.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileNewFunction):
+ * interpreter/Interpreter.cpp:
+ * interpreter/Interpreter.h:
+ * jit/JITOpcodes.cpp:
+ * jit/JITOpcodes32_64.cpp:
+ * jit/JITOperations.cpp:
+ * jit/JITOperations.h:
+ * llint/LLIntOffsetsExtractor.cpp:
+ * llint/LLIntSlowPaths.cpp:
+ * runtime/JSArrowFunction.cpp: Removed.
+ * runtime/JSArrowFunction.h: Removed.
+ * runtime/JSGlobalObject.cpp:
+ * runtime/JSGlobalObject.h:
+
</ins><span class="cx"> 2016-01-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> It should be possible to run liveness over registers without also tracking Tmps
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -799,7 +799,6 @@
</span><span class="cx"> <ClCompile Include="..\runtime\JSArrayBufferPrototype.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSArrayBufferView.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSBoundFunction.cpp" />
</span><del>- <ClCompile Include="..\runtime\JSArrowFunction.cpp" />
</del><span class="cx"> <ClCompile Include="..\runtime\JSCJSValue.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSCallee.cpp" />
</span><span class="cx"> <ClCompile Include="..\runtime\JSCell.cpp" />
</span><span class="lines">@@ -1675,7 +1674,6 @@
</span><span class="cx"> <ClInclude Include="..\runtime\JSArrayBufferViewInlines.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSArrayIterator.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSBoundFunction.h" />
</span><del>- <ClInclude Include="..\runtime\JSArrowFunction.h" />
</del><span class="cx"> <ClInclude Include="..\runtime\JSCInlines.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSCJSValue.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSCJSValueInlines.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1973,7 +1973,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGClobbersExitState.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGInsertionSet.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGNodeOrigin.cpp" />
</span><del>- <ClCompile Include="..\runtime\JSArrowFunction.cpp" />
</del><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span><span class="lines">@@ -2975,9 +2974,6 @@
</span><span class="cx"> <ClInclude Include="..\runtime\JSArray.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\runtime\JSArrowFunction.h">
- <Filter>runtime</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\runtime\JSBoundFunction.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1386,8 +1386,6 @@
</span><span class="cx"> 86F3EEBF168CDE930077B92A /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 86F3EEB616855A5B0077B92A /* ObjcRuntimeExtras.h */; };
</span><span class="cx"> 86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */; };
</span><span class="cx"> 86FA9E92142BBB2E001773B7 /* JSBoundFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */; };
</span><del>- 8B0F424C1ABD6DE2003917EA /* JSArrowFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8B0F424B1ABD6DE2003917EA /* JSArrowFunction.cpp */; };
- 8B14186D1B62527F00FB2068 /* JSArrowFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0F424A1ABD6D2F003917EA /* JSArrowFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 90213E3D123A40C200D422F3 /* MemoryStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */; };
</span><span class="cx"> 90213E3E123A40C200D422F3 /* MemoryStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 90213E3C123A40C200D422F3 /* MemoryStatistics.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 93052C340FB792190048FDC3 /* ParserArena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93052C320FB792190048FDC3 /* ParserArena.cpp */; };
</span><span class="lines">@@ -3556,8 +3554,6 @@
</span><span class="cx"> 86F75EFD151C062F007C9BA3 /* RegExpMatchesArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExpMatchesArray.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBoundFunction.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBoundFunction.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> 90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryStatistics.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 90213E3C123A40C200D422F3 /* MemoryStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryStatistics.h; sourceTree = "<group>"; };
</span><span class="cx"> 93052C320FB792190048FDC3 /* ParserArena.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParserArena.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5632,8 +5628,6 @@
</span><span class="cx"> 0F2B66BC17B6B5AB00A7AE3F /* JSArrayBufferViewInlines.h */,
</span><span class="cx"> A7BDAEC417F4EA1400F6140C /* JSArrayIterator.cpp */,
</span><span class="cx"> A7BDAEC517F4EA1400F6140C /* JSArrayIterator.h */,
</span><del>- 8B0F424B1ABD6DE2003917EA /* JSArrowFunction.cpp */,
- 8B0F424A1ABD6D2F003917EA /* JSArrowFunction.h */,
</del><span class="cx"> 86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
</span><span class="cx"> 86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
</span><span class="cx"> 657CF45619BF6662004ACBF2 /* JSCallee.cpp */,
</span><span class="lines">@@ -7542,7 +7536,6 @@
</span><span class="cx"> 0F2B66E917B6B5AB00A7AE3F /* JSArrayBufferView.h in Headers */,
</span><span class="cx"> 0F2B66EA17B6B5AB00A7AE3F /* JSArrayBufferViewInlines.h in Headers */,
</span><span class="cx"> A7BDAECB17F4EA1400F6140C /* JSArrayIterator.h in Headers */,
</span><del>- 8B14186D1B62527F00FB2068 /* JSArrowFunction.h in Headers */,
</del><span class="cx"> BC18C4180E16F5CD00B34460 /* JSBase.h in Headers */,
</span><span class="cx"> 140D17D70E8AD4A9000CD17D /* JSBasePrivate.h in Headers */,
</span><span class="cx"> 86FA9E92142BBB2E001773B7 /* JSBoundFunction.h in Headers */,
</span><span class="lines">@@ -9012,7 +9005,6 @@
</span><span class="cx"> 0F2B66E617B6B5AB00A7AE3F /* JSArrayBufferPrototype.cpp in Sources */,
</span><span class="cx"> 0F2B66E817B6B5AB00A7AE3F /* JSArrayBufferView.cpp in Sources */,
</span><span class="cx"> A7BDAECA17F4EA1400F6140C /* JSArrayIterator.cpp in Sources */,
</span><del>- 8B0F424C1ABD6DE2003917EA /* JSArrowFunction.cpp in Sources */,
</del><span class="cx"> 1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */,
</span><span class="cx"> 86FA9E91142BBB2E001773B7 /* JSBoundFunction.cpp in Sources */,
</span><span class="cx"> 1440F8AF0A508D200005F061 /* JSCallbackConstructor.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1759,7 +1759,7 @@
</span><span class="cx">
</span><span class="cx"> case NewArrowFunction:
</span><span class="cx"> forNode(node).set(
</span><del>- m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->arrowFunctionStructure());
</del><ins>+ m_graph, m_codeBlock->globalObjectFor(node->origin.semantic)->functionStructure());
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case NewGeneratorFunction:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include "JITMulGenerator.h"
</span><span class="cx"> #include "JITRightShiftGenerator.h"
</span><span class="cx"> #include "JITSubGenerator.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSEnvironmentRecord.h"
</span><span class="cx"> #include "JSGeneratorFunction.h"
</span><span class="lines">@@ -5409,42 +5408,17 @@
</span><span class="cx"> ASSERT(nodeType == NewFunction || nodeType == NewArrowFunction || nodeType == NewGeneratorFunction);
</span><span class="cx">
</span><span class="cx"> SpeculateCellOperand scope(this, node->child1());
</span><del>-#if USE(JSVALUE64)
- GPRReg thisValueGPR;
-#else
- GPRReg thisValuePayloadGPR;
- GPRReg thisValueTagGPR;
-#endif
</del><span class="cx"> GPRReg scopeGPR = scope.gpr();
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = node->castOperand<FunctionExecutable*>();
</span><span class="cx">
</span><del>- if (nodeType == NewArrowFunction) {
-#if USE(JSVALUE64)
- SpeculateCellOperand thisValue(this, node->child2());
- thisValueGPR = thisValue.gpr();
-#else
- JSValueOperand thisValue(this, node->child2(), ManualOperandSpeculation);
- thisValuePayloadGPR = thisValue.payloadGPR();
- thisValueTagGPR = thisValue.tagGPR();
-
- DFG_TYPE_CHECK(thisValue.jsValueRegs(), node->child2(), SpecCell, m_jit.branchIfNotCell(thisValue.jsValueRegs()));
-#endif
- }
-
</del><span class="cx"> if (executable->singletonFunction()->isStillValid()) {
</span><span class="cx"> GPRFlushedCallResult result(this);
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx">
</span><span class="cx"> flushRegisters();
</span><del>-
- if (nodeType == NewArrowFunction)
-#if USE(JSVALUE64)
- callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueGPR);
-#else
- callOperation(operationNewArrowFunction, resultGPR, scopeGPR, executable, thisValueTagGPR, thisValuePayloadGPR);
-#endif
- else if (nodeType == NewGeneratorFunction)
</del><ins>+
+ if (nodeType == NewGeneratorFunction)
</ins><span class="cx"> callOperation(operationNewGeneratorFunction, resultGPR, scopeGPR, executable);
</span><span class="cx"> else
</span><span class="cx"> callOperation(operationNewFunction, resultGPR, scopeGPR, executable);
</span><span class="lines">@@ -5454,7 +5428,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* structure =
</span><del>- nodeType == NewArrowFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->arrowFunctionStructure() :
</del><span class="cx"> nodeType == NewGeneratorFunction ? m_jit.graph().globalObjectFor(node->origin.semantic)->generatorFunctionStructure() :
</span><span class="cx"> m_jit.graph().globalObjectFor(node->origin.semantic)->functionStructure();
</span><span class="cx">
</span><span class="lines">@@ -5468,7 +5441,7 @@
</span><span class="cx">
</span><span class="cx"> JITCompiler::JumpList slowPath;
</span><span class="cx">
</span><del>- if (nodeType == NewFunction) {
</del><ins>+ if (nodeType == NewFunction || nodeType == NewArrowFunction) {
</ins><span class="cx"> compileNewFunctionCommon<JSFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSFunction::allocationSize(0), executable, JSFunction::offsetOfScopeChain(), JSFunction::offsetOfExecutable(), JSFunction::offsetOfRareData());
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(slowPathCall(slowPath, this, operationNewFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable));
</span><span class="lines">@@ -5479,19 +5452,6 @@
</span><span class="cx">
</span><span class="cx"> addSlowPathGenerator(slowPathCall(slowPath, this, operationNewGeneratorFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable));
</span><span class="cx"> }
</span><del>-
- if (nodeType == NewArrowFunction) {
- compileNewFunctionCommon<JSArrowFunction>(resultGPR, structure, scratch1GPR, scratch2GPR, scopeGPR, slowPath, JSArrowFunction::allocationSize(0), executable, JSArrowFunction::offsetOfScopeChain(), JSArrowFunction::offsetOfExecutable(), JSArrowFunction::offsetOfRareData());
-#if USE(JSVALUE64)
- m_jit.storePtr(thisValueGPR, JITCompiler::Address(resultGPR, JSArrowFunction::offsetOfThisValue()));
- addSlowPathGenerator(slowPathCall(slowPath, this, operationNewArrowFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable, thisValueGPR));
-#else
- m_jit.store32(thisValueTagGPR, MacroAssembler::Address(resultGPR, JSArrowFunction::offsetOfThisValue() + TagOffset));
- m_jit.store32(thisValuePayloadGPR, MacroAssembler::Address(resultGPR, JSArrowFunction::offsetOfThisValue() + PayloadOffset));
-
- addSlowPathGenerator(slowPathCall(slowPath, this, operationNewArrowFunctionWithInvalidatedReallocationWatchpoint, resultGPR, scopeGPR, executable, thisValueTagGPR, thisValuePayloadGPR));
-#endif
- }
</del><span class="cx">
</span><span class="cx"> cellResult(resultGPR, node);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStructureRegistrationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/dfg/DFGStructureRegistrationPhase.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> registerStructure(m_graph.globalObjectFor(node->origin.semantic)->regExpStructure());
</span><span class="cx"> break;
</span><span class="cx"> case NewArrowFunction:
</span><del>- registerStructure(m_graph.globalObjectFor(node->origin.semantic)->arrowFunctionStructure());
</del><ins>+ registerStructure(m_graph.globalObjectFor(node->origin.semantic)->functionStructure());
</ins><span class="cx"> break;
</span><span class="cx"> case NewFunction:
</span><span class="cx"> registerStructure(m_graph.globalObjectFor(node->origin.semantic)->functionStructure());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "DirectArguments.h"
</span><span class="cx"> #include "FTLAbbreviations.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSEnvironmentRecord.h"
</span><span class="cx"> #include "JSPropertyNameEnumerator.h"
</span><span class="cx"> #include "JSScope.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbstractHeapRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbstractHeapRepository.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -87,11 +87,7 @@
</span><span class="cx"> macro(Structure_globalObject, Structure::globalObjectOffset()) \
</span><span class="cx"> macro(Structure_prototype, Structure::prototypeOffset()) \
</span><span class="cx"> macro(Structure_structureID, Structure::structureIDOffset()) \
</span><del>- macro(Symbol_privateName, Symbol::offsetOfPrivateName()) \
- macro(JSArrowFunction_executable, JSArrowFunction::offsetOfExecutable()) \
- macro(JSArrowFunction_scope, JSArrowFunction::offsetOfScopeChain()) \
- macro(JSArrowFunction_rareData, JSArrowFunction::offsetOfRareData()) \
- macro(JSArrowFunction_this, JSArrowFunction::offsetOfThisValue())
</del><ins>+ macro(Symbol_privateName, Symbol::offsetOfPrivateName())
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_INDEXED_ABSTRACT_HEAP(macro) \
</span><span class="cx"> macro(DirectArguments_storage, DirectArguments::storageOffset(), sizeof(EncodedJSValue)) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> #include "JITMulGenerator.h"
</span><span class="cx"> #include "JITRightShiftGenerator.h"
</span><span class="cx"> #include "JITSubGenerator.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSGeneratorFunction.h"
</span><span class="cx"> #include "JSLexicalEnvironment.h"
</span><span class="lines">@@ -3686,16 +3685,13 @@
</span><span class="cx"> void compileNewFunction()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_node->op() == NewFunction || m_node->op() == NewArrowFunction || m_node->op() == NewGeneratorFunction);
</span><del>- bool isArrowFunction = m_node->op() == NewArrowFunction;
</del><span class="cx"> bool isGeneratorFunction = m_node->op() == NewGeneratorFunction;
</span><span class="cx">
</span><span class="cx"> LValue scope = lowCell(m_node->child1());
</span><del>- LValue thisValue = isArrowFunction ? lowCell(m_node->child2()) : nullptr;
</del><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = m_node->castOperand<FunctionExecutable*>();
</span><span class="cx"> if (executable->singletonFunction()->isStillValid()) {
</span><span class="cx"> LValue callResult =
</span><del>- isArrowFunction ? vmCall(m_out.int64, m_out.operation(operationNewArrowFunction), m_callFrame, scope, weakPointer(executable), thisValue) :
</del><span class="cx"> isGeneratorFunction ? vmCall(m_out.int64, m_out.operation(operationNewGeneratorFunction), m_callFrame, scope, weakPointer(executable)) :
</span><span class="cx"> vmCall(m_out.int64, m_out.operation(operationNewFunction), m_callFrame, scope, weakPointer(executable));
</span><span class="cx"> setJSValue(callResult);
</span><span class="lines">@@ -3703,7 +3699,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* structure =
</span><del>- isArrowFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->arrowFunctionStructure() :
</del><span class="cx"> isGeneratorFunction ? m_graph.globalObjectFor(m_node->origin.semantic)->generatorFunctionStructure() :
</span><span class="cx"> m_graph.globalObjectFor(m_node->origin.semantic)->functionStructure();
</span><span class="cx">
</span><span class="lines">@@ -3713,21 +3708,16 @@
</span><span class="cx"> LBasicBlock lastNext = m_out.insertNewBlocksBefore(slowPath);
</span><span class="cx">
</span><span class="cx"> LValue fastObject =
</span><del>- isArrowFunction ? allocateObject<JSArrowFunction>(structure, m_out.intPtrZero, slowPath) :
</del><span class="cx"> isGeneratorFunction ? allocateObject<JSGeneratorFunction>(structure, m_out.intPtrZero, slowPath) :
</span><span class="cx"> allocateObject<JSFunction>(structure, m_out.intPtrZero, slowPath);
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> // We don't need memory barriers since we just fast-created the function, so it
</span><span class="cx"> // must be young.
</span><del>- m_out.storePtr(scope, fastObject, isArrowFunction ? m_heaps.JSArrowFunction_scope : m_heaps.JSFunction_scope);
- m_out.storePtr(weakPointer(executable), fastObject, isArrowFunction ? m_heaps.JSArrowFunction_executable : m_heaps.JSFunction_executable);
</del><ins>+ m_out.storePtr(scope, fastObject, m_heaps.JSFunction_scope);
+ m_out.storePtr(weakPointer(executable), fastObject, m_heaps.JSFunction_executable);
+ m_out.storePtr(m_out.intPtrZero, fastObject, m_heaps.JSFunction_rareData);
</ins><span class="cx">
</span><del>- if (isArrowFunction)
- m_out.storePtr(thisValue, fastObject, m_heaps.JSArrowFunction_this);
-
- m_out.storePtr(m_out.intPtrZero, fastObject, isArrowFunction ? m_heaps.JSArrowFunction_rareData : m_heaps.JSFunction_rareData);
-
</del><span class="cx"> ValueFromBlock fastResult = m_out.anchor(fastObject);
</span><span class="cx"> m_out.jump(continuation);
</span><span class="cx">
</span><span class="lines">@@ -3735,16 +3725,8 @@
</span><span class="cx">
</span><span class="cx"> Vector<LValue> slowPathArguments;
</span><span class="cx"> slowPathArguments.append(scope);
</span><del>- if (isArrowFunction)
- slowPathArguments.append(thisValue);
</del><span class="cx"> LValue callResult = lazySlowPath(
</span><span class="cx"> [=] (const Vector<Location>& locations) -> RefPtr<LazySlowPath::Generator> {
</span><del>- if (isArrowFunction) {
- return createLazyCallGenerator(
- operationNewArrowFunctionWithInvalidatedReallocationWatchpoint,
- locations[0].directGPR(), locations[1].directGPR(),
- CCallHelpers::TrustedImmPtr(executable), locations[2].directGPR());
- }
</del><span class="cx"> if (isGeneratorFunction) {
</span><span class="cx"> return createLazyCallGenerator(
</span><span class="cx"> operationNewGeneratorFunctionWithInvalidatedReallocationWatchpoint,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "ExceptionHelpers.h"
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="cx"> #include "JSArray.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSLexicalEnvironment.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #define Interpreter_h
</span><span class="cx">
</span><span class="cx"> #include "ArgList.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCJSValue.h"
</span><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSObject.h"
</span><span class="lines">@@ -51,7 +50,6 @@
</span><span class="cx"> class ExecutableBase;
</span><span class="cx"> class FunctionExecutable;
</span><span class="cx"> class VM;
</span><del>- class JSArrowFunction;
</del><span class="cx"> class JSFunction;
</span><span class="cx"> class JSGlobalObject;
</span><span class="cx"> class JSModuleEnvironment;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "Heap.h"
</span><span class="cx"> #include "JITInlines.h"
</span><span class="cx"> #include "JSArray.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSPropertyNameEnumerator.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOpcodes32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "Exception.h"
</span><span class="cx"> #include "JITInlines.h"
</span><span class="cx"> #include "JSArray.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSEnvironmentRecord.h"
</span><span class="cx"> #include "JSFunction.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "HostCallReturnValue.h"
</span><span class="cx"> #include "JIT.h"
</span><span class="cx"> #include "JITToDFGDeferredCompilationCallback.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSGeneratorFunction.h"
</span><span class="cx"> #include "JSGlobalObjectFunctions.h"
</span><span class="lines">@@ -1023,30 +1022,6 @@
</span><span class="cx"> return operationNewFunctionCommon<JSGeneratorFunction>(exec, scope, functionExecutable, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue static operationNewArrowFunctionCommon(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue, bool isInvalidated)
-{
- ASSERT(functionExecutable->inherits(FunctionExecutable::info()));
- FunctionExecutable* executable = static_cast<FunctionExecutable*>(functionExecutable);
- VM& vm = exec->vm();
- NativeCallFrameTracer tracer(&vm, exec);
-
- JSArrowFunction* arrowFunction = isInvalidated
- ? JSArrowFunction::createWithInvalidatedReallocationWatchpoint(vm, executable, scope, JSValue::decode(thisValue))
- : JSArrowFunction::create(vm, executable, scope, JSValue::decode(thisValue));
-
- return JSValue::encode(arrowFunction);
-}
-
-EncodedJSValue JIT_OPERATION operationNewArrowFunctionWithInvalidatedReallocationWatchpoint(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue)
-{
- return operationNewArrowFunctionCommon(exec, scope, functionExecutable, thisValue, true);
-}
-
-EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState* exec, JSScope* scope, JSCell* functionExecutable, EncodedJSValue thisValue)
-{
- return operationNewArrowFunctionCommon(exec, scope, functionExecutable, thisValue, false);
-}
-
</del><span class="cx"> JSCell* JIT_OPERATION operationNewObject(ExecState* exec, Structure* structure)
</span><span class="cx"> {
</span><span class="cx"> VM* vm = &exec->vm();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -305,8 +305,6 @@
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationNewFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationNewGeneratorFunction(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationNewGeneratorFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*) WTF_INTERNAL;
</span><del>-EncodedJSValue JIT_OPERATION operationNewArrowFunction(ExecState*, JSScope*, JSCell*, EncodedJSValue) WTF_INTERNAL;
-EncodedJSValue JIT_OPERATION operationNewArrowFunctionWithInvalidatedReallocationWatchpoint(ExecState*, JSScope*, JSCell*, EncodedJSValue) WTF_INTERNAL;
</del><span class="cx"> JSCell* JIT_OPERATION operationNewObject(ExecState*, Structure*) WTF_INTERNAL;
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationNewRegexp(ExecState*, void*) WTF_INTERNAL;
</span><span class="cx"> UnusedPtr JIT_OPERATION operationHandleWatchdogTimer(ExecState*) WTF_INTERNAL;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntOffsetsExtractorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "Heap.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSArray.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "VM.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JIT.h"
</span><span class="cx"> #include "JITExceptions.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSLexicalEnvironment.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSCJSValue.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrowFunctioncpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/JSArrowFunction.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrowFunction.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/runtime/JSArrowFunction.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Aleksandr Skachkov <gskachkov@gmail.com>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#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) };
-
-JSArrowFunction* JSArrowFunction::create(VM& vm, FunctionExecutable* executable, JSScope* scope, JSValue boundThis)
-{
- JSArrowFunction* result = createImpl(vm, executable, scope, boundThis);
- executable->singletonFunction()->notifyWrite(vm, result, "Allocating an arrow function");
- return result;
-}
-
-JSArrowFunction::JSArrowFunction(VM& vm, FunctionExecutable* executable, JSScope* scope, JSValue boundThis)
- : Base(vm, executable, scope, scope->globalObject()->arrowFunctionStructure())
- , m_boundThis(vm, this, boundThis)
-{
-}
-
-JSArrowFunction* JSArrowFunction::createWithInvalidatedReallocationWatchpoint(VM& vm, FunctionExecutable* executable, JSScope* scope, JSValue boundThis)
-{
- ASSERT(executable->singletonFunction()->hasBeenInvalidated());
- return create(vm, executable, scope, boundThis);
-}
-
-void JSArrowFunction::visitChildren(JSCell* cell, SlotVisitor& visitor)
-{
- JSArrowFunction* thisObject = jsCast<JSArrowFunction*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- Base::visitChildren(thisObject, visitor);
-
- visitor.append(&thisObject->m_boundThis);
-}
-
-ConstructType JSArrowFunction::getConstructData(JSCell*, ConstructData&)
-{
- return ConstructTypeNone;
-}
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrowFunctionh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/JSArrowFunction.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArrowFunction.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/runtime/JSArrowFunction.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -1,97 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Aleksandr Skachkov <gskachkov@gmail.com>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSArrowFunction_h
-#define JSArrowFunction_h
-
-#include "JSFunction.h"
-#include "JSGlobalObject.h"
-
-namespace JSC {
-
-class JSGlobalObject;
-class LLIntOffsetsExtractor;
-class LLIntDesiredOffsets;
-
-class JSArrowFunction : public JSFunction {
- friend class JIT;
-#if ENABLE(DFG_JIT)
- friend class DFG::SpeculativeJIT;
- friend class DFG::JITCompiler;
-#endif
- friend class VM;
-public:
- typedef JSFunction Base;
-
- static JSArrowFunction* create(VM&, FunctionExecutable*, JSScope*, JSValue);
- static JSArrowFunction* createWithInvalidatedReallocationWatchpoint(VM&, FunctionExecutable*, JSScope*, JSValue);
-
- static size_t allocationSize(size_t inlineCapacity)
- {
- ASSERT_UNUSED(inlineCapacity, !inlineCapacity);
- return sizeof(JSArrowFunction);
- }
-
- static JSArrowFunction* createImpl(VM& vm, FunctionExecutable* executable, JSScope* scope, JSValue boundThis)
- {
- JSArrowFunction* function = new (NotNull, allocateCell<JSArrowFunction>(vm.heap)) JSArrowFunction(vm, executable, scope, boundThis);
- ASSERT(function->structure()->globalObject());
- function->finishCreation(vm);
- return function;
- }
-
- static ConstructType getConstructData(JSCell*, ConstructData&);
-
- JSValue boundThis() { return m_boundThis.get(); }
-
- DECLARE_EXPORT_INFO;
-
- static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
- {
- ASSERT(globalObject);
- return Structure::create(vm, globalObject, prototype, TypeInfo(JSFunctionType, StructureFlags), info());
- }
-
- static inline ptrdiff_t offsetOfThisValue()
- {
- return OBJECT_OFFSETOF(JSArrowFunction, m_boundThis);
- }
-
- const static unsigned StructureFlags = Base::StructureFlags;
-
-protected:
- static void visitChildren(JSCell*, SlotVisitor&);
-
-private:
- JSArrowFunction(VM&, FunctionExecutable*, JSScope*, JSValue);
-
- friend class LLIntOffsetsExtractor;
-
- WriteBarrier<Unknown> m_boundThis;
-};
-
-} // namespace JSC
-
-#endif // JSArrowFunction_h
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> #include "JSArrayBufferConstructor.h"
</span><span class="cx"> #include "JSArrayBufferPrototype.h"
</span><span class="cx"> #include "JSArrayIterator.h"
</span><del>-#include "JSArrowFunction.h"
</del><span class="cx"> #include "JSBoundFunction.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSCallbackConstructor.h"
</span><span class="lines">@@ -279,7 +278,6 @@
</span><span class="cx"> exec->setCallee(m_globalCallee.get());
</span><span class="cx">
</span><span class="cx"> m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><del>- m_arrowFunctionStructure.set(vm, this, JSArrowFunction::createStructure(vm, this, m_functionPrototype.get()));
</del><span class="cx"> m_boundFunctionStructure.set(vm, this, JSBoundFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx"> m_nativeStdFunctionStructure.set(vm, this, JSNativeStdFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx"> m_namedFunctionStructure.set(vm, this, Structure::addPropertyTransition(vm, m_functionStructure.get(), vm.propertyNames->name, DontDelete | ReadOnly | DontEnum, m_functionNameOffset));
</span><span class="lines">@@ -886,7 +884,6 @@
</span><span class="cx"> visitor.append(&thisObject->m_calleeStructure);
</span><span class="cx"> visitor.append(&thisObject->m_functionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_boundFunctionStructure);
</span><del>- visitor.append(&thisObject->m_arrowFunctionStructure);
</del><span class="cx"> visitor.append(&thisObject->m_nativeStdFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_namedFunctionStructure);
</span><span class="cx"> visitor.append(&thisObject->m_symbolObjectStructure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (194834 => 194835)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-01-11 00:58:34 UTC (rev 194834)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2016-01-11 01:38:36 UTC (rev 194835)
</span><span class="lines">@@ -262,7 +262,6 @@
</span><span class="cx"> WriteBarrier<Structure> m_calleeStructure;
</span><span class="cx"> WriteBarrier<Structure> m_functionStructure;
</span><span class="cx"> WriteBarrier<Structure> m_boundFunctionStructure;
</span><del>- WriteBarrier<Structure> m_arrowFunctionStructure;
</del><span class="cx"> WriteBarrier<Structure> m_nativeStdFunctionStructure;
</span><span class="cx"> WriteBarrier<Structure> m_namedFunctionStructure;
</span><span class="cx"> PropertyOffset m_functionNameOffset;
</span><span class="lines">@@ -511,7 +510,6 @@
</span><span class="cx"> Structure* calleeStructure() const { return m_calleeStructure.get(); }
</span><span class="cx"> Structure* functionStructure() const { return m_functionStructure.get(); }
</span><span class="cx"> Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
</span><del>- Structure* arrowFunctionStructure() const { return m_arrowFunctionStructure.get(); }
</del><span class="cx"> Structure* nativeStdFunctionStructure() const { return m_nativeStdFunctionStructure.get(); }
</span><span class="cx"> Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(); }
</span><span class="cx"> PropertyOffset functionNameOffset() const { return m_functionNameOffset; }
</span></span></pre>
</div>
</div>
</body>
</html>