Changeset 220404 in webkit for trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

Timestamp:

Aug 8, 2017, 9:00:06 AM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r220368.

This change caused WK1 tests to exit early with crashes.

Reverted changeset:

"Baseline JIT should do caging"
​https://bugs.webkit.org/show_bug.cgi?id=175037
​http://trac.webkit.org/changeset/220368

File:

• trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h (modified) (1 diff)

trunk/Source/JavaScriptCore/jit/AssemblyHelpers.h

@@ -1310 +1310 @@
         storeFence();
         ok.link(this);
-    }
-    
-    void cage(Gigacage::Kind kind, GPRReg storage)
-    {
-#if GIGACAGE_ENABLED
-        if (!Gigacage::shouldBeEnabled())
-            return;
-        
-        andPtr(TrustedImmPtr(static_cast<size_t>(GIGACAGE_MASK)), storage);
-        addPtr(TrustedImmPtr(Gigacage::basePtr(kind)), storage);
-#else
-        UNUSED_PARAM(kind);
-        UNUSED_PARAM(storage);
-#endif
-    }
-    
-    void cageConditionally(Gigacage::Kind kind, GPRReg storage, GPRReg scratch)
-    {
-#if GIGACAGE_ENABLED
-        if (!Gigacage::shouldBeEnabled())
-            return;
-        
-        if (kind != Gigacage::Primitive || Gigacage::isDisablingPrimitiveGigacageDisabled())
-            return cage(kind, storage);
-        
-        loadPtr(Gigacage::basePtr(kind), scratch);
-        Jump done = branchTestPtr(Zero, scratch);
-        andPtr(TrustedImmPtr(static_cast<size_t>(GIGACAGE_MASK)), storage);
-        addPtr(scratch, storage);
-        done.link(this);
-#else
-        UNUSED_PARAM(kind);
-        UNUSED_PARAM(storage);
-        UNUSED_PARAM(scratch);
-#endif
     }