Attachment 371517 Details for Bug 198617 – Patch

[patch] Patch

bug-198617-20190606205021.patch (text/plain), 3.71 KB, created by Keith Miller on 2019-06-06 11:50:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Miller

Created: 2019-06-06 11:50:23 PDT

Size: 3.71 KB

patch

obsolete

>Subversion Revision: 246160
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d28dba78f61753f1cabc0d79fc87ece40d7b2ddc..4dcc4a5992228e2126342948d99acd92b3b1fd09 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-06-06  Keith Miller  <keith_miller@apple.com>
>+
>+        Fix typo in cageWithoutUntagging
>+        https://bugs.webkit.org/show_bug.cgi?id=198617
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  Keith Miller  <keith_miller@apple.com>
> 
>         Unrevied build fix for FTL without Gigacage.
>diff --git a/Source/JavaScriptCore/assembler/testmasm.cpp b/Source/JavaScriptCore/assembler/testmasm.cpp
>index 21b347a8a93b8e34c00c0dbfe800a038f2078170..1050b39983e4e65052824c04f0bb1254a313e2c8 100644
>--- a/Source/JavaScriptCore/assembler/testmasm.cpp
>+++ b/Source/JavaScriptCore/assembler/testmasm.cpp
>@@ -1036,7 +1036,7 @@ static void testCagePreservesPACFailureBit()
> 
>     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();
>diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>index 9558e55474393a04122430afbe080463d0dbd664..ec2b3c82e42819e2a684319472450778b5066604 100644
>--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
>@@ -6779,7 +6779,7 @@ void SpeculativeJIT::cageTypedArrayStorage(GPRReg baseReg, GPRReg storageReg)
>             return;
>     }
>     
>-    m_jit.cageWithoutUntaging(Gigacage::Primitive, storageReg);
>+    m_jit.cageWithoutUntagging(Gigacage::Primitive, storageReg);
> #endif
> }
> 
>@@ -6843,7 +6843,7 @@ void SpeculativeJIT::compileGetTypedArrayByteOffset(Node* node)
>     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);
> 
>diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.h b/Source/JavaScriptCore/jit/AssemblyHelpers.h
>index 5d3fcc1f392cc5b2adaa4998b5400267baaf9364..a77d43a501086730d7dc9985f42db5219a2f9259 100644
>--- a/Source/JavaScriptCore/jit/AssemblyHelpers.h
>+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.h
>@@ -1555,7 +1555,7 @@ public:
>         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 @@ public:
>             return;
>         
>         if (kind != Gigacage::Primitive || Gigacage::isDisablingPrimitiveGigacageDisabled())
>-            cageWithoutUntaging(kind, storage);
>+            cageWithoutUntagging(kind, storage);
>         else {
>             loadPtr(&Gigacage::basePtr(kind), scratch);
>             Jump done = branchTestPtr(Zero, scratch);

Actions: View | Formatted Diff | Diff

Attachments on bug 198617: 371517