<!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>[186820] branches/jsc-tailcall/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/186820">186820</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-07-14 15:06:57 -0700 (Tue, 14 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>jsc-tailcall: Get rid of the arity fixup return thunk
https://bugs.webkit.org/show_bug.cgi?id=146847
Reviewed by Michael Saboff.
This removes the arity check fail return thunk since it is now the
caller's responsibility to restore the stack pointer.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGJITCompiler.cpp:
* ftl/FTLLink.cpp:
* jit/ArityCheckFailReturnThunks.cpp: Removed.
* jit/ArityCheckFailReturnThunks.h: Removed.
* jit/JIT.cpp:
* jit/ThunkGenerators.cpp:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::setupArityCheckData):
* runtime/CommonSlowPaths.h:
* runtime/Options.h:
* runtime/VM.cpp:
* runtime/VM.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreCMakeListstxt">branches/jsc-tailcall/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreChangeLog">branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoredfgDFGJITCompilercpp">branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreftlFTLLinkcpp">branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLink.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorejitJITcpp">branches/jsc-tailcall/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorejitThunkGeneratorscpp">branches/jsc-tailcall/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter32_64asm">branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter64asm">branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreruntimeCommonSlowPathscpp">branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreruntimeCommonSlowPathsh">branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreruntimeVMcpp">branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCoreruntimeVMh">branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchesjsctailcallSourceJavaScriptCorejitArityCheckFailReturnThunkscpp">branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp</a></li>
<li><a href="#branchesjsctailcallSourceJavaScriptCorejitArityCheckFailReturnThunksh">branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsctailcallSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/CMakeLists.txt (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/CMakeLists.txt 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/CMakeLists.txt 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -340,7 +340,6 @@
</span><span class="cx"> interpreter/StackVisitor.cpp
</span><span class="cx">
</span><span class="cx"> jit/AccessorCallJITStubRoutine.cpp
</span><del>- jit/ArityCheckFailReturnThunks.cpp
</del><span class="cx"> jit/AssemblyHelpers.cpp
</span><span class="cx"> jit/BinarySwitch.cpp
</span><span class="cx"> jit/ExecutableAllocationFuzz.cpp
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ChangeLog 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-07-13 Basile Clement <basile_clement@apple.com>
+
+ jsc-tailcall: Get rid of the arity fixup return thunk
+ https://bugs.webkit.org/show_bug.cgi?id=146847
+
+ Reviewed by Michael Saboff.
+
+ This removes the arity check fail return thunk since it is now the
+ caller's responsibility to restore the stack pointer.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGJITCompiler.cpp:
+ * ftl/FTLLink.cpp:
+ * jit/ArityCheckFailReturnThunks.cpp: Removed.
+ * jit/ArityCheckFailReturnThunks.h: Removed.
+ * jit/JIT.cpp:
+ * jit/ThunkGenerators.cpp:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::setupArityCheckData):
+ * runtime/CommonSlowPaths.h:
+ * runtime/Options.h:
+ * runtime/VM.cpp:
+ * runtime/VM.h:
+
</ins><span class="cx"> 2015-07-14 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> jsc-tailcall: Temporarily disable FTL
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -604,7 +604,6 @@
</span><span class="cx"> <ClCompile Include="..\interpreter\ProtoCallFrame.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\StackVisitor.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\AccessorCallJITStubRoutine.cpp" />
</span><del>- <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp" />
</del><span class="cx"> <ClCompile Include="..\jit\AssemblyHelpers.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\BinarySwitch.cpp" />
</span><span class="cx"> <ClCompile Include="..\jit\ExecutableAllocationFuzz.cpp" />
</span><span class="lines">@@ -1367,7 +1366,6 @@
</span><span class="cx"> <ClInclude Include="..\interpreter\Register.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\StackVisitor.h" />
</span><span class="cx"> <ClInclude Include="..\jit\AccessorCallJITStubRoutine.h" />
</span><del>- <ClInclude Include="..\jit\ArityCheckFailReturnThunks.h" />
</del><span class="cx"> <ClInclude Include="..\jit\AssemblyHelpers.h" />
</span><span class="cx"> <ClInclude Include="..\jit\BinarySwitch.h" />
</span><span class="cx"> <ClInclude Include="..\jit\CCallHelpers.h" />
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -1413,9 +1413,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolObjects.cpp">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp">
- <Filter>jit</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\jit\RegisterPreservationWrapperGenerator.cpp">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -3842,9 +3839,6 @@
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
</span><del>- <ClInclude Include="..\jit\ArityCheckFailReturnThunks.h">
- <Filter>jit</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\jit\RegisterPreservationWrapperGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -385,8 +385,6 @@
</span><span class="cx"> 0F6B1CC41862C47800845D97 /* FTLRegisterAtOffset.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B1CC01862C47800845D97 /* FTLRegisterAtOffset.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F6B1CC51862C47800845D97 /* FTLUnwindInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6B1CC11862C47800845D97 /* FTLUnwindInfo.cpp */; };
</span><span class="cx"> 0F6B1CC61862C47800845D97 /* FTLUnwindInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B1CC21862C47800845D97 /* FTLUnwindInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F6B1CC918641DF800845D97 /* ArityCheckFailReturnThunks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6B1CC718641DF800845D97 /* ArityCheckFailReturnThunks.cpp */; };
- 0F6B1CCA18641DF800845D97 /* ArityCheckFailReturnThunks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6B1CC818641DF800845D97 /* ArityCheckFailReturnThunks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F6C73501AC9F99F00BE1682 /* VariableWriteFireDetail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6C734E1AC9F99F00BE1682 /* VariableWriteFireDetail.cpp */; };
</span><span class="cx"> 0F6C73511AC9F99F00BE1682 /* VariableWriteFireDetail.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F6C734F1AC9F99F00BE1682 /* VariableWriteFireDetail.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F6E845A19030BEF00562741 /* DFGVariableAccessData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F6E845919030BEF00562741 /* DFGVariableAccessData.cpp */; };
</span><span class="lines">@@ -2127,8 +2125,6 @@
</span><span class="cx"> 0F6B1CC01862C47800845D97 /* FTLRegisterAtOffset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLRegisterAtOffset.h; path = ftl/FTLRegisterAtOffset.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F6B1CC11862C47800845D97 /* FTLUnwindInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLUnwindInfo.cpp; path = ftl/FTLUnwindInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F6B1CC21862C47800845D97 /* FTLUnwindInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLUnwindInfo.h; path = ftl/FTLUnwindInfo.h; sourceTree = "<group>"; };
</span><del>- 0F6B1CC718641DF800845D97 /* ArityCheckFailReturnThunks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArityCheckFailReturnThunks.cpp; sourceTree = "<group>"; };
- 0F6B1CC818641DF800845D97 /* ArityCheckFailReturnThunks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArityCheckFailReturnThunks.h; sourceTree = "<group>"; };
</del><span class="cx"> 0F6C734E1AC9F99F00BE1682 /* VariableWriteFireDetail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VariableWriteFireDetail.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F6C734F1AC9F99F00BE1682 /* VariableWriteFireDetail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableWriteFireDetail.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F6E845919030BEF00562741 /* DFGVariableAccessData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGVariableAccessData.cpp; path = dfg/DFGVariableAccessData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3905,8 +3901,6 @@
</span><span class="cx"> 0FF054F81AC35B4400E5BE57 /* ExecutableAllocationFuzz.h */,
</span><span class="cx"> 0F7576D018E1FEE9002EF4CD /* AccessorCallJITStubRoutine.cpp */,
</span><span class="cx"> 0F7576D118E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h */,
</span><del>- 0F6B1CC718641DF800845D97 /* ArityCheckFailReturnThunks.cpp */,
- 0F6B1CC818641DF800845D97 /* ArityCheckFailReturnThunks.h */,
</del><span class="cx"> 0F24E53B17EA9F5900ABB217 /* AssemblyHelpers.cpp */,
</span><span class="cx"> 0F24E53C17EA9F5900ABB217 /* AssemblyHelpers.h */,
</span><span class="cx"> 0F64B26F1A784BAF006E4E66 /* BinarySwitch.cpp */,
</span><span class="lines">@@ -5612,7 +5606,6 @@
</span><span class="cx"> BC18C3E50E16F5CD00B34460 /* APICast.h in Headers */,
</span><span class="cx"> BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
</span><span class="cx"> 2A88067919107D5500CB0BBB /* DFGFunctionWhitelist.h in Headers */,
</span><del>- 0F6B1CCA18641DF800845D97 /* ArityCheckFailReturnThunks.h in Headers */,
</del><span class="cx"> 0F6B1CB91861244C00845D97 /* ArityCheckMode.h in Headers */,
</span><span class="cx"> A1A009C11831A26E00CF8711 /* ARM64Assembler.h in Headers */,
</span><span class="cx"> 0F898F321B27689F0083A33C /* DFGIntegerRangeOptimizationPhase.h in Headers */,
</span><span class="lines">@@ -7013,7 +7006,6 @@
</span><span class="cx"> 0FE050151AA9091100D33B33 /* DirectArgumentsOffset.cpp in Sources */,
</span><span class="cx"> 0F55F0F414D1063900AC7649 /* AbstractPC.cpp in Sources */,
</span><span class="cx"> 147F39BD107EC37600427A48 /* ArgList.cpp in Sources */,
</span><del>- 0F6B1CC918641DF800845D97 /* ArityCheckFailReturnThunks.cpp in Sources */,
</del><span class="cx"> 0F743BAA16B88249009F9277 /* ARM64Disassembler.cpp in Sources */,
</span><span class="cx"> 86D3B2C310156BDE002865E7 /* ARMAssembler.cpp in Sources */,
</span><span class="cx"> 65C02850171795E200351E35 /* ARMv7Disassembler.cpp in Sources */,
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoredfgDFGJITCompilercpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/dfg/DFGJITCompiler.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx">
</span><del>-#include "ArityCheckFailReturnThunks.h"
</del><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "DFGFailedFinalizer.h"
</span><span class="cx"> #include "DFGInlineCacheWrapperInlines.h"
</span><span class="lines">@@ -400,11 +399,6 @@
</span><span class="cx"> addPtr(TrustedImm32(maxFrameExtentForSlowPathCall), stackPointerRegister);
</span><span class="cx"> branchTest32(Zero, GPRInfo::returnValueGPR).linkTo(fromArityCheck, this);
</span><span class="cx"> emitStoreCodeOrigin(CodeOrigin(0));
</span><del>- GPRReg thunkReg = GPRInfo::argumentGPR1;
- CodeLocationLabel* arityThunkLabels =
- m_vm->arityCheckFailReturnThunks->returnPCsFor(*m_vm, m_codeBlock->numParameters());
- move(TrustedImmPtr(arityThunkLabels), thunkReg);
- loadPtr(BaseIndex(thunkReg, GPRInfo::returnValueGPR, timesPtr()), thunkReg);
</del><span class="cx"> move(GPRInfo::returnValueGPR, GPRInfo::argumentGPR0);
</span><span class="cx"> m_callArityFixup = call();
</span><span class="cx"> jump(fromArityCheck);
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreftlFTLLinkcpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLink.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLink.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/ftl/FTLLink.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><del>-#include "ArityCheckFailReturnThunks.h"
</del><span class="cx"> #include "CCallHelpers.h"
</span><span class="cx"> #include "CodeBlockWithJITType.h"
</span><span class="cx"> #include "DFGCommon.h"
</span><span class="lines">@@ -169,10 +168,6 @@
</span><span class="cx"> jit.emitFunctionEpilogue();
</span><span class="cx"> mainPathJumps.append(jit.branchTest32(CCallHelpers::Zero, GPRInfo::argumentGPR0));
</span><span class="cx"> jit.emitFunctionPrologue();
</span><del>- CodeLocationLabel* arityThunkLabels =
- vm.arityCheckFailReturnThunks->returnPCsFor(vm, codeBlock->numParameters());
- jit.move(CCallHelpers::TrustedImmPtr(arityThunkLabels), GPRInfo::argumentGPR1);
- jit.loadPtr(CCallHelpers::BaseIndex(GPRInfo::argumentGPR1, GPRInfo::argumentGPR0, CCallHelpers::timesPtr()), GPRInfo::argumentGPR1);
</del><span class="cx"> CCallHelpers::Call callArityFixup = jit.call();
</span><span class="cx"> jit.emitFunctionEpilogue();
</span><span class="cx"> mainPathJumps.append(jit.jump());
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorejitArityCheckFailReturnThunkscpp"></a>
<div class="delfile"><h4>Deleted: branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -1,135 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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 "ArityCheckFailReturnThunks.h"
-
-#if ENABLE(JIT)
-
-#include "AssemblyHelpers.h"
-#include "LinkBuffer.h"
-#include "JSCInlines.h"
-#include "StackAlignment.h"
-
-namespace JSC {
-
-ArityCheckFailReturnThunks::ArityCheckFailReturnThunks()
- : m_nextSize(0)
-{
-}
-
-ArityCheckFailReturnThunks::~ArityCheckFailReturnThunks() { }
-
-CodeLocationLabel* ArityCheckFailReturnThunks::returnPCsFor(
- VM& vm, unsigned numExpectedArgumentsIncludingThis)
-{
- ASSERT(numExpectedArgumentsIncludingThis >= 1);
-
- numExpectedArgumentsIncludingThis = WTF::roundUpToMultipleOf(
- stackAlignmentRegisters(), numExpectedArgumentsIncludingThis);
-
- {
- ConcurrentJITLocker locker(m_lock);
- if (numExpectedArgumentsIncludingThis < m_nextSize)
- return m_returnPCArrays.last().get();
- }
-
- ASSERT(!isCompilationThread());
-
- numExpectedArgumentsIncludingThis = std::max(numExpectedArgumentsIncludingThis, m_nextSize * 2);
-
- AssemblyHelpers jit(&vm, 0);
-
- Vector<AssemblyHelpers::Label> labels;
-
- for (unsigned size = m_nextSize; size <= numExpectedArgumentsIncludingThis; size += stackAlignmentRegisters()) {
- labels.append(jit.label());
-
- jit.load32(
- AssemblyHelpers::Address(
- AssemblyHelpers::stackPointerRegister,
- (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) +
- PayloadOffset),
- GPRInfo::regT4);
- jit.add32(
- AssemblyHelpers::TrustedImm32(
- JSStack::CallFrameHeaderSize - JSStack::CallerFrameAndPCSize + size - 1),
- GPRInfo::regT4, GPRInfo::regT2);
- jit.lshift32(AssemblyHelpers::TrustedImm32(3), GPRInfo::regT2);
- jit.addPtr(AssemblyHelpers::stackPointerRegister, GPRInfo::regT2);
- jit.loadPtr(GPRInfo::regT2, GPRInfo::regT2);
-
- jit.addPtr(
- AssemblyHelpers::TrustedImm32(size * sizeof(Register)),
- AssemblyHelpers::stackPointerRegister);
-
- // Thunks like ours want to use the return PC to figure out where things
- // were saved. So, we pay it forward.
- jit.store32(
- GPRInfo::regT4,
- AssemblyHelpers::Address(
- AssemblyHelpers::stackPointerRegister,
- (JSStack::ArgumentCount - JSStack::CallerFrameAndPCSize) * sizeof(Register) +
- PayloadOffset));
-
- jit.jump(GPRInfo::regT2);
- }
-
- // Sadly, we cannot fail here because the LLInt may need us.
- LinkBuffer linkBuffer(vm, jit, GLOBAL_THUNK_ID, JITCompilationMustSucceed);
-
- unsigned returnPCsSize = numExpectedArgumentsIncludingThis / stackAlignmentRegisters() + 1;
- std::unique_ptr<CodeLocationLabel[]> returnPCs =
- std::make_unique<CodeLocationLabel[]>(returnPCsSize);
- for (unsigned size = 0; size <= numExpectedArgumentsIncludingThis; size += stackAlignmentRegisters()) {
- unsigned index = size / stackAlignmentRegisters();
- RELEASE_ASSERT(index < returnPCsSize);
- if (size < m_nextSize)
- returnPCs[index] = m_returnPCArrays.last()[index];
- else
- returnPCs[index] = linkBuffer.locationOf(labels[(size - m_nextSize) / stackAlignmentRegisters()]);
- }
-
- CodeLocationLabel* result = returnPCs.get();
-
- {
- ConcurrentJITLocker locker(m_lock);
- m_returnPCArrays.append(WTF::move(returnPCs));
- m_refs.append(FINALIZE_CODE(linkBuffer, ("Arity check fail return thunks for up to numArgs = %u", numExpectedArgumentsIncludingThis)));
- m_nextSize = numExpectedArgumentsIncludingThis + stackAlignmentRegisters();
- }
-
- return result;
-}
-
-CodeLocationLabel ArityCheckFailReturnThunks::returnPCFor(VM& vm, unsigned slotsToAdd)
-{
- return returnPCsFor(vm, slotsToAdd)[slotsToAdd / stackAlignmentRegisters()];
-}
-
-} // namespace JSC
-
-#endif // ENABLE(JIT)
-
</del></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorejitArityCheckFailReturnThunksh"></a>
<div class="delfile"><h4>Deleted: branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.h (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.h 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/jit/ArityCheckFailReturnThunks.h 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 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 ArityCheckFailReturnThunks_h
-#define ArityCheckFailReturnThunks_h
-
-#if ENABLE(JIT)
-
-#include "CodeLocation.h"
-#include "ConcurrentJITLock.h"
-#include <wtf/HashMap.h>
-
-namespace JSC {
-
-class ArityCheckFailReturnThunks {
-public:
- ArityCheckFailReturnThunks();
- ~ArityCheckFailReturnThunks();
-
- // Returns a pointer to an array of return labels indexed by missingArgs.
- CodeLocationLabel* returnPCsFor(VM&, unsigned numExpectedArgumentsIncludingThis);
-
- CodeLocationLabel returnPCFor(VM&, unsigned slotsToAdd);
-
-private:
- Vector<std::unique_ptr<CodeLocationLabel[]>> m_returnPCArrays;
- unsigned m_nextSize;
- Vector<MacroAssemblerCodeRef> m_refs;
- ConcurrentJITLock m_lock;
-};
-
-} // namespace JSC
-
-#endif // ENABLE(JIT)
-
-#endif // ArityCheckFailReturnThunks_h
-
</del></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/jit/JIT.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/jit/JIT.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/jit/JIT.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "JIT.h"
</span><span class="cx">
</span><del>-#include "ArityCheckFailReturnThunks.h"
</del><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "CodeBlockWithJITType.h"
</span><span class="cx"> #include "DFGCapabilities.h"
</span><span class="lines">@@ -586,11 +585,6 @@
</span><span class="cx"> if (maxFrameExtentForSlowPathCall)
</span><span class="cx"> addPtr(TrustedImm32(maxFrameExtentForSlowPathCall), stackPointerRegister);
</span><span class="cx"> branchTest32(Zero, returnValueGPR).linkTo(beginLabel, this);
</span><del>- GPRReg thunkReg = GPRInfo::argumentGPR1;
- CodeLocationLabel* failThunkLabels =
- m_vm->arityCheckFailReturnThunks->returnPCsFor(*m_vm, m_codeBlock->numParameters());
- move(TrustedImmPtr(failThunkLabels), thunkReg);
- loadPtr(BaseIndex(thunkReg, returnValueGPR, timesPtr()), thunkReg);
</del><span class="cx"> move(returnValueGPR, GPRInfo::argumentGPR0);
</span><span class="cx"> emitNakedCall(m_vm->getCTIStub(arityFixupGenerator).code());
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/jit/ThunkGenerators.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -438,13 +438,6 @@
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::regT5, JSInterfaceJIT::callFrameRegister);
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::regT5, JSInterfaceJIT::stackPointerRegister);
</span><span class="cx">
</span><del>- // Save the original return PC.
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister, CallFrame::returnPCOffset()), GPRInfo::regT5);
- jit.storePtr(GPRInfo::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::regT3, JSInterfaceJIT::argumentGPR0, JSInterfaceJIT::TimesEight));
-
- // Install the new return PC.
- jit.storePtr(GPRInfo::argumentGPR1, JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister, CallFrame::returnPCOffset()));
-
</del><span class="cx"> # if CPU(X86_64)
</span><span class="cx"> jit.push(JSInterfaceJIT::regT4);
</span><span class="cx"> # endif
</span><span class="lines">@@ -486,13 +479,6 @@
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::regT5, JSInterfaceJIT::callFrameRegister);
</span><span class="cx"> jit.addPtr(JSInterfaceJIT::regT5, JSInterfaceJIT::stackPointerRegister);
</span><span class="cx">
</span><del>- // Save the original return PC.
- jit.loadPtr(JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister, CallFrame::returnPCOffset()), GPRInfo::regT5);
- jit.storePtr(GPRInfo::regT5, MacroAssembler::BaseIndex(JSInterfaceJIT::regT3, JSInterfaceJIT::argumentGPR0, JSInterfaceJIT::TimesEight));
-
- // Install the new return PC.
- jit.storePtr(GPRInfo::argumentGPR1, JSInterfaceJIT::Address(JSInterfaceJIT::callFrameRegister, CallFrame::returnPCOffset()));
-
</del><span class="cx"> # if CPU(X86)
</span><span class="cx"> jit.push(JSInterfaceJIT::regT4);
</span><span class="cx"> # endif
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -574,7 +574,6 @@
</span><span class="cx"> btpz t3, .proceedInline
</span><span class="cx">
</span><span class="cx"> loadp CommonSlowPaths::ArityCheckData::paddedStackSpace[r1], a0
</span><del>- loadp CommonSlowPaths::ArityCheckData::returnPC[r1], a1
</del><span class="cx"> call t3
</span><span class="cx"> if ASSERT_ENABLED
</span><span class="cx"> loadp ReturnPC[cfr], t0
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -498,7 +498,6 @@
</span><span class="cx"> btpz t3, .proceedInline
</span><span class="cx">
</span><span class="cx"> loadp CommonSlowPaths::ArityCheckData::paddedStackSpace[r1], a0
</span><del>- loadp CommonSlowPaths::ArityCheckData::returnPC[r1], a1
</del><span class="cx"> call t3
</span><span class="cx"> if ASSERT_ENABLED
</span><span class="cx"> loadp ReturnPC[cfr], t0
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CommonSlowPaths.h"
</span><del>-#include "ArityCheckFailReturnThunks.h"
</del><span class="cx"> #include "ArrayConstructor.h"
</span><span class="cx"> #include "CallFrame.h"
</span><span class="cx"> #include "ClonedArguments.h"
</span><span class="lines">@@ -167,15 +166,11 @@
</span><span class="cx"> CommonSlowPaths::ArityCheckData* result = vm.arityCheckData.get();
</span><span class="cx"> result->paddedStackSpace = slotsToAdd;
</span><span class="cx"> #if ENABLE(JIT)
</span><del>- if (vm.canUseJIT()) {
</del><ins>+ if (vm.canUseJIT())
</ins><span class="cx"> result->thunkToCall = vm.getCTIStub(arityFixupGenerator).code().executableAddress();
</span><del>- result->returnPC = vm.arityCheckFailReturnThunks->returnPCFor(vm, slotsToAdd * stackAlignmentRegisters()).executableAddress();
- } else
</del><ins>+ else
</ins><span class="cx"> #endif
</span><del>- {
</del><span class="cx"> result->thunkToCall = 0;
</span><del>- result->returnPC = 0;
- }
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.h (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> struct ArityCheckData {
</span><span class="cx"> unsigned paddedStackSpace;
</span><span class="cx"> void* thunkToCall;
</span><del>- void* returnPC;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE int arityCheckFor(ExecState* exec, JSStack* stack, CodeSpecializationKind kind)
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.cpp (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.cpp 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.cpp 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "VM.h"
</span><span class="cx">
</span><span class="cx"> #include "ArgList.h"
</span><del>-#include "ArityCheckFailReturnThunks.h"
</del><span class="cx"> #include "ArrayBufferNeuteringWatchpoint.h"
</span><span class="cx"> #include "BuiltinExecutables.h"
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="lines">@@ -246,7 +245,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> jitStubs = std::make_unique<JITThunks>();
</span><del>- arityCheckFailReturnThunks = std::make_unique<ArityCheckFailReturnThunks>();
</del><span class="cx"> #endif
</span><span class="cx"> arityCheckData = std::make_unique<CommonSlowPaths::ArityCheckData>();
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsctailcallSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.h (186819 => 186820)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.h 2015-07-14 21:56:14 UTC (rev 186819)
+++ branches/jsc-tailcall/Source/JavaScriptCore/runtime/VM.h 2015-07-14 22:06:57 UTC (rev 186820)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class ArityCheckFailReturnThunks;
</del><span class="cx"> class BuiltinExecutables;
</span><span class="cx"> class CodeBlock;
</span><span class="cx"> class CodeCache;
</span><span class="lines">@@ -339,7 +338,6 @@
</span><span class="cx"> }
</span><span class="cx"> NativeExecutable* getHostFunction(NativeFunction, Intrinsic);
</span><span class="cx">
</span><del>- std::unique_ptr<ArityCheckFailReturnThunks> arityCheckFailReturnThunks;
</del><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx"> std::unique_ptr<CommonSlowPaths::ArityCheckData> arityCheckData;
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span></span></pre>
</div>
</div>
</body>
</html>