<!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>[205638] releases/WebKitGTK/webkit-2.14/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/205638">205638</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-08 08:13:05 -0700 (Thu, 08 Sep 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205380">r205380</a> - [JSC] Remove some more useless cases from FTL Capabilities
https://bugs.webkit.org/show_bug.cgi?id=161466

Patch by Benjamin Poulain &lt;bpoulain@apple.com&gt; on 2016-09-02
Reviewed by Geoffrey Garen.

Some cases do not make sense:
-In: Fixup only generate CellUse.
-PutByIdXXX: same.
-GetIndexedPropertyStorage: those cases are the only ones supported
 by DFG. We would have crashed in SpeculativeJIT if other modes
 were generated.

* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compilePutById):
(JSC::FTL::DFG::LowerDFGToB3::compileGetIndexedPropertyStorage):
(JSC::FTL::DFG::LowerDFGToB3::compileIn):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreftlFTLCapabilitiescpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreftlFTLLowerDFGToB3cpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog (205637 => 205638)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog        2016-09-08 15:11:14 UTC (rev 205637)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog        2016-09-08 15:13:05 UTC (rev 205638)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-09-02  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
+
+        [JSC] Remove some more useless cases from FTL Capabilities
+        https://bugs.webkit.org/show_bug.cgi?id=161466
+
+        Reviewed by Geoffrey Garen.
+
+        Some cases do not make sense:
+        -In: Fixup only generate CellUse.
+        -PutByIdXXX: same.
+        -GetIndexedPropertyStorage: those cases are the only ones supported
+         by DFG. We would have crashed in SpeculativeJIT if other modes
+         were generated.
+
+        * ftl/FTLCapabilities.cpp:
+        (JSC::FTL::canCompile):
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compilePutById):
+        (JSC::FTL::DFG::LowerDFGToB3::compileGetIndexedPropertyStorage):
+        (JSC::FTL::DFG::LowerDFGToB3::compileIn):
+
</ins><span class="cx"> 2016-09-02  Caio Lima  &lt;ticaiolima@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Register usage optimization in mathIC when LHS and RHS are constants isn't configured correctly
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (205637 => 205638)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2016-09-08 15:11:14 UTC (rev 205637)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLCapabilities.cpp        2016-09-08 15:13:05 UTC (rev 205638)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx">     case Throw:
</span><span class="cx">     case ThrowReferenceError:
</span><span class="cx">     case Unreachable:
</span><ins>+    case In:
</ins><span class="cx">     case IsJSArray:
</span><span class="cx">     case IsEmpty:
</span><span class="cx">     case IsUndefined:
</span><span class="lines">@@ -204,6 +205,7 @@
</span><span class="cx">     case HasStructureProperty:
</span><span class="cx">     case GetDirectPname:
</span><span class="cx">     case GetEnumerableLength:
</span><ins>+    case GetIndexedPropertyStorage:
</ins><span class="cx">     case GetPropertyEnumerator:
</span><span class="cx">     case GetEnumeratorStructurePname:
</span><span class="cx">     case GetEnumeratorGenericPname:
</span><span class="lines">@@ -224,6 +226,10 @@
</span><span class="cx">     case ForwardVarargs:
</span><span class="cx">     case Switch:
</span><span class="cx">     case TypeOf:
</span><ins>+    case PutById:
+    case PutByIdDirect:
+    case PutByIdFlush:
+    case PutByIdWithThis:
</ins><span class="cx">     case PutGetterById:
</span><span class="cx">     case PutSetterById:
</span><span class="cx">     case PutGetterSetterById:
</span><span class="lines">@@ -261,24 +267,6 @@
</span><span class="cx">         // case because it would prevent us from catching bugs where the FTL backend
</span><span class="cx">         // pipeline failed to optimize out an Identity.
</span><span class="cx">         break;
</span><del>-    case In:
-        if (node-&gt;child2().useKind() == CellUse)
-            break;
-        return CannotCompile;
-    case PutByIdDirect:
-    case PutById:
-    case PutByIdFlush:
-        if (node-&gt;child1().useKind() == CellUse)
-            break;
-        return CannotCompile;
-    case PutByIdWithThis:
-        break;
-    case GetIndexedPropertyStorage:
-        if (node-&gt;arrayMode().type() == Array::String)
-            break;
-        if (isTypedView(node-&gt;arrayMode().typedArrayType()))
-            break;
-        return CannotCompile;
</del><span class="cx">     case CheckArray:
</span><span class="cx">         switch (node-&gt;arrayMode().type()) {
</span><span class="cx">         case Array::Int32:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (205637 => 205638)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp        2016-09-08 15:11:14 UTC (rev 205637)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp        2016-09-08 15:13:05 UTC (rev 205638)
</span><span class="lines">@@ -2707,11 +2707,9 @@
</span><span class="cx">     
</span><span class="cx">     void compilePutById()
</span><span class="cx">     {
</span><ins>+        DFG_ASSERT(m_graph, m_node, m_node-&gt;child1().useKind() == CellUse);
+
</ins><span class="cx">         Node* node = m_node;
</span><del>-        
-        // See above; CellUse is easier so we do only that for now.
-        ASSERT(node-&gt;child1().useKind() == CellUse);
-
</del><span class="cx">         LValue base = lowCell(node-&gt;child1());
</span><span class="cx">         LValue value = lowJSValue(node-&gt;child2());
</span><span class="cx">         auto uid = m_graph.identifiers()[node-&gt;identifierNumber()];
</span><span class="lines">@@ -2813,7 +2811,8 @@
</span><span class="cx">             setStorage(m_out.loadPtr(m_out.phi(pointerType(), fastResult, slowResult), m_heaps.StringImpl_data));
</span><span class="cx">             return;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
+        DFG_ASSERT(m_graph, m_node, isTypedView(m_node-&gt;arrayMode().typedArrayType()));
</ins><span class="cx">         setStorage(m_out.loadPtr(cell, m_heaps.JSArrayBufferView_vector));
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -6511,6 +6510,8 @@
</span><span class="cx">     
</span><span class="cx">     void compileIn()
</span><span class="cx">     {
</span><ins>+        DFG_ASSERT(m_graph, m_node, m_node-&gt;child2().useKind() == CellUse);
+
</ins><span class="cx">         Node* node = m_node;
</span><span class="cx">         Edge base = node-&gt;child2();
</span><span class="cx">         LValue cell = lowCell(base);
</span></span></pre>
</div>
</div>

</body>
</html>