Title: [246166] trunk/Source/_javascript_Core
Revision
246166
Author
[email protected]
Date
2019-06-06 13:11:34 -0700 (Thu, 06 Jun 2019)

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

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (246165 => 246166)


--- trunk/Source/_javascript_Core/ChangeLog	2019-06-06 19:32:51 UTC (rev 246165)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-06-06 20:11:34 UTC (rev 246166)
@@ -1,3 +1,20 @@
+2019-06-06  Keith Miller  <[email protected]>
+
+        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  <[email protected]>
 
         JSON.parse throws incorrect exception when called w/o arguments

Modified: trunk/Source/_javascript_Core/assembler/testmasm.cpp (246165 => 246166)


--- trunk/Source/_javascript_Core/assembler/testmasm.cpp	2019-06-06 19:32:51 UTC (rev 246165)
+++ trunk/Source/_javascript_Core/assembler/testmasm.cpp	2019-06-06 20:11:34 UTC (rev 246166)
@@ -1036,7 +1036,7 @@
 
     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();
         jit.ret();

Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (246165 => 246166)


--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2019-06-06 19:32:51 UTC (rev 246165)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2019-06-06 20:11:34 UTC (rev 246166)
@@ -6779,7 +6779,7 @@
             return;
     }
     
-    m_jit.cageWithoutUntaging(Gigacage::Primitive, storageReg);
+    m_jit.cageWithoutUntagging(Gigacage::Primitive, storageReg);
 #endif
 }
 
@@ -6843,7 +6843,7 @@
     JITCompiler::Jump nullVector = m_jit.branchTestPtr(JITCompiler::Zero, vectorGPR);
 
     m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSObject::butterflyOffset()), dataGPR);
-    m_jit.cageWithoutUntaging(Gigacage::JSValue, dataGPR);
+    m_jit.cageWithoutUntagging(Gigacage::JSValue, dataGPR);
 
     cageTypedArrayStorage(baseGPR, vectorGPR);
 

Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (246165 => 246166)


--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h	2019-06-06 19:32:51 UTC (rev 246165)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h	2019-06-06 20:11:34 UTC (rev 246166)
@@ -1555,7 +1555,7 @@
         ok.link(this);
     }
 
-    void cageWithoutUntaging(Gigacage::Kind kind, GPRReg storage)
+    void cageWithoutUntagging(Gigacage::Kind kind, GPRReg storage)
     {
 #if GIGACAGE_ENABLED
         if (!Gigacage::isEnabled(kind))
@@ -1600,7 +1600,7 @@
             return;
         
         if (kind != Gigacage::Primitive || Gigacage::isDisablingPrimitiveGigacageDisabled())
-            cageWithoutUntaging(kind, storage);
+            cageWithoutUntagging(kind, storage);
         else {
             loadPtr(&Gigacage::basePtr(kind), scratch);
             Jump done = branchTestPtr(Zero, scratch);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to