<!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>[191426] 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/191426">191426</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-21 18:58:24 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Remove FTL Native Inlining, it is dead code
https://bugs.webkit.org/show_bug.cgi?id=150429
Patch by Benjamin Poulain <bpoulain@apple.com> on 2015-10-21
Reviewed by Filip Pizlo.
The code is not used and it is in the way of other changes.
* ftl/FTLAbbreviations.h:
(JSC::FTL::getFirstInstruction): Deleted.
(JSC::FTL::getNextInstruction): Deleted.
(JSC::FTL::getFirstBasicBlock): Deleted.
(JSC::FTL::getNextBasicBlock): Deleted.
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::isInlinableSize): Deleted.
* runtime/Options.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLAbbreviationsh">trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191425 => 191426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-22 01:58:24 UTC (rev 191426)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-10-21 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [JSC] Remove FTL Native Inlining, it is dead code
+ https://bugs.webkit.org/show_bug.cgi?id=150429
+
+ Reviewed by Filip Pizlo.
+
+ The code is not used and it is in the way of other changes.
+
+ * ftl/FTLAbbreviations.h:
+ (JSC::FTL::getFirstInstruction): Deleted.
+ (JSC::FTL::getNextInstruction): Deleted.
+ (JSC::FTL::getFirstBasicBlock): Deleted.
+ (JSC::FTL::getNextBasicBlock): Deleted.
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::DFG::LowerDFGToLLVM::isInlinableSize): Deleted.
+ * runtime/Options.h:
+
+2015-10-21 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [JSC] Remove two useless temporaries from the PutByOffset codegen
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150421
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLAbbreviationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h (191425 => 191426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2015-10-22 01:58:24 UTC (rev 191426)
</span><span class="lines">@@ -149,10 +149,6 @@
</span><span class="cx">
</span><span class="cx"> static inline void setMetadata(LValue instruction, unsigned kind, LValue metadata) { llvm->SetMetadata(instruction, kind, metadata); }
</span><span class="cx">
</span><del>-static inline LValue getFirstInstruction(LBasicBlock block) { return llvm->GetFirstInstruction(block); }
-static inline LValue getNextInstruction(LValue instruction) { return llvm->GetNextInstruction(instruction); }
-
-
</del><span class="cx"> static inline LValue addFunction(LModule module, const char* name, LType type) { return llvm->AddFunction(module, name, type); }
</span><span class="cx"> static inline LValue getNamedFunction(LModule module, const char* name) { return llvm->GetNamedFunction(module, name); }
</span><span class="cx"> static inline LValue getFirstFunction(LModule module) { return llvm->GetFirstFunction(module); }
</span><span class="lines">@@ -214,9 +210,6 @@
</span><span class="cx"> static inline LValue constNull(LType type) { return llvm->ConstNull(type); }
</span><span class="cx"> static inline LValue constBitCast(LValue value, LType type) { return llvm->ConstBitCast(value, type); }
</span><span class="cx">
</span><del>-static inline LBasicBlock getFirstBasicBlock(LValue function) { return llvm->GetFirstBasicBlock(function); }
-static inline LBasicBlock getNextBasicBlock(LBasicBlock block) { return llvm->GetNextBasicBlock(block); }
-
</del><span class="cx"> static inline LBasicBlock appendBasicBlock(LContext context, LValue function, const char* name = "") { return llvm->AppendBasicBlockInContext(context, function, name); }
</span><span class="cx"> static inline LBasicBlock insertBasicBlock(LContext context, LBasicBlock beforeBasicBlock, const char* name = "") { return llvm->InsertBasicBlockInContext(context, beforeBasicBlock, name); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (191425 => 191426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2015-10-22 01:58:24 UTC (rev 191426)
</span><span class="lines">@@ -5647,19 +5647,6 @@
</span><span class="cx"> m_out.appendTo(continuation, lastNext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isInlinableSize(LValue function)
- {
- size_t instructionCount = 0;
- size_t maxSize = Options::maximumLLVMInstructionCountForNativeInlining();
- for (LBasicBlock basicBlock = getFirstBasicBlock(function); basicBlock; basicBlock = getNextBasicBlock(basicBlock)) {
- for (LValue instruction = getFirstInstruction(basicBlock); instruction; instruction = getNextInstruction(instruction)) {
- if (++instructionCount >= maxSize)
- return false;
- }
- }
- return true;
- }
-
</del><span class="cx"> LValue didOverflowStack()
</span><span class="cx"> {
</span><span class="cx"> // This does a very simple leaf function analysis. The invariant of FTL call
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (191425 => 191426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2015-10-22 01:57:26 UTC (rev 191425)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2015-10-22 01:58:24 UTC (rev 191426)
</span><span class="lines">@@ -233,8 +233,6 @@
</span><span class="cx"> v(unsigned, maximumInliningDepth, 5, "maximum allowed inlining depth. Depth of 1 means no inlining") \
</span><span class="cx"> v(unsigned, maximumInliningRecursion, 2, nullptr) \
</span><span class="cx"> \
</span><del>- v(unsigned, maximumLLVMInstructionCountForNativeInlining, 80, nullptr) \
- \
</del><span class="cx"> /* Maximum size of a caller for enabling inlining. This is purely to protect us */\
</span><span class="cx"> /* from super long compiles that take a lot of memory. */\
</span><span class="cx"> v(unsigned, maximumInliningCallerSize, 10000, nullptr) \
</span></span></pre>
</div>
</div>
</body>
</html>