Changeset 258952 in webkit

Timestamp:

Mar 24, 2020 3:53:03 PM (4 years ago)

Author:

keith_miller@apple.com

Message:

Fix isEmpty AssemblyHelpers function and add isNotEmpty
​https://bugs.webkit.org/show_bug.cgi?id=209507

Reviewed by Saam Barati.

This fixes the 32 version of my HasIndexedProperty patch as well
as properly names the functions for what they do.

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileHasIndexedProperty):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::isEmpty):
(JSC::AssemblyHelpers::isNotEmpty):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (2 diffs)
• jit/AssemblyHelpers.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-03-24  Keith Miller  <keith_miller@apple.com>
+
+        Fix isEmpty AssemblyHelpers function and add isNotEmpty
+        https://bugs.webkit.org/show_bug.cgi?id=209507
+
+        Reviewed by Saam Barati.
+
+        This fixes the 32 version of my HasIndexedProperty patch as well
+        as properly names the functions for what they do.
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileHasIndexedProperty):
+        * jit/AssemblyHelpers.h:
+        (JSC::AssemblyHelpers::isEmpty):
+        (JSC::AssemblyHelpers::isNotEmpty):
+
 2020-03-23  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -13594 +13594 @@
 
         if (mode.isSaneChain()) {
-            m_jit.isEmpty(scratchGPR, resultGPR);
+            m_jit.isNotEmpty(scratchGPR, resultGPR);
             break;
         }
@@ -13656 +13656 @@
 
         if (mode.isSaneChain()) {
-            m_jit.isEmpty(scratchGPR, resultGPR);
+            m_jit.isNotEmpty(scratchGPR, resultGPR);
             break;
         }

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

@@ -965 +965 @@
     {
 #if USE(JSVALUE64)
-        test64(NonZero, gpr, TrustedImm32(-1), dst);
+        test64(Zero, gpr, gpr, dst);
 #else
         compare32(Equal, gpr, TrustedImm32(JSValue::EmptyValueTag), dst);
+#endif
+    }
+
+    void isNotEmpty(GPRReg gpr, GPRReg dst)
+    {
+#if USE(JSVALUE64)
+        test64(NonZero, gpr, gpr, dst);
+#else
+        compare32(NotEqual, gpr, TrustedImm32(JSValue::EmptyValueTag), dst);
 #endif
     }