[webkit-changes] [260919] trunk/Source/JavaScriptCore

Wed, 29 Apr 2020 15:17:20 -0700

Title: [260919] trunk/Source/_javascript_Core
Revision
260919
Author
[email protected]
Date
2020-04-29 15:16:30 -0700 (Wed, 29 Apr 2020)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (260918 => 260919)


--- trunk/Source/_javascript_Core/ChangeLog	2020-04-29 22:13:28 UTC (rev 260918)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-04-29 22:16:30 UTC (rev 260919)
@@ -1,3 +1,17 @@
+2020-04-29  Ross Kirsling  <[email protected]>
+
+        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  <[email protected]>
 
         AsyncFromSyncIterator methods should not pass absent values

Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (260918 => 260919)


--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2020-04-29 22:13:28 UTC (rev 260918)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2020-04-29 22:16:30 UTC (rev 260919)
@@ -6972,7 +6972,7 @@
         LBasicBlock slowPath = m_out.newBlock();
         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);
         LValue rareDataTags = m_out.loadPtr(callee, m_heaps.JSFunction_executableOrRareData);
@@ -7017,7 +7017,7 @@
         m_out.branch(m_out.equal(callee, weakPointer(m_node->isInternalPromise() ? globalObject->internalPromiseConstructor() : globalObject->promiseConstructor())), unsure(fastAllocationCase), unsure(derivedCase));
 
         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);
         LValue rareDataTags = m_out.loadPtr(callee, m_heaps.JSFunction_executableOrRareData);
@@ -7072,7 +7072,7 @@
         LBasicBlock slowCase = m_out.newBlock();
         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);
         LValue rareDataTags = m_out.loadPtr(callee, m_heaps.JSFunction_executableOrRareData);
@@ -11568,7 +11568,7 @@
         LBasicBlock lastNext = m_out.appendTo(cellCase, notFunctionCase);
         ValueFromBlock isFunctionResult = m_out.anchor(m_out.booleanFalse);
         m_out.branch(
-            isCallable(value, provenType(child)),
+            isFunction(value, provenType(child)),
             unsure(continuation), unsure(notFunctionCase));
         
         m_out.appendTo(notFunctionCase, objectCase);
@@ -11625,7 +11625,7 @@
         LBasicBlock lastNext = m_out.appendTo(cellCase, notFunctionCase);
         ValueFromBlock functionResult = m_out.anchor(m_out.booleanTrue);
         m_out.branch(
-            isCallable(value, provenType(child)),
+            isFunction(value, provenType(child)),
             unsure(continuation), unsure(notFunctionCase));
         
         m_out.appendTo(notFunctionCase, slowPath);
@@ -16194,7 +16194,7 @@
         
         m_out.appendTo(objectCase, functionCase);
         m_out.branch(
-            isCallable(value, provenType(child) & SpecObject),
+            isFunction(value, provenType(child) & SpecObject),
             unsure(functionCase), unsure(notFunctionCase));
         
         m_out.appendTo(functionCase, notFunctionCase);
@@ -17899,7 +17899,7 @@
         }
     }
     
-    LValue isCallable(LValue cell, SpeculatedType type = SpecFullTop)
+    LValue isFunction(LValue cell, SpeculatedType type = SpecFullTop)
     {
         if (LValue proven = isProvenValue(type & SpecCell, SpecFunction))
             return proven;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to