Title: [205597] releases/WebKitGTK/webkit-2.14/Source/_javascript_Core
Revision
205597
Author
[email protected]
Date
2016-09-08 00:44:57 -0700 (Thu, 08 Sep 2016)

Log Message

Merge r205204 - [JSC] Clean up the remaining compare nodes in FTLCapabilities
https://bugs.webkit.org/show_bug.cgi?id=161400

Patch by Benjamin Poulain <[email protected]> on 2016-08-30
Reviewed by Geoffrey Garen.

It looks like we implemented all the cases without realizing it.

* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compare):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog (205596 => 205597)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2016-09-08 07:44:49 UTC (rev 205596)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2016-09-08 07:44:57 UTC (rev 205597)
@@ -1,3 +1,17 @@
+2016-08-30  Benjamin Poulain  <[email protected]>
+
+        [JSC] Clean up the remaining compare nodes in FTLCapabilities
+        https://bugs.webkit.org/show_bug.cgi?id=161400
+
+        Reviewed by Geoffrey Garen.
+
+        It looks like we implemented all the cases without realizing it.
+
+        * ftl/FTLCapabilities.cpp:
+        (JSC::FTL::canCompile):
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compare):
+
 2016-08-30  Mark Lam  <[email protected]>
 
         Introduce the ThrowScope and force every throw site to instantiate a ThrowScope.

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLCapabilities.cpp (205596 => 205597)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLCapabilities.cpp	2016-09-08 07:44:49 UTC (rev 205596)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLCapabilities.cpp	2016-09-08 07:44:57 UTC (rev 205597)
@@ -247,6 +247,10 @@
     case PutDynamicVar:
     case CompareEq:
     case CompareEqPtr:
+    case CompareLess:
+    case CompareLessEq:
+    case CompareGreater:
+    case CompareGreaterEq:
     case CompareStrictEq:
         // These are OK.
         break;
@@ -364,23 +368,6 @@
             return CannotCompile;
         }
         break;
-    case CompareLess:
-    case CompareLessEq:
-    case CompareGreater:
-    case CompareGreaterEq:
-        if (node->isBinaryUseKind(Int32Use))
-            break;
-        if (node->isBinaryUseKind(Int52RepUse))
-            break;
-        if (node->isBinaryUseKind(DoubleRepUse))
-            break;
-        if (node->isBinaryUseKind(StringIdentUse))
-            break;
-        if (node->isBinaryUseKind(StringUse))
-            break;
-        if (node->isBinaryUseKind(UntypedUse))
-            break;
-        return CannotCompile;
     default:
         // Don't know how to handle anything else.
         return CannotCompile;

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (205596 => 205597)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2016-09-08 07:44:49 UTC (rev 205596)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2016-09-08 07:44:57 UTC (rev 205597)
@@ -8089,12 +8089,8 @@
             return;
         }
 
-        if (m_node->isBinaryUseKind(UntypedUse)) {
-            nonSpeculativeCompare(intFunctor, fallbackFunction);
-            return;
-        }
-        
-        DFG_CRASH(m_graph, m_node, "Bad use kinds");
+        DFG_ASSERT(m_graph, m_node, m_node->isBinaryUseKind(UntypedUse));
+        nonSpeculativeCompare(intFunctor, fallbackFunction);
     }
 
     void compileResolveScope()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to