<!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>[192896] 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/192896">192896</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 11:31:58 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor FTL sub snippet code to support general binary op snippets.
https://bugs.webkit.org/show_bug.cgi?id=151706
Reviewed by Geoffrey Garen.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* ftl/FTLCompile.cpp:
- Moved the BinarySnippetRegisterContext to FTLCompileBinaryOp.cpp verbatim.
- Generalize generateArithSubICFastPath() to generateBinaryOpICFastPath().
It now uses snippet specific helpers in FTLCompileBinaryOp.cpp to generate
the fast paths.
* ftl/FTLCompileBinaryOp.cpp: Added.
(JSC::FTL::BinarySnippetRegisterContext::BinarySnippetRegisterContext):
(JSC::FTL::BinarySnippetRegisterContext::initializeRegisters):
(JSC::FTL::BinarySnippetRegisterContext::restoreRegisters):
- Moved here without changed from FTLCompile.cpp.
(JSC::FTL::generateArithSubFastPath):
* ftl/FTLCompileBinaryOp.h: Added.
* ftl/FTLInlineCacheDescriptor.h:
(JSC::FTL::BinaryOpDescriptor::nodeType):
(JSC::FTL::BinaryOpDescriptor::size):
(JSC::FTL::BinaryOpDescriptor::name):
(JSC::FTL::BinaryOpDescriptor::fastPathICName):
(JSC::FTL::BinaryOpDescriptor::slowPathFunction):
(JSC::FTL::BinaryOpDescriptor::leftOperand):
(JSC::FTL::BinaryOpDescriptor::rightOperand):
(JSC::FTL::BinaryOpDescriptor::BinaryOpDescriptor):
(JSC::FTL::ArithSubDescriptor::ArithSubDescriptor): Deleted.
(JSC::FTL::ArithSubDescriptor::leftType): Deleted.
(JSC::FTL::ArithSubDescriptor::rightType): Deleted.
- Refactor ArithSubDescriptor into BinaryOpDescriptor, and re-add a sub-class
ArithSubDescriptor as specializations of BinaryOpDescriptor.
* ftl/FTLInlineCacheDescriptorInlines.h: Added.
(JSC::FTL::ArithSubDescriptor::ArithSubDescriptor):
(JSC::FTL::ArithSubDescriptor::icSize):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub):
* ftl/FTLOSRExit.cpp:
(JSC::FTL::OSRExit::willArriveAtExitFromIndirectExceptionCheck):
(JSC::FTL::OSRExit::willArriveAtOSRExitFromCallOperation):
* ftl/FTLOSRExit.h:
* ftl/FTLState.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="#trunkSourceJavaScriptCoreftlFTLCompilecpp">trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExitcpp">trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSRExith">trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStateh">trunk/Source/JavaScriptCore/ftl/FTLState.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompileBinaryOpcpp">trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCompileBinaryOph">trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorInlinesh">trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.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 (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -997,6 +997,7 @@
</span><span class="cx"> ftl/FTLCapabilities.cpp
</span><span class="cx"> ftl/FTLCommonValues.cpp
</span><span class="cx"> ftl/FTLCompile.cpp
</span><ins>+ ftl/FTLCompileBinaryOp.cpp
</ins><span class="cx"> ftl/FTLDWARFDebugLineInfo.cpp
</span><span class="cx"> ftl/FTLDWARFRegister.cpp
</span><span class="cx"> ftl/FTLDataSection.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -1,3 +1,56 @@
</span><ins>+2015-12-01 Mark Lam <mark.lam@apple.com>
+
+ Refactor FTL sub snippet code to support general binary op snippets.
+ https://bugs.webkit.org/show_bug.cgi?id=151706
+
+ Reviewed by Geoffrey Garen.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+
+ * ftl/FTLCompile.cpp:
+ - Moved the BinarySnippetRegisterContext to FTLCompileBinaryOp.cpp verbatim.
+ - Generalize generateArithSubICFastPath() to generateBinaryOpICFastPath().
+ It now uses snippet specific helpers in FTLCompileBinaryOp.cpp to generate
+ the fast paths.
+
+ * ftl/FTLCompileBinaryOp.cpp: Added.
+ (JSC::FTL::BinarySnippetRegisterContext::BinarySnippetRegisterContext):
+ (JSC::FTL::BinarySnippetRegisterContext::initializeRegisters):
+ (JSC::FTL::BinarySnippetRegisterContext::restoreRegisters):
+ - Moved here without changed from FTLCompile.cpp.
+ (JSC::FTL::generateArithSubFastPath):
+ * ftl/FTLCompileBinaryOp.h: Added.
+
+ * ftl/FTLInlineCacheDescriptor.h:
+ (JSC::FTL::BinaryOpDescriptor::nodeType):
+ (JSC::FTL::BinaryOpDescriptor::size):
+ (JSC::FTL::BinaryOpDescriptor::name):
+ (JSC::FTL::BinaryOpDescriptor::fastPathICName):
+ (JSC::FTL::BinaryOpDescriptor::slowPathFunction):
+ (JSC::FTL::BinaryOpDescriptor::leftOperand):
+ (JSC::FTL::BinaryOpDescriptor::rightOperand):
+ (JSC::FTL::BinaryOpDescriptor::BinaryOpDescriptor):
+ (JSC::FTL::ArithSubDescriptor::ArithSubDescriptor): Deleted.
+ (JSC::FTL::ArithSubDescriptor::leftType): Deleted.
+ (JSC::FTL::ArithSubDescriptor::rightType): Deleted.
+ - Refactor ArithSubDescriptor into BinaryOpDescriptor, and re-add a sub-class
+ ArithSubDescriptor as specializations of BinaryOpDescriptor.
+
+ * ftl/FTLInlineCacheDescriptorInlines.h: Added.
+ (JSC::FTL::ArithSubDescriptor::ArithSubDescriptor):
+ (JSC::FTL::ArithSubDescriptor::icSize):
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileArithAddOrSub):
+ * ftl/FTLOSRExit.cpp:
+ (JSC::FTL::OSRExit::willArriveAtExitFromIndirectExceptionCheck):
+ (JSC::FTL::OSRExit::willArriveAtOSRExitFromCallOperation):
+ * ftl/FTLOSRExit.h:
+ * ftl/FTLState.h:
+
</ins><span class="cx"> 2015-12-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r192876.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -522,6 +522,7 @@
</span><span class="cx"> <ClCompile Include="..\ftl\FTLCapabilities.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLCommonValues.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLCompile.cpp" />
</span><ins>+ <ClCompile Include="..\ftl\FTLCompileBinaryOp.cpp" />
</ins><span class="cx"> <ClCompile Include="..\ftl\FTLDataSection.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLDWARFDebugLineInfo.cpp" />
</span><span class="cx"> <ClCompile Include="..\ftl\FTLDWARFRegister.cpp" />
</span><span class="lines">@@ -1290,6 +1291,7 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLCapabilities.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLCommonValues.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLCompile.h" />
</span><ins>+ <ClInclude Include="..\ftl\FTLCompileBinaryOp.h" />
</ins><span class="cx"> <ClInclude Include="..\ftl\FTLDataSection.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLDWARFDebugLineInfo.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLDWARFRegister.h" />
</span><span class="lines">@@ -1306,6 +1308,7 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLForOSREntryJITCode.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLGeneratedFunction.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLInlineCacheDescriptor.h" />
</span><ins>+ <ClInclude Include="..\ftl\FTLInlineCacheDescriptorInlines.h" />
</ins><span class="cx"> <ClInclude Include="..\ftl\FTLInlineCacheSize.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLIntrinsicRepository.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLJITCode.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -1560,6 +1560,9 @@
</span><span class="cx"> <ClCompile Include="..\ftl\FTLCompile.cpp">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\ftl\FTLCompileBinaryOp.cpp">
+ <Filter>ftl</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\ftl\FTLDataSection.cpp">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4132,6 +4135,9 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLCompile.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ftl\FTLCompileBinaryOp.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\ftl\FTLDataSection.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -4174,6 +4180,9 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLInlineCacheDescriptor.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\ftl\FTLInlineCacheDescriptorInlines.h">
+ <Filter>ftl</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\ftl\FTLInlineCacheSize.h">
</span><span class="cx"> <Filter>ftl</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 (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -1976,6 +1976,9 @@
</span><span class="cx"> FE187A0D1C030D5C0038BBCA /* JITDivGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE187A0B1C0229230038BBCA /* JITDivGenerator.h */; settings = {ASSET_TAGS = (); }; };
</span><span class="cx"> FE187A0E1C030D640038BBCA /* JITDivGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE187A0A1C0229230038BBCA /* JITDivGenerator.cpp */; settings = {ASSET_TAGS = (); }; };
</span><span class="cx"> FE187A0F1C030D6C0038BBCA /* SnippetOperand.h in Headers */ = {isa = PBXBuildFile; fileRef = FE187A0C1C02EBA70038BBCA /* SnippetOperand.h */; settings = {ASSET_TAGS = (); }; };
</span><ins>+ FE187A181C0E13DD0038BBCA /* FTLInlineCacheDescriptorInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = FE187A171C0E13C60038BBCA /* FTLInlineCacheDescriptorInlines.h */; settings = {ASSET_TAGS = (); }; };
+ FE187A191C0E13E30038BBCA /* FTLCompileBinaryOp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE187A151C0E13C60038BBCA /* FTLCompileBinaryOp.cpp */; settings = {ASSET_TAGS = (); }; };
+ FE187A1A1C0E13E60038BBCA /* FTLCompileBinaryOp.h in Headers */ = {isa = PBXBuildFile; fileRef = FE187A161C0E13C60038BBCA /* FTLCompileBinaryOp.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> FE1C0FFD1B193E9800B53FCA /* Exception.h in Headers */ = {isa = PBXBuildFile; fileRef = FE1C0FFC1B193E9800B53FCA /* Exception.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE1C0FFF1B194FD100B53FCA /* Exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE1C0FFE1B194FD100B53FCA /* Exception.cpp */; };
</span><span class="cx"> FE20CE9D15F04A9500DF3430 /* LLIntCLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */; };
</span><span class="lines">@@ -4120,6 +4123,9 @@
</span><span class="cx"> FE187A0A1C0229230038BBCA /* JITDivGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITDivGenerator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE187A0B1C0229230038BBCA /* JITDivGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITDivGenerator.h; sourceTree = "<group>"; };
</span><span class="cx"> FE187A0C1C02EBA70038BBCA /* SnippetOperand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SnippetOperand.h; sourceTree = "<group>"; };
</span><ins>+ FE187A151C0E13C60038BBCA /* FTLCompileBinaryOp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLCompileBinaryOp.cpp; path = ftl/FTLCompileBinaryOp.cpp; sourceTree = "<group>"; };
+ FE187A161C0E13C60038BBCA /* FTLCompileBinaryOp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLCompileBinaryOp.h; path = ftl/FTLCompileBinaryOp.h; sourceTree = "<group>"; };
+ FE187A171C0E13C60038BBCA /* FTLInlineCacheDescriptorInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLInlineCacheDescriptorInlines.h; path = ftl/FTLInlineCacheDescriptorInlines.h; sourceTree = "<group>"; };
</ins><span class="cx"> FE1C0FFC1B193E9800B53FCA /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
</span><span class="cx"> FE1C0FFE1B194FD100B53FCA /* Exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Exception.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLIntCLoop.cpp; path = llint/LLIntCLoop.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4394,6 +4400,8 @@
</span><span class="cx"> 0FEA0A211709606900BB722C /* FTLCommonValues.h */,
</span><span class="cx"> 0FEA0A00170513DB00BB722C /* FTLCompile.cpp */,
</span><span class="cx"> 0FEA0A01170513DB00BB722C /* FTLCompile.h */,
</span><ins>+ FE187A151C0E13C60038BBCA /* FTLCompileBinaryOp.cpp */,
+ FE187A161C0E13C60038BBCA /* FTLCompileBinaryOp.h */,
</ins><span class="cx"> 0FE95F7718B5694700B531FB /* FTLDataSection.cpp */,
</span><span class="cx"> 0FE95F7818B5694700B531FB /* FTLDataSection.h */,
</span><span class="cx"> 2AC922B918A16182003CE0FB /* FTLDWARFDebugLineInfo.cpp */,
</span><span class="lines">@@ -4421,6 +4429,7 @@
</span><span class="cx"> 0FD8A31617D51F2200CA2C40 /* FTLForOSREntryJITCode.h */,
</span><span class="cx"> A78A977C179738D5009DF744 /* FTLGeneratedFunction.h */,
</span><span class="cx"> 0F25F1A7181635F300522F39 /* FTLInlineCacheDescriptor.h */,
</span><ins>+ FE187A171C0E13C60038BBCA /* FTLInlineCacheDescriptorInlines.h */,
</ins><span class="cx"> 0F25F1A8181635F300522F39 /* FTLInlineCacheSize.cpp */,
</span><span class="cx"> 0F25F1A9181635F300522F39 /* FTLInlineCacheSize.h */,
</span><span class="cx"> 0FEA0A261709623B00BB722C /* FTLIntrinsicRepository.cpp */,
</span><span class="lines">@@ -6659,6 +6668,7 @@
</span><span class="cx"> files = (
</span><span class="cx"> 0FFA549816B8835300B3A982 /* A64DOpcode.h in Headers */,
</span><span class="cx"> 0F1FE51C1922A3BC006987C5 /* AbortReason.h in Headers */,
</span><ins>+ FE187A1A1C0E13E60038BBCA /* FTLCompileBinaryOp.h in Headers */,
</ins><span class="cx"> 860161E30F3A83C100F84710 /* AbstractMacroAssembler.h in Headers */,
</span><span class="cx"> 0F55F0F514D1063C00AC7649 /* AbstractPC.h in Headers */,
</span><span class="cx"> 0FEC856E1BDACDC70080FF74 /* AirAllocateStack.h in Headers */,
</span><span class="lines">@@ -6854,6 +6864,7 @@
</span><span class="cx"> C2C8D02D14A3C6E000578E65 /* CopiedSpaceInlines.h in Headers */,
</span><span class="cx"> 0F7C11AD1BC3862C00C74CDB /* CopyBarrier.h in Headers */,
</span><span class="cx"> 0F5A52D017ADD717008ECB2D /* CopyToken.h in Headers */,
</span><ins>+ FE187A181C0E13DD0038BBCA /* FTLInlineCacheDescriptorInlines.h in Headers */,
</ins><span class="cx"> C2239D1816262BDD005AC5FD /* CopyVisitor.h in Headers */,
</span><span class="cx"> C2239D1916262BDD005AC5FD /* CopyVisitorInlines.h in Headers */,
</span><span class="cx"> C218D1401655CFD50062BB81 /* CopyWorkList.h in Headers */,
</span><span class="lines">@@ -8533,6 +8544,7 @@
</span><span class="cx"> 0FB17662196B8F9E0091052A /* DFGPureValue.cpp in Sources */,
</span><span class="cx"> 0F3A1BF91A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp in Sources */,
</span><span class="cx"> 0F2FCCFB18A60070001A27F8 /* DFGSafepoint.cpp in Sources */,
</span><ins>+ FE187A191C0E13E30038BBCA /* FTLCompileBinaryOp.cpp in Sources */,
</ins><span class="cx"> 86EC9DD21328DF82002B2AD7 /* DFGSpeculativeJIT.cpp in Sources */,
</span><span class="cx"> 86880F1F14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp in Sources */,
</span><span class="cx"> 86880F4D14353B2100B08D42 /* DFGSpeculativeJIT64.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompilecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompile.cpp 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -37,13 +37,14 @@
</span><span class="cx"> #include "DFGOperations.h"
</span><span class="cx"> #include "DataView.h"
</span><span class="cx"> #include "Disassembler.h"
</span><ins>+#include "FTLCompileBinaryOp.h"
</ins><span class="cx"> #include "FTLExceptionHandlerManager.h"
</span><span class="cx"> #include "FTLExitThunkGenerator.h"
</span><ins>+#include "FTLInlineCacheDescriptorInlines.h"
</ins><span class="cx"> #include "FTLInlineCacheSize.h"
</span><span class="cx"> #include "FTLJITCode.h"
</span><span class="cx"> #include "FTLThunks.h"
</span><span class="cx"> #include "FTLUnwindInfo.h"
</span><del>-#include "JITSubGenerator.h"
</del><span class="cx"> #include "LLVMAPI.h"
</span><span class="cx"> #include "LinkBuffer.h"
</span><span class="cx"> #include "ScratchRegisterAllocator.h"
</span><span class="lines">@@ -307,125 +308,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class BinarySnippetRegisterContext {
- // The purpose of this class is to shuffle registers to get them into the state
- // that baseline code expects so that we can use the baseline snippet generators i.e.
- // 1. Ensure that the inputs and output are not in reserved registers (which
- // include the tag registers). The snippet will use these reserved registers.
- // Hence, we need to put the inputs and output in other scratch registers.
- // 2. Tag registers are loaded with the expected values.
- //
- // When the snippet is done:
- // 1. If we had re-assigned the result register to a scratch, we need to copy the
- // result back from the scratch.
- // 2. Restore the input and tag registers to the values that LLVM put there originally.
- // That is unless when one of them is also the result register. In that case, we
- // don't want to trash the result, and hence, should not restore into it.
-
-public:
- BinarySnippetRegisterContext(ScratchRegisterAllocator& allocator, GPRReg& result, GPRReg& left, GPRReg& right)
- : m_allocator(allocator)
- , m_result(result)
- , m_left(left)
- , m_right(right)
- , m_origResult(result)
- , m_origLeft(left)
- , m_origRight(right)
- {
- m_allocator.lock(m_result);
- m_allocator.lock(m_left);
- m_allocator.lock(m_right);
-
- RegisterSet inputAndOutputRegisters = RegisterSet(m_left, m_right, m_result);
- RegisterSet reservedRegisters;
- for (GPRReg reg : GPRInfo::reservedRegisters())
- reservedRegisters.set(reg);
-
- if (reservedRegisters.get(m_left))
- m_left = m_allocator.allocateScratchGPR();
- if (reservedRegisters.get(m_right)) {
- if (m_origRight == m_origLeft)
- m_right = m_left;
- else
- m_right = m_allocator.allocateScratchGPR();
- }
- if (reservedRegisters.get(m_result)) {
- if (m_origResult == m_origLeft)
- m_result = m_left;
- else if (m_origResult == m_origRight)
- m_result = m_right;
- else
- m_result = m_allocator.allocateScratchGPR();
- }
-
- if (!inputAndOutputRegisters.get(GPRInfo::tagMaskRegister))
- m_savedTagMaskRegister = m_allocator.allocateScratchGPR();
- if (!inputAndOutputRegisters.get(GPRInfo::tagTypeNumberRegister))
- m_savedTagTypeNumberRegister = m_allocator.allocateScratchGPR();
- }
-
- void initializeRegisters(CCallHelpers& jit)
- {
- if (m_left != m_origLeft)
- jit.move(m_origLeft, m_left);
- if (m_right != m_origRight && m_origRight != m_origLeft)
- jit.move(m_origRight, m_right);
-
- if (m_savedTagMaskRegister != InvalidGPRReg)
- jit.move(GPRInfo::tagMaskRegister, m_savedTagMaskRegister);
- if (m_savedTagTypeNumberRegister != InvalidGPRReg)
- jit.move(GPRInfo::tagTypeNumberRegister, m_savedTagTypeNumberRegister);
-
- jit.emitMaterializeTagCheckRegisters();
- }
-
- void restoreRegisters(CCallHelpers& jit)
- {
- if (m_origResult != m_result)
- jit.move(m_result, m_origResult);
- if (m_origLeft != m_left && m_origLeft != m_origResult)
- jit.move(m_left, m_origLeft);
- if (m_origRight != m_right && m_origRight != m_origResult && m_origRight != m_origLeft)
- jit.move(m_right, m_origRight);
-
- // We are guaranteed that the tag registers are not the same as the original input
- // or output registers. Otherwise, we would not have allocated a scratch for them.
- // Hence, we don't need to need to check for overlap like we do for the input registers.
- if (m_savedTagMaskRegister != InvalidGPRReg) {
- ASSERT(GPRInfo::tagMaskRegister != m_origLeft);
- ASSERT(GPRInfo::tagMaskRegister != m_origRight);
- ASSERT(GPRInfo::tagMaskRegister != m_origResult);
- jit.move(m_savedTagMaskRegister, GPRInfo::tagMaskRegister);
- }
- if (m_savedTagTypeNumberRegister != InvalidGPRReg) {
- ASSERT(GPRInfo::tagTypeNumberRegister != m_origLeft);
- ASSERT(GPRInfo::tagTypeNumberRegister != m_origRight);
- ASSERT(GPRInfo::tagTypeNumberRegister != m_origResult);
- jit.move(m_savedTagTypeNumberRegister, GPRInfo::tagTypeNumberRegister);
- }
- }
-
-private:
- ScratchRegisterAllocator& m_allocator;
-
- GPRReg& m_result;
- GPRReg& m_left;
- GPRReg& m_right;
-
- GPRReg m_origResult;
- GPRReg m_origLeft;
- GPRReg m_origRight;
-
- GPRReg m_savedTagMaskRegister { InvalidGPRReg };
- GPRReg m_savedTagTypeNumberRegister { InvalidGPRReg };
-};
-
-static void generateArithSubICFastPath(
</del><ins>+static void generateBinaryOpICFastPath(
</ins><span class="cx"> State& state, CodeBlock* codeBlock, GeneratedFunction generatedFunction,
</span><del>- StackMaps::RecordMap& recordMap, ArithSubDescriptor& ic)
</del><ins>+ StackMaps::RecordMap& recordMap, BinaryOpDescriptor& ic)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = state.graph.m_vm;
</span><del>- size_t sizeOfIC = sizeOfArithSub();
</del><ins>+ size_t sizeOfIC = ic.size();
</ins><span class="cx">
</span><span class="cx"> StackMaps::RecordMap::iterator iter = recordMap.find(ic.stackmapID());
</span><span class="cx"> if (iter == recordMap.end())
</span><span class="lines">@@ -440,46 +328,25 @@
</span><span class="cx">
</span><span class="cx"> CCallHelpers fastPathJIT(&vm, codeBlock);
</span><span class="cx">
</span><del>- SnippetOperand leftOperand(ic.leftType());
- SnippetOperand rightOperand(ic.rightType());
-
</del><span class="cx"> GPRReg result = record.locations[0].directGPR();
</span><span class="cx"> GPRReg left = record.locations[1].directGPR();
</span><span class="cx"> GPRReg right = record.locations[2].directGPR();
</span><del>-
</del><span class="cx"> RegisterSet usedRegisters = usedRegistersFor(record);
</span><del>- ScratchRegisterAllocator allocator(usedRegisters);
</del><span class="cx">
</span><del>- BinarySnippetRegisterContext context(allocator, result, left, right);
</del><ins>+ CCallHelpers::Jump done;
+ CCallHelpers::Jump slowPathStart;
</ins><span class="cx">
</span><del>- GPRReg scratchGPR = allocator.allocateScratchGPR();
- FPRReg leftFPR = allocator.allocateScratchFPR();
- FPRReg rightFPR = allocator.allocateScratchFPR();
- FPRReg scratchFPR = InvalidFPRReg;
</del><ins>+ switch (ic.nodeType()) {
+ case ArithSub:
+ generateArithSubFastPath(ic, fastPathJIT, result, left, right, usedRegisters, done, slowPathStart);
+ break;
+ default:
+ RELEASE_ASSERT_NOT_REACHED();
+ }
</ins><span class="cx">
</span><del>- JITSubGenerator gen(leftOperand, rightOperand, JSValueRegs(result), JSValueRegs(left), JSValueRegs(right), leftFPR, rightFPR, scratchGPR, scratchFPR);
-
- auto numberOfBytesUsedToPreserveReusedRegisters =
- allocator.preserveReusedRegistersByPushing(fastPathJIT, ScratchRegisterAllocator::ExtraStackSpace::NoExtraSpace);
-
- context.initializeRegisters(fastPathJIT);
- gen.generateFastPath(fastPathJIT);
-
- ASSERT(gen.didEmitFastPath());
- gen.endJumpList().link(&fastPathJIT);
- context.restoreRegisters(fastPathJIT);
- allocator.restoreReusedRegistersByPopping(fastPathJIT, numberOfBytesUsedToPreserveReusedRegisters,
- ScratchRegisterAllocator::ExtraStackSpace::SpaceForCCall);
- CCallHelpers::Jump done = fastPathJIT.jump();
-
- gen.slowPathJumpList().link(&fastPathJIT);
- context.restoreRegisters(fastPathJIT);
- allocator.restoreReusedRegistersByPopping(fastPathJIT, numberOfBytesUsedToPreserveReusedRegisters,
- ScratchRegisterAllocator::ExtraStackSpace::SpaceForCCall);
- CCallHelpers::Jump slowPathStart = fastPathJIT.jump();
-
</del><span class="cx"> char* startOfIC = bitwise_cast<char*>(generatedFunction) + record.instructionOffset;
</span><del>- generateInlineIfPossibleOutOfLineIfNot(state, vm, codeBlock, fastPathJIT, startOfIC, sizeOfIC, "ArithSub inline cache fast path", [&] (LinkBuffer& linkBuffer, CCallHelpers&, bool) {
</del><ins>+ const char* fastPathICName = ic.fastPathICName();
+ generateInlineIfPossibleOutOfLineIfNot(state, vm, codeBlock, fastPathJIT, startOfIC, sizeOfIC, fastPathICName, [&] (LinkBuffer& linkBuffer, CCallHelpers&, bool) {
</ins><span class="cx"> linkBuffer.link(done, CodeLocationLabel(startOfIC + sizeOfIC));
</span><span class="cx"> state.finalizer->sideCodeLinkBuffer->link(ic.m_slowPathDone[i], CodeLocationLabel(startOfIC + sizeOfIC));
</span><span class="cx">
</span><span class="lines">@@ -650,7 +517,7 @@
</span><span class="cx"> exit.m_exceptionHandlerCallSiteIndex = callSiteIndex;
</span><span class="cx">
</span><span class="cx"> OSRExit* callOperationExit = nullptr;
</span><del>- if (exitDescriptor.m_exceptionType == ExceptionType::SubGenerator) {
</del><ins>+ if (exitDescriptor.m_exceptionType == ExceptionType::BinaryOpGenerator) {
</ins><span class="cx"> exceptionHandlerManager.addNewCallOperationExit(iter->value[j].index, state.jitCode->osrExit.size() - 1);
</span><span class="cx"> callOperationExit = &exit;
</span><span class="cx"> } else
</span><span class="lines">@@ -694,7 +561,7 @@
</span><span class="cx"> GPRReg base = record.locations[1].directGPR();
</span><span class="cx"> if (base == result)
</span><span class="cx"> callOperationExit->registersToPreserveForCallThatMightThrow.set(base);
</span><del>- } else if (exitDescriptor.m_exceptionType == ExceptionType::SubGenerator) {
</del><ins>+ } else if (exitDescriptor.m_exceptionType == ExceptionType::BinaryOpGenerator) {
</ins><span class="cx"> GPRReg result = record.locations[0].directGPR();
</span><span class="cx"> GPRReg left = record.locations[1].directGPR();
</span><span class="cx"> GPRReg right = record.locations[2].directGPR();
</span><span class="lines">@@ -755,7 +622,7 @@
</span><span class="cx"> if (!state.getByIds.isEmpty()
</span><span class="cx"> || !state.putByIds.isEmpty()
</span><span class="cx"> || !state.checkIns.isEmpty()
</span><del>- || !state.arithSubs.isEmpty()
</del><ins>+ || !state.binaryOps.isEmpty()
</ins><span class="cx"> || !state.lazySlowPaths.isEmpty()) {
</span><span class="cx"> CCallHelpers slowPathJIT(&vm, codeBlock);
</span><span class="cx">
</span><span class="lines">@@ -903,17 +770,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (size_t i = state.arithSubs.size(); i--;) {
- ArithSubDescriptor& arithSub = state.arithSubs[i];
</del><ins>+ for (size_t i = state.binaryOps.size(); i--;) {
+ BinaryOpDescriptor& binaryOp = state.binaryOps[i];
</ins><span class="cx">
</span><span class="cx"> if (verboseCompilationEnabled())
</span><del>- dataLog("Handling ArithSub stackmap #", arithSub.stackmapID(), "\n");
</del><ins>+ dataLog("Handling ", binaryOp.name(), " stackmap #", binaryOp.stackmapID(), "\n");
</ins><span class="cx">
</span><del>- auto iter = recordMap.find(arithSub.stackmapID());
</del><ins>+ auto iter = recordMap.find(binaryOp.stackmapID());
</ins><span class="cx"> if (iter == recordMap.end())
</span><span class="cx"> continue; // It was optimized out.
</span><span class="cx">
</span><del>- CodeOrigin codeOrigin = arithSub.codeOrigin();
</del><ins>+ CodeOrigin codeOrigin = binaryOp.codeOrigin();
</ins><span class="cx"> for (unsigned i = 0; i < iter->value.size(); ++i) {
</span><span class="cx"> StackMaps::Record& record = iter->value[i].record;
</span><span class="cx"> RegisterSet usedRegisters = usedRegistersFor(record);
</span><span class="lines">@@ -922,7 +789,7 @@
</span><span class="cx"> GPRReg left = record.locations[1].directGPR();
</span><span class="cx"> GPRReg right = record.locations[2].directGPR();
</span><span class="cx">
</span><del>- arithSub.m_slowPathStarts.append(slowPathJIT.label());
</del><ins>+ binaryOp.m_slowPathStarts.append(slowPathJIT.label());
</ins><span class="cx"> bool addedUniqueExceptionJump = addNewExceptionJumpIfNecessary(iter->value[i].index);
</span><span class="cx"> if (result == left || result == right) {
</span><span class="cx"> // This situation has a really interesting register preservation story.
</span><span class="lines">@@ -932,9 +799,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callOperation(state, usedRegisters, slowPathJIT, codeOrigin, addedUniqueExceptionJump ? &exceptionJumpsToLink.last().first : &exceptionTarget,
</span><del>- operationValueSub, result, left, right).call();
</del><ins>+ binaryOp.slowPathFunction(), result, left, right).call();
</ins><span class="cx">
</span><del>- arithSub.m_slowPathDone.append(slowPathJIT.jump());
</del><ins>+ binaryOp.m_slowPathDone.append(slowPathJIT.jump());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1022,9 +889,9 @@
</span><span class="cx"> state, codeBlock, generatedFunction, recordMap, state.checkIns[i],
</span><span class="cx"> sizeOfIn());
</span><span class="cx"> }
</span><del>- for (unsigned i = state.arithSubs.size(); i--;) {
- ArithSubDescriptor& arithSub = state.arithSubs[i];
- generateArithSubICFastPath(state, codeBlock, generatedFunction, recordMap, arithSub);
</del><ins>+ for (unsigned i = state.binaryOps.size(); i--;) {
+ BinaryOpDescriptor& binaryOp = state.binaryOps[i];
+ generateBinaryOpICFastPath(state, codeBlock, generatedFunction, recordMap, binaryOp);
</ins><span class="cx"> }
</span><span class="cx"> for (unsigned i = state.lazySlowPaths.size(); i--;) {
</span><span class="cx"> LazySlowPathDescriptor& lazySlowPath = state.lazySlowPaths[i];
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompileBinaryOpcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp (0 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.cpp 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -0,0 +1,193 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "FTLCompileBinaryOp.h"
+
+#if ENABLE(FTL_JIT)
+
+#include "DFGNodeType.h"
+#include "FTLInlineCacheDescriptor.h"
+#include "GPRInfo.h"
+#include "JITSubGenerator.h"
+#include "ScratchRegisterAllocator.h"
+
+namespace JSC { namespace FTL {
+
+using namespace DFG;
+
+class BinarySnippetRegisterContext {
+ // The purpose of this class is to shuffle registers to get them into the state
+ // that baseline code expects so that we can use the baseline snippet generators i.e.
+ // 1. Ensure that the inputs and output are not in reserved registers (which
+ // include the tag registers). The snippet will use these reserved registers.
+ // Hence, we need to put the inputs and output in other scratch registers.
+ // 2. Tag registers are loaded with the expected values.
+ //
+ // When the snippet is done:
+ // 1. If we had re-assigned the result register to a scratch, we need to copy the
+ // result back from the scratch.
+ // 2. Restore the input and tag registers to the values that LLVM put there originally.
+ // That is unless when one of them is also the result register. In that case, we
+ // don't want to trash the result, and hence, should not restore into it.
+
+public:
+ BinarySnippetRegisterContext(ScratchRegisterAllocator& allocator, GPRReg& result, GPRReg& left, GPRReg& right)
+ : m_allocator(allocator)
+ , m_result(result)
+ , m_left(left)
+ , m_right(right)
+ , m_origResult(result)
+ , m_origLeft(left)
+ , m_origRight(right)
+ {
+ m_allocator.lock(m_result);
+ m_allocator.lock(m_left);
+ m_allocator.lock(m_right);
+
+ RegisterSet inputAndOutputRegisters = RegisterSet(m_left, m_right, m_result);
+ RegisterSet reservedRegisters;
+ for (GPRReg reg : GPRInfo::reservedRegisters())
+ reservedRegisters.set(reg);
+
+ if (reservedRegisters.get(m_left))
+ m_left = m_allocator.allocateScratchGPR();
+ if (reservedRegisters.get(m_right)) {
+ if (m_origRight == m_origLeft)
+ m_right = m_left;
+ else
+ m_right = m_allocator.allocateScratchGPR();
+ }
+ if (reservedRegisters.get(m_result)) {
+ if (m_origResult == m_origLeft)
+ m_result = m_left;
+ else if (m_origResult == m_origRight)
+ m_result = m_right;
+ else
+ m_result = m_allocator.allocateScratchGPR();
+ }
+
+ if (!inputAndOutputRegisters.get(GPRInfo::tagMaskRegister))
+ m_savedTagMaskRegister = m_allocator.allocateScratchGPR();
+ if (!inputAndOutputRegisters.get(GPRInfo::tagTypeNumberRegister))
+ m_savedTagTypeNumberRegister = m_allocator.allocateScratchGPR();
+ }
+
+ void initializeRegisters(CCallHelpers& jit)
+ {
+ if (m_left != m_origLeft)
+ jit.move(m_origLeft, m_left);
+ if (m_right != m_origRight && m_origRight != m_origLeft)
+ jit.move(m_origRight, m_right);
+
+ if (m_savedTagMaskRegister != InvalidGPRReg)
+ jit.move(GPRInfo::tagMaskRegister, m_savedTagMaskRegister);
+ if (m_savedTagTypeNumberRegister != InvalidGPRReg)
+ jit.move(GPRInfo::tagTypeNumberRegister, m_savedTagTypeNumberRegister);
+
+ jit.emitMaterializeTagCheckRegisters();
+ }
+
+ void restoreRegisters(CCallHelpers& jit)
+ {
+ if (m_origResult != m_result)
+ jit.move(m_result, m_origResult);
+ if (m_origLeft != m_left && m_origLeft != m_origResult)
+ jit.move(m_left, m_origLeft);
+ if (m_origRight != m_right && m_origRight != m_origResult && m_origRight != m_origLeft)
+ jit.move(m_right, m_origRight);
+
+ // We are guaranteed that the tag registers are not the same as the original input
+ // or output registers. Otherwise, we would not have allocated a scratch for them.
+ // Hence, we don't need to need to check for overlap like we do for the input registers.
+ if (m_savedTagMaskRegister != InvalidGPRReg) {
+ ASSERT(GPRInfo::tagMaskRegister != m_origLeft);
+ ASSERT(GPRInfo::tagMaskRegister != m_origRight);
+ ASSERT(GPRInfo::tagMaskRegister != m_origResult);
+ jit.move(m_savedTagMaskRegister, GPRInfo::tagMaskRegister);
+ }
+ if (m_savedTagTypeNumberRegister != InvalidGPRReg) {
+ ASSERT(GPRInfo::tagTypeNumberRegister != m_origLeft);
+ ASSERT(GPRInfo::tagTypeNumberRegister != m_origRight);
+ ASSERT(GPRInfo::tagTypeNumberRegister != m_origResult);
+ jit.move(m_savedTagTypeNumberRegister, GPRInfo::tagTypeNumberRegister);
+ }
+ }
+
+private:
+ ScratchRegisterAllocator& m_allocator;
+
+ GPRReg& m_result;
+ GPRReg& m_left;
+ GPRReg& m_right;
+
+ GPRReg m_origResult;
+ GPRReg m_origLeft;
+ GPRReg m_origRight;
+
+ GPRReg m_savedTagMaskRegister { InvalidGPRReg };
+ GPRReg m_savedTagTypeNumberRegister { InvalidGPRReg };
+};
+
+void generateArithSubFastPath(BinaryOpDescriptor& ic, CCallHelpers& jit,
+ GPRReg result, GPRReg left, GPRReg right, RegisterSet usedRegisters,
+ CCallHelpers::Jump& done, CCallHelpers::Jump& slowPathStart)
+{
+ ASSERT(ic.nodeType() == ArithSub);
+ ScratchRegisterAllocator allocator(usedRegisters);
+
+ BinarySnippetRegisterContext context(allocator, result, left, right);
+
+ GPRReg scratchGPR = allocator.allocateScratchGPR();
+ FPRReg leftFPR = allocator.allocateScratchFPR();
+ FPRReg rightFPR = allocator.allocateScratchFPR();
+ FPRReg scratchFPR = InvalidFPRReg;
+
+ JITSubGenerator gen(ic.leftOperand(), ic.rightOperand(), JSValueRegs(result),
+ JSValueRegs(left), JSValueRegs(right), leftFPR, rightFPR, scratchGPR, scratchFPR);
+
+ auto numberOfBytesUsedToPreserveReusedRegisters =
+ allocator.preserveReusedRegistersByPushing(jit, ScratchRegisterAllocator::ExtraStackSpace::NoExtraSpace);
+
+ context.initializeRegisters(jit);
+ gen.generateFastPath(jit);
+
+ ASSERT(gen.didEmitFastPath());
+ gen.endJumpList().link(&jit);
+ context.restoreRegisters(jit);
+ allocator.restoreReusedRegistersByPopping(jit, numberOfBytesUsedToPreserveReusedRegisters,
+ ScratchRegisterAllocator::ExtraStackSpace::SpaceForCCall);
+ done = jit.jump();
+
+ gen.slowPathJumpList().link(&jit);
+ context.restoreRegisters(jit);
+ allocator.restoreReusedRegistersByPopping(jit, numberOfBytesUsedToPreserveReusedRegisters,
+ ScratchRegisterAllocator::ExtraStackSpace::SpaceForCCall);
+ slowPathStart = jit.jump();
+}
+
+} } // namespace JSC::FTL
+
+#endif // ENABLE(FTL_JIT)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCompileBinaryOph"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.h (0 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.h (rev 0)
+++ trunk/Source/JavaScriptCore/ftl/FTLCompileBinaryOp.h 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FTLCompileBinaryOp_h
+#define FTLCompileBinaryOp_h
+
+#if ENABLE(FTL_JIT)
+
+#include "CCallHelpers.h"
+
+namespace JSC {
+namespace FTL {
+
+class BinaryOpDescriptor;
+
+void generateArithSubFastPath(BinaryOpDescriptor&, CCallHelpers&,
+ GPRReg result, GPRReg left, GPRReg right, RegisterSet usedRegisters,
+ CCallHelpers::Jump& done, CCallHelpers::Jump& slowPathStart);
+
+} // namespace FTL
+} // namespace JSC
+
+#endif // ENABLE(FTL_JIT)
+
+#endif // FTLCompileBinaryOp_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptor.h 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -29,9 +29,11 @@
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><span class="cx"> #include "CodeOrigin.h"
</span><ins>+#include "DFGAbstractValue.h"
</ins><span class="cx"> #include "FTLLazySlowPath.h"
</span><span class="cx"> #include "JITInlineCacheGenerator.h"
</span><span class="cx"> #include "MacroAssembler.h"
</span><ins>+#include "SnippetOperand.h"
</ins><span class="cx"> #include <wtf/text/UniquedStringImpl.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="lines">@@ -123,25 +125,52 @@
</span><span class="cx"> Vector<CheckInGenerator> m_generators;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ArithSubDescriptor : public InlineCacheDescriptor {
</del><ins>+class BinaryOpDescriptor : public InlineCacheDescriptor {
</ins><span class="cx"> public:
</span><del>- ArithSubDescriptor(unsigned stackmapID, CodeOrigin codeOrigin, ResultType leftType, ResultType rightType)
</del><ins>+ typedef EncodedJSValue (*SlowPathFunction)(ExecState*, EncodedJSValue encodedOp1, EncodedJSValue encodedOp2);
+
+ unsigned nodeType() const { return m_nodeType; }
+ size_t size() const { return m_size; }
+ const char* name() const { return m_name; }
+ const char* fastPathICName() const { return m_fastPathICName; }
+ SlowPathFunction slowPathFunction() const { return m_slowPathFunction; }
+
+ SnippetOperand leftOperand() { return m_leftOperand; }
+ SnippetOperand rightOperand() { return m_rightOperand; }
+
+ Vector<MacroAssembler::Label> m_slowPathStarts;
+
+protected:
+ BinaryOpDescriptor(unsigned nodeType, unsigned stackmapID, CodeOrigin codeOrigin,
+ size_t size, const char* name, const char* fastPathICName,
+ SlowPathFunction slowPathFunction, const SnippetOperand& leftOperand, const SnippetOperand& rightOperand)
</ins><span class="cx"> : InlineCacheDescriptor(stackmapID, codeOrigin, nullptr)
</span><del>- , m_leftType(leftType)
- , m_rightType(rightType)
</del><ins>+ , m_nodeType(nodeType)
+ , m_size(size)
+ , m_name(name)
+ , m_fastPathICName(fastPathICName)
+ , m_slowPathFunction(slowPathFunction)
+ , m_leftOperand(leftOperand)
+ , m_rightOperand(rightOperand)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ResultType leftType() const { return m_leftType; }
- ResultType rightType() const { return m_rightType; }
-
- Vector<MacroAssembler::Label> m_slowPathStarts;
</del><ins>+ unsigned m_nodeType;
+ size_t m_size;
+ const char* m_name;
+ const char* m_fastPathICName;
+ SlowPathFunction m_slowPathFunction;
</ins><span class="cx">
</span><del>-private:
- ResultType m_leftType;
- ResultType m_rightType;
</del><ins>+ SnippetOperand m_leftOperand;
+ SnippetOperand m_rightOperand;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+class ArithSubDescriptor : public BinaryOpDescriptor {
+public:
+ ArithSubDescriptor(unsigned stackmapID, CodeOrigin, const SnippetOperand& leftOperand, const SnippetOperand& rightOperand);
+ static size_t icSize();
+};
+
</ins><span class="cx"> // You can create a lazy slow path call in lowerDFGToLLVM by doing:
</span><span class="cx"> // m_ftlState.lazySlowPaths.append(
</span><span class="cx"> // LazySlowPathDescriptor(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLInlineCacheDescriptorInlinesh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h (0 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h (rev 0)
+++ trunk/Source/JavaScriptCore/ftl/FTLInlineCacheDescriptorInlines.h 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FTLInlineCacheDescriptorInlines_h
+#define FTLInlineCacheDescriptorInlines_h
+
+#if ENABLE(FTL_JIT)
+
+#include "DFGNodeType.h"
+#include "DFGOperations.h"
+#include "FTLInlineCacheDescriptor.h"
+#include "FTLInlineCacheSize.h"
+
+namespace JSC { namespace FTL {
+
+ArithSubDescriptor::ArithSubDescriptor(unsigned stackmapID, CodeOrigin codeOrigin,
+ const SnippetOperand& leftOperand, const SnippetOperand& rightOperand)
+ : BinaryOpDescriptor(DFG::ArithSub, stackmapID, codeOrigin, icSize(),
+ "ArithSub", "ArithSub IC fast path", DFG::operationValueSub, leftOperand, rightOperand)
+{
+}
+
+size_t ArithSubDescriptor::icSize()
+{
+ return sizeOfArithSub();
+}
+
+} } // namespace JSC::FTL
+
+#endif // ENABLE(FTL_JIT)
+
+#endif // FTLInlineCacheDescriptorInlines_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -1655,20 +1655,21 @@
</span><span class="cx"> // Arguments: id, bytes, target, numArgs, args...
</span><span class="cx"> StackmapArgumentList arguments;
</span><span class="cx"> arguments.append(m_out.constInt64(stackmapID));
</span><del>- arguments.append(m_out.constInt32(sizeOfArithSub()));
</del><ins>+ arguments.append(m_out.constInt32(ArithSubDescriptor::icSize()));
</ins><span class="cx"> arguments.append(constNull(m_out.ref8));
</span><span class="cx"> arguments.append(m_out.constInt32(2));
</span><span class="cx"> arguments.append(left);
</span><span class="cx"> arguments.append(right);
</span><span class="cx">
</span><del>- appendOSRExitArgumentsForPatchpointIfWillCatchException(arguments, ExceptionType::SubGenerator, 3); // left, right, and result show up in the stackmap locations.
</del><ins>+ appendOSRExitArgumentsForPatchpointIfWillCatchException(arguments,
+ ExceptionType::BinaryOpGenerator, 3); // left, right, and result show up in the stackmap locations.
</ins><span class="cx">
</span><span class="cx"> LValue call = m_out.call(m_out.int64, m_out.patchpointInt64Intrinsic(), arguments);
</span><span class="cx"> setInstructionCallingConvention(call, LLVMAnyRegCallConv);
</span><span class="cx">
</span><del>- m_ftlState.arithSubs.append(ArithSubDescriptor(stackmapID, m_node->origin.semantic,
- abstractValue(m_node->child1()).resultType(),
- abstractValue(m_node->child2()).resultType()));
</del><ins>+ SnippetOperand leftOperand(abstractValue(m_node->child1()).resultType());
+ SnippetOperand rightOperand(abstractValue(m_node->child2()).resultType());
+ m_ftlState.binaryOps.append(ArithSubDescriptor(stackmapID, m_node->origin.semantic, leftOperand, rightOperand));
</ins><span class="cx">
</span><span class="cx"> setJSValue(call);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> case ExceptionType::GetById:
</span><span class="cx"> case ExceptionType::PutById:
</span><span class="cx"> case ExceptionType::LazySlowPath:
</span><del>- case ExceptionType::SubGenerator:
</del><ins>+ case ExceptionType::BinaryOpGenerator:
</ins><span class="cx"> case ExceptionType::GetByIdCallOperation:
</span><span class="cx"> case ExceptionType::PutByIdCallOperation:
</span><span class="cx"> return true;
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> switch (m_exceptionType) {
</span><span class="cx"> case ExceptionType::GetByIdCallOperation:
</span><span class="cx"> case ExceptionType::PutByIdCallOperation:
</span><del>- case ExceptionType::SubGenerator:
</del><ins>+ case ExceptionType::BinaryOpGenerator:
</ins><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExith"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> PutById,
</span><span class="cx"> PutByIdCallOperation,
</span><span class="cx"> LazySlowPath,
</span><del>- SubGenerator,
</del><ins>+ BinaryOpGenerator,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct OSRExitDescriptor {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLState.h (192895 => 192896)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLState.h 2015-12-01 19:24:52 UTC (rev 192895)
+++ trunk/Source/JavaScriptCore/ftl/FTLState.h 2015-12-01 19:31:58 UTC (rev 192896)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> SegmentedVector<GetByIdDescriptor> getByIds;
</span><span class="cx"> SegmentedVector<PutByIdDescriptor> putByIds;
</span><span class="cx"> SegmentedVector<CheckInDescriptor> checkIns;
</span><del>- SegmentedVector<ArithSubDescriptor> arithSubs;
</del><ins>+ SegmentedVector<BinaryOpDescriptor> binaryOps;
</ins><span class="cx"> SegmentedVector<LazySlowPathDescriptor> lazySlowPaths;
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><span class="cx"> SegmentedVector<ProbeDescriptor> probes;
</span></span></pre>
</div>
</div>
</body>
</html>