Changeset 268241 in webkit for trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp

Timestamp:

Oct 8, 2020, 6:18:14 PM (5 years ago)

Author:

[email protected]

Message:

Unreviewed, reverting r268170 and r268190.
​https://bugs.webkit.org/show_bug.cgi?id=217502

Crash on ARM64E exclusively

Reverted changesets:

"[JSC] Restrict more ptr-tagging and avoid using
OperationPtrTag for JIT code"
​https://bugs.webkit.org/show_bug.cgi?id=217460
​https://trac.webkit.org/changeset/268170

"Unreviewed, build fix for ARM64E"
​https://bugs.webkit.org/show_bug.cgi?id=217460
​https://trac.webkit.org/changeset/268190

File:

• trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp

@@ -121 +121 @@
 {
     SlowPathCallKey key = keyWithTarget(callTarget);
-    SlowPathCall result = SlowPathCall(m_jit.call(JITThunkPtrTag), key);
+    SlowPathCall result = SlowPathCall(m_jit.call(OperationPtrTag), key);
 
     m_jit.addLinkTask(
@@ -128 +128 @@
                 vm.ftlThunks->getSlowPathCallThunk(vm, result.key());
 
-            linkBuffer.link(result.call(), CodeLocationLabel<JITThunkPtrTag>(thunk.code()));
+            linkBuffer.link(result.call(), CodeLocationLabel<OperationPtrTag>(thunk.retaggedCode<OperationPtrTag>()));
         });