Changeset 268241 in webkit for trunk/Source/JavaScriptCore/ftl/FTLOutput.h

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/FTLOutput.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ftl/FTLOutput.h

@@ -396 +396 @@
         static_assert(!std::is_same<Function, LValue>::value);
         return m_block->appendNew<B3::CCallValue>(m_proc, type, origin(), B3::Effects::none(),
-            constIntPtr(tagCFunctionPtr<void*, OperationPtrTag>(function)), arg1, args...);
+            constIntPtr(tagCFunctionPtr<void*>(function, OperationPtrTag)), arg1, args...);
     }
 
@@ -402 +402 @@
     // https://bugs.webkit.org/show_bug.cgi?id=184324
     template<typename FunctionType>
-    LValue operation(FunctionType function) { return constIntPtr(tagCFunctionPtr<void*, OperationPtrTag>(function)); }
+    LValue operation(FunctionType function) { return constIntPtr(tagCFunctionPtr<void*>(function, OperationPtrTag)); }
 
     void jump(LBasicBlock);