Changeset 260919 in webkit

Timestamp:

Apr 29, 2020 3:16:30 PM (4 years ago)

Author:

Ross Kirsling

Message:

Unreviewed follow-up to r260848.
LowerDFGToB3 has its own isFunction which should NOT have been renamed.

• ftl/FTLLowerDFGToB3.cpp:

(JSC::FTL::DFG::LowerDFGToB3::compileCreateThis):
(JSC::FTL::DFG::LowerDFGToB3::compileCreatePromise):
(JSC::FTL::DFG::LowerDFGToB3::compileCreateInternalFieldObject):
(JSC::FTL::DFG::LowerDFGToB3::compileIsObjectOrNull):
(JSC::FTL::DFG::LowerDFGToB3::compileIsFunction):
(JSC::FTL::DFG::LowerDFGToB3::buildTypeOf):
(JSC::FTL::DFG::LowerDFGToB3::isFunction): Renamed from isCallable.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ftl/FTLLowerDFGToB3.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-04-29  Ross Kirsling  <ross.kirsling@sony.com>
+
+        Unreviewed follow-up to r260848.
+        LowerDFGToB3 has its own isFunction which should NOT have been renamed.
+
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileCreateThis):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCreatePromise):
+        (JSC::FTL::DFG::LowerDFGToB3::compileCreateInternalFieldObject):
+        (JSC::FTL::DFG::LowerDFGToB3::compileIsObjectOrNull):
+        (JSC::FTL::DFG::LowerDFGToB3::compileIsFunction):
+        (JSC::FTL::DFG::LowerDFGToB3::buildTypeOf):
+        (JSC::FTL::DFG::LowerDFGToB3::isFunction): Renamed from isCallable.
+
 2020-04-29  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp

@@ -6973 +6973 @@
         LBasicBlock continuation = m_out.newBlock();
 
-        m_out.branch(isCallable(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowPath));
+        m_out.branch(isFunction(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowPath));
 
         LBasicBlock lastNext = m_out.appendTo(isFunctionBlock, hasRareData);
@@ -7018 +7018 @@
 
         LBasicBlock lastNext = m_out.appendTo(derivedCase, isFunctionBlock);
-        m_out.branch(isCallable(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowCase));
+        m_out.branch(isFunction(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowCase));
 
         m_out.appendTo(isFunctionBlock, hasRareData);
@@ -7073 +7073 @@
         LBasicBlock continuation = m_out.newBlock();
 
-        m_out.branch(isCallable(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowCase));
+        m_out.branch(isFunction(callee, provenType(m_node->child1())), usually(isFunctionBlock), rarely(slowCase));
 
         LBasicBlock lastNext = m_out.appendTo(isFunctionBlock, hasRareData);
@@ -11569 +11569 @@
         ValueFromBlock isFunctionResult = m_out.anchor(m_out.booleanFalse);
         m_out.branch(
-            isCallable(value, provenType(child)),
+            isFunction(value, provenType(child)),
             unsure(continuation), unsure(notFunctionCase));
         
@@ -11626 +11626 @@
         ValueFromBlock functionResult = m_out.anchor(m_out.booleanTrue);
         m_out.branch(
-            isCallable(value, provenType(child)),
+            isFunction(value, provenType(child)),
             unsure(continuation), unsure(notFunctionCase));
         
@@ -16195 +16195 @@
         m_out.appendTo(objectCase, functionCase);
         m_out.branch(
-            isCallable(value, provenType(child) & SpecObject),
+            isFunction(value, provenType(child) & SpecObject),
             unsure(functionCase), unsure(notFunctionCase));
         
@@ -17900 +17900 @@
     }
     
-    LValue isCallable(LValue cell, SpeculatedType type = SpecFullTop)
+    LValue isFunction(LValue cell, SpeculatedType type = SpecFullTop)
     {
         if (LValue proven = isProvenValue(type & SpecCell, SpecFunction))