Changeset 246166 in webkit

Timestamp:

Jun 6, 2019 1:11:34 PM (5 years ago)

Author:

keith_miller@apple.com

Message:

Fix typo in cageWithoutUntagging
​https://bugs.webkit.org/show_bug.cgi?id=198617

Reviewed by Saam Barati.

• assembler/testmasm.cpp:

(JSC::testCagePreservesPACFailureBit):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):
(JSC::DFG::SpeculativeJIT::compileGetTypedArrayByteOffset):

• jit/AssemblyHelpers.h:

(JSC::AssemblyHelpers::cageWithoutUntagging):
(JSC::AssemblyHelpers::cageConditionally):
(JSC::AssemblyHelpers::cageWithoutUntaging): Deleted.

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-06  Keith Miller  <keith_miller@apple.com>
+
+        Fix typo in cageWithoutUntagging
+        https://bugs.webkit.org/show_bug.cgi?id=198617
+
+        Reviewed by Saam Barati.
+
+        * assembler/testmasm.cpp:
+        (JSC::testCagePreservesPACFailureBit):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::cageTypedArrayStorage):
+        (JSC::DFG::SpeculativeJIT::compileGetTypedArrayByteOffset):
+        * jit/AssemblyHelpers.h:
+        (JSC::AssemblyHelpers::cageWithoutUntagging):
+        (JSC::AssemblyHelpers::cageConditionally):
+        (JSC::AssemblyHelpers::cageWithoutUntaging): Deleted.
+
 2019-06-06  Alexey Shvayka  <shvaikalesh@gmail.com>
 

trunk/Source/JavaScriptCore/assembler/testmasm.cpp

@@ -1037 +1037 @@
     auto cageWithoutAuthentication = compile([] (CCallHelpers& jit) {
         jit.emitFunctionPrologue();
-        jit.cageWithoutUntaging(Gigacage::Primitive, GPRInfo::argumentGPR0);
+        jit.cageWithoutUntagging(Gigacage::Primitive, GPRInfo::argumentGPR0);
         jit.move(GPRInfo::argumentGPR0, GPRInfo::returnValueGPR);
         jit.emitFunctionEpilogue();

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -6780 +6780 @@
     }
     
-    m_jit.cageWithoutUntaging(Gigacage::Primitive, storageReg);
+    m_jit.cageWithoutUntagging(Gigacage::Primitive, storageReg);
 #endif
 }
@@ -6844 +6844 @@
 
     m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSObject::butterflyOffset()), dataGPR);
-    m_jit.cageWithoutUntaging(Gigacage::JSValue, dataGPR);
+    m_jit.cageWithoutUntagging(Gigacage::JSValue, dataGPR);
 
     cageTypedArrayStorage(baseGPR, vectorGPR);

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

@@ -1556 +1556 @@
     }
 
-    void cageWithoutUntaging(Gigacage::Kind kind, GPRReg storage)
+    void cageWithoutUntagging(Gigacage::Kind kind, GPRReg storage)
     {
 #if GIGACAGE_ENABLED
@@ -1601 +1601 @@
         
         if (kind != Gigacage::Primitive || Gigacage::isDisablingPrimitiveGigacageDisabled())
-            cageWithoutUntaging(kind, storage);
+            cageWithoutUntagging(kind, storage);
         else {
             loadPtr(&Gigacage::basePtr(kind), scratch);