<!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>[192260] 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/192260">192260</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2015-11-10 12:42:32 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename FTL's ExitArgumentList to something more indicative of what it is
https://bugs.webkit.org/show_bug.cgi?id=151078
Reviewed by Geoffrey Garen.
New name is: StackmapArgumentList
We use this to build patchpoint and stackmap intrinsics in FTLLowerDFGToLLVM.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* ftl/FTLExitArgumentList.h: Removed.
* ftl/FTLJSTailCall.h:
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::compilePutById):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstruct):
(JSC::FTL::DFG::LowerDFGToLLVM::compileTailCall):
(JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstructVarargs):
(JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
(JSC::FTL::DFG::LowerDFGToLLVM::getById):
(JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):
(JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitArgumentsForPatchpointIfWillCatchException):
(JSC::FTL::DFG::LowerDFGToLLVM::emitOSRExitCall):
(JSC::FTL::DFG::LowerDFGToLLVM::buildExitArguments):
(JSC::FTL::DFG::LowerDFGToLLVM::callStackmap):
(JSC::FTL::DFG::LowerDFGToLLVM::exitValueForAvailability):
(JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode):
(JSC::FTL::DFG::LowerDFGToLLVM::exitArgument):
(JSC::FTL::DFG::LowerDFGToLLVM::exitValueForTailCall):
* ftl/FTLOSRExit.cpp:
* ftl/FTLOSRExit.h:
* ftl/FTLStackmapArgumentList.h: Copied from Source/JavaScriptCore/ftl/FTLExitArgumentList.h.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceJavaScriptCoreftlFTLJSTailCallh">trunk/Source/JavaScriptCore/ftl/FTLJSTailCall.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreftlFTLStackmapArgumentListh">trunk/Source/JavaScriptCore/ftl/FTLStackmapArgumentList.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreftlFTLExitArgumentListh">trunk/Source/JavaScriptCore/ftl/FTLExitArgumentList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-11-10 Saam barati <sbarati@apple.com>
+
+ Rename FTL's ExitArgumentList to something more indicative of what it is
+ https://bugs.webkit.org/show_bug.cgi?id=151078
+
+ Reviewed by Geoffrey Garen.
+
+ New name is: StackmapArgumentList
+ We use this to build patchpoint and stackmap intrinsics in FTLLowerDFGToLLVM.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * ftl/FTLExitArgumentList.h: Removed.
+ * ftl/FTLJSTailCall.h:
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::compilePutById):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstruct):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileTailCall):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileCallOrConstructVarargs):
+ (JSC::FTL::DFG::LowerDFGToLLVM::compileInvalidationPoint):
+ (JSC::FTL::DFG::LowerDFGToLLVM::getById):
+ (JSC::FTL::DFG::LowerDFGToLLVM::lazySlowPath):
+ (JSC::FTL::DFG::LowerDFGToLLVM::callCheck):
+ (JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExitArgumentsForPatchpointIfWillCatchException):
+ (JSC::FTL::DFG::LowerDFGToLLVM::emitOSRExitCall):
+ (JSC::FTL::DFG::LowerDFGToLLVM::buildExitArguments):
+ (JSC::FTL::DFG::LowerDFGToLLVM::callStackmap):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForAvailability):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForNode):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitArgument):
+ (JSC::FTL::DFG::LowerDFGToLLVM::exitValueForTailCall):
+ * ftl/FTLOSRExit.cpp:
+ * ftl/FTLOSRExit.h:
+ * ftl/FTLStackmapArgumentList.h: Copied from Source/JavaScriptCore/ftl/FTLExitArgumentList.h.
+
</ins><span class="cx"> 2015-11-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [B3] Add more tests for Check and fix bugs this found
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -1292,7 +1292,7 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLDWARFRegister.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitArgument.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitArgumentForOperand.h" />
</span><del>- <ClInclude Include="..\ftl\FTLExitArgumentList.h" />
</del><ins>+ <ClInclude Include="..\ftl\FTLStackmapArgumentList.h" />
</ins><span class="cx"> <ClInclude Include="..\ftl\FTLExitPropertyValue.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitThunkGenerator.h" />
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitTimeObjectMaterialization.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -4126,7 +4126,7 @@
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitArgumentForOperand.h">
</span><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\ftl\FTLExitArgumentList.h">
</del><ins>+ <ClInclude Include="..\ftl\FTLStackmapArgumentList.h">
</ins><span class="cx"> <Filter>ftl</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\ftl\FTLExitThunkGenerator.h">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> 0F235BD417178E1C00690C7F /* FTLExitArgument.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BBE17178E1C00690C7F /* FTLExitArgument.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F235BD517178E1C00690C7F /* FTLExitArgumentForOperand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BBF17178E1C00690C7F /* FTLExitArgumentForOperand.cpp */; };
</span><span class="cx"> 0F235BD617178E1C00690C7F /* FTLExitArgumentForOperand.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BC017178E1C00690C7F /* FTLExitArgumentForOperand.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F235BD717178E1C00690C7F /* FTLExitArgumentList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BC117178E1C00690C7F /* FTLExitArgumentList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 0F235BD717178E1C00690C7F /* FTLStackmapArgumentList.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BC117178E1C00690C7F /* FTLStackmapArgumentList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0F235BD817178E1C00690C7F /* FTLExitThunkGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BC217178E1C00690C7F /* FTLExitThunkGenerator.cpp */; };
</span><span class="cx"> 0F235BD917178E1C00690C7F /* FTLExitThunkGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F235BC317178E1C00690C7F /* FTLExitThunkGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F235BDA17178E1C00690C7F /* FTLExitValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F235BC417178E1C00690C7F /* FTLExitValue.cpp */; };
</span><span class="lines">@@ -2172,7 +2172,7 @@
</span><span class="cx"> 0F235BBE17178E1C00690C7F /* FTLExitArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLExitArgument.h; path = ftl/FTLExitArgument.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BBF17178E1C00690C7F /* FTLExitArgumentForOperand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLExitArgumentForOperand.cpp; path = ftl/FTLExitArgumentForOperand.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BC017178E1C00690C7F /* FTLExitArgumentForOperand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLExitArgumentForOperand.h; path = ftl/FTLExitArgumentForOperand.h; sourceTree = "<group>"; };
</span><del>- 0F235BC117178E1C00690C7F /* FTLExitArgumentList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLExitArgumentList.h; path = ftl/FTLExitArgumentList.h; sourceTree = "<group>"; };
</del><ins>+ 0F235BC117178E1C00690C7F /* FTLStackmapArgumentList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLStackmapArgumentList.h; path = ftl/FTLStackmapArgumentList.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0F235BC217178E1C00690C7F /* FTLExitThunkGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLExitThunkGenerator.cpp; path = ftl/FTLExitThunkGenerator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BC317178E1C00690C7F /* FTLExitThunkGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FTLExitThunkGenerator.h; path = ftl/FTLExitThunkGenerator.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F235BC417178E1C00690C7F /* FTLExitValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FTLExitValue.cpp; path = ftl/FTLExitValue.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4342,7 +4342,7 @@
</span><span class="cx"> 0F235BBE17178E1C00690C7F /* FTLExitArgument.h */,
</span><span class="cx"> 0F235BBF17178E1C00690C7F /* FTLExitArgumentForOperand.cpp */,
</span><span class="cx"> 0F235BC017178E1C00690C7F /* FTLExitArgumentForOperand.h */,
</span><del>- 0F235BC117178E1C00690C7F /* FTLExitArgumentList.h */,
</del><ins>+ 0F235BC117178E1C00690C7F /* FTLStackmapArgumentList.h */,
</ins><span class="cx"> 0F2B9CEE19D0BAC100B1D1B5 /* FTLExitPropertyValue.cpp */,
</span><span class="cx"> 0F2B9CEF19D0BAC100B1D1B5 /* FTLExitPropertyValue.h */,
</span><span class="cx"> 0F235BC217178E1C00690C7F /* FTLExitThunkGenerator.cpp */,
</span><span class="lines">@@ -7006,7 +7006,7 @@
</span><span class="cx"> 0F235BD417178E1C00690C7F /* FTLExitArgument.h in Headers */,
</span><span class="cx"> 0F338E0C1BF0276C0013C88F /* B3Compilation.h in Headers */,
</span><span class="cx"> 0F235BD617178E1C00690C7F /* FTLExitArgumentForOperand.h in Headers */,
</span><del>- 0F235BD717178E1C00690C7F /* FTLExitArgumentList.h in Headers */,
</del><ins>+ 0F235BD717178E1C00690C7F /* FTLStackmapArgumentList.h in Headers */,
</ins><span class="cx"> 0F2B9CF519D0BAC100B1D1B5 /* FTLExitPropertyValue.h in Headers */,
</span><span class="cx"> 0F235BD917178E1C00690C7F /* FTLExitThunkGenerator.h in Headers */,
</span><span class="cx"> 0F2B9CF719D0BAC100B1D1B5 /* FTLExitTimeObjectMaterialization.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLExitArgumentListh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/ftl/FTLExitArgumentList.h (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLExitArgumentList.h 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ftl/FTLExitArgumentList.h 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -1,43 +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 FTLExitArgumentList_h
-#define FTLExitArgumentList_h
-
-#if ENABLE(FTL_JIT)
-
-#include "FTLAbbreviations.h"
-#include <wtf/Vector.h>
-
-namespace JSC { namespace FTL {
-
-typedef Vector<LValue, 16> ExitArgumentList;
-
-} } // namespace JSC::FTL
-
-#endif // ENABLE(FTL_JIT)
-
-#endif // FTLExitArgumentList_h
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLJSTailCallh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLJSTailCall.h (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLJSTailCall.h 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ftl/FTLJSTailCall.h 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FTL_JIT)
</span><span class="cx">
</span><del>-#include "FTLExitArgumentList.h"
</del><span class="cx"> #include "FTLExitValue.h"
</span><span class="cx"> #include "FTLJSCallBase.h"
</span><ins>+#include "FTLStackmapArgumentList.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -2361,7 +2361,7 @@
</span><span class="cx"> if (verboseCompilationEnabled())
</span><span class="cx"> dataLog(" Emitting PutById patchpoint with stackmap #", stackmapID, "\n");
</span><span class="cx">
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx"> arguments.append(base);
</span><span class="cx"> arguments.append(value);
</span><span class="cx">
</span><span class="lines">@@ -4579,7 +4579,7 @@
</span><span class="cx"> unsigned padding = alignedFrameSize - frameSize;
</span><span class="cx"> // Documentation about stackmap and patchpoint intrinsics:
</span><span class="cx"> // http://llvm.org/docs/StackMaps.html
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx"> arguments.append(jsCallee); // callee -> %rax
</span><span class="cx"> arguments.append(getUndef(m_out.int64)); // code block
</span><span class="cx"> arguments.append(jsCallee); // callee -> stack
</span><span class="lines">@@ -4607,7 +4607,7 @@
</span><span class="cx"> void compileTailCall()
</span><span class="cx"> {
</span><span class="cx"> int numArgs = m_node->numChildren() - 1;
</span><del>- ExitArgumentList exitArguments;
</del><ins>+ StackmapArgumentList exitArguments;
</ins><span class="cx"> exitArguments.reserveCapacity(numArgs + 6);
</span><span class="cx">
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="lines">@@ -4665,7 +4665,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="cx">
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx"> arguments.append(jsCallee);
</span><span class="cx"> if (jsArguments)
</span><span class="cx"> arguments.append(jsArguments);
</span><span class="lines">@@ -5062,7 +5062,7 @@
</span><span class="cx">
</span><span class="cx"> OSRExitDescriptor& exitDescriptor = m_ftlState.jitCode->osrExitDescriptors.last();
</span><span class="cx">
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx">
</span><span class="cx"> buildExitArguments(exitDescriptor, arguments, FormattedValue(), exitDescriptor.m_codeOrigin);
</span><span class="cx"> callStackmap(exitDescriptor, arguments);
</span><span class="lines">@@ -6238,7 +6238,7 @@
</span><span class="cx"> if (Options::verboseCompilation())
</span><span class="cx"> dataLog(" Emitting GetById patchpoint with stackmap #", stackmapID, "\n");
</span><span class="cx">
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx"> arguments.append(base);
</span><span class="cx">
</span><span class="cx"> appendOSRExitArgumentsForPatchpointIfWillCatchException(arguments, LLVMAnyRegCallConv, 2, false, true); // 2 arguments show up in the stackmap locations: the result and the base.
</span><span class="lines">@@ -7589,7 +7589,7 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned stackmapID = m_stackmapIDs++;
</span><span class="cx">
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx"> arguments.append(m_out.constInt64(stackmapID));
</span><span class="cx"> arguments.append(m_out.constInt32(MacroAssembler::maxJumpReplacementSize()));
</span><span class="cx"> arguments.append(constNull(m_out.ref8));
</span><span class="lines">@@ -8845,7 +8845,7 @@
</span><span class="cx"> m_out.appendTo(continuation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void appendOSRExitArgumentsForPatchpointIfWillCatchException(ExitArgumentList& arguments, LCallConv callingConvention, unsigned offsetOfExitArguments, bool isLazySlowPath = false, bool isGetBydId = false)
</del><ins>+ void appendOSRExitArgumentsForPatchpointIfWillCatchException(StackmapArgumentList& arguments, LCallConv callingConvention, unsigned offsetOfExitArguments, bool isLazySlowPath = false, bool isGetBydId = false)
</ins><span class="cx"> {
</span><span class="cx"> CodeOrigin opCatchOrigin;
</span><span class="cx"> HandlerInfo* exceptionHandler;
</span><span class="lines">@@ -8864,7 +8864,7 @@
</span><span class="cx"> exitDescriptor.m_baselineExceptionHandler = *exceptionHandler;
</span><span class="cx"> exitDescriptor.m_stackmapID = m_stackmapIDs - 1;
</span><span class="cx">
</span><del>- ExitArgumentList freshList;
</del><ins>+ StackmapArgumentList freshList;
</ins><span class="cx"> buildExitArguments(exitDescriptor, freshList, noValue(), exitDescriptor.m_codeOrigin);
</span><span class="cx"> arguments.appendVector(freshList);
</span><span class="cx">
</span><span class="lines">@@ -8964,7 +8964,7 @@
</span><span class="cx">
</span><span class="cx"> void emitOSRExitCall(OSRExitDescriptor& exitDescriptor, FormattedValue lowValue)
</span><span class="cx"> {
</span><del>- ExitArgumentList arguments;
</del><ins>+ StackmapArgumentList arguments;
</ins><span class="cx">
</span><span class="cx"> CodeOrigin codeOrigin = exitDescriptor.m_codeOrigin;
</span><span class="cx">
</span><span class="lines">@@ -8974,7 +8974,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void buildExitArguments(
</span><del>- OSRExitDescriptor& exitDescriptor, ExitArgumentList& arguments, FormattedValue lowValue,
</del><ins>+ OSRExitDescriptor& exitDescriptor, StackmapArgumentList& arguments, FormattedValue lowValue,
</ins><span class="cx"> CodeOrigin codeOrigin)
</span><span class="cx"> {
</span><span class="cx"> if (!!lowValue)
</span><span class="lines">@@ -9032,7 +9032,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void callStackmap(OSRExitDescriptor& exitDescriptor, ExitArgumentList& arguments)
</del><ins>+ void callStackmap(OSRExitDescriptor& exitDescriptor, StackmapArgumentList& arguments)
</ins><span class="cx"> {
</span><span class="cx"> exitDescriptor.m_stackmapID = m_stackmapIDs++;
</span><span class="cx"> arguments.insert(0, m_out.constInt32(MacroAssembler::maxJumpReplacementSize()));
</span><span class="lines">@@ -9042,7 +9042,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExitValue exitValueForAvailability(
</span><del>- ExitArgumentList& arguments, const HashMap<Node*, ExitTimeObjectMaterialization*>& map,
</del><ins>+ StackmapArgumentList& arguments, const HashMap<Node*, ExitTimeObjectMaterialization*>& map,
</ins><span class="cx"> Availability availability)
</span><span class="cx"> {
</span><span class="cx"> FlushedAt flush = availability.flushedAt();
</span><span class="lines">@@ -9077,7 +9077,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExitValue exitValueForNode(
</span><del>- ExitArgumentList& arguments, const HashMap<Node*, ExitTimeObjectMaterialization*>& map,
</del><ins>+ StackmapArgumentList& arguments, const HashMap<Node*, ExitTimeObjectMaterialization*>& map,
</ins><span class="cx"> Node* node)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(node->shouldGenerate());
</span><span class="lines">@@ -9144,14 +9144,14 @@
</span><span class="cx"> return ExitValue::dead();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExitValue exitArgument(ExitArgumentList& arguments, DataFormat format, LValue value)
</del><ins>+ ExitValue exitArgument(StackmapArgumentList& arguments, DataFormat format, LValue value)
</ins><span class="cx"> {
</span><span class="cx"> ExitValue result = ExitValue::exitArgument(ExitArgument(format, arguments.size()));
</span><span class="cx"> arguments.append(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ExitValue exitValueForTailCall(ExitArgumentList& arguments, Node* node)
</del><ins>+ ExitValue exitValueForTailCall(StackmapArgumentList& arguments, Node* node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(node->shouldGenerate());
</span><span class="cx"> ASSERT(node->hasResult());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.cpp 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "DFGBasicBlock.h"
</span><span class="cx"> #include "DFGNode.h"
</span><span class="cx"> #include "FTLExitArgument.h"
</span><del>-#include "FTLExitArgumentList.h"
</del><span class="cx"> #include "FTLJITCode.h"
</span><span class="cx"> #include "FTLLocation.h"
</span><span class="cx"> #include "JSCInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSRExith"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h (192259 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-11-10 20:05:01 UTC (rev 192259)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSRExit.h 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> #include "DFGExitProfile.h"
</span><span class="cx"> #include "DFGOSRExitBase.h"
</span><span class="cx"> #include "FTLAbbreviations.h"
</span><del>-#include "FTLExitArgumentList.h"
</del><span class="cx"> #include "FTLExitTimeObjectMaterialization.h"
</span><span class="cx"> #include "FTLExitValue.h"
</span><span class="cx"> #include "FTLFormattedValue.h"
</span><span class="cx"> #include "FTLStackMaps.h"
</span><ins>+#include "FTLStackmapArgumentList.h"
</ins><span class="cx"> #include "HandlerInfo.h"
</span><span class="cx"> #include "MethodOfGettingAValueProfile.h"
</span><span class="cx"> #include "Operands.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLStackmapArgumentListhfromrev192258trunkSourceJavaScriptCoreftlFTLExitArgumentListh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/ftl/FTLStackmapArgumentList.h (from rev 192258, trunk/Source/JavaScriptCore/ftl/FTLExitArgumentList.h) (0 => 192260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLStackmapArgumentList.h (rev 0)
+++ trunk/Source/JavaScriptCore/ftl/FTLStackmapArgumentList.h 2015-11-10 20:42:32 UTC (rev 192260)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2013-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 FTLStackmapArgumentList_h
+#define FTLStackmapArgumentList_h
+
+#if ENABLE(FTL_JIT)
+
+#include "FTLAbbreviations.h"
+#include <wtf/Vector.h>
+
+namespace JSC { namespace FTL {
+
+typedef Vector<LValue, 16> StackmapArgumentList;
+
+} } // namespace JSC::FTL
+
+#endif // ENABLE(FTL_JIT)
+
+#endif // FTLStackmapArgumentList_h
+
</ins></span></pre>
</div>
</div>
</body>
</html>