Changeset 268241 in webkit for trunk/Source/JavaScriptCore/llint/LLIntPCRanges.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/llint/LLIntPCRanges.h (modified) (1 diff)

trunk/Source/JavaScriptCore/llint/LLIntPCRanges.h

@@ -41 +41 @@
 {
     uintptr_t pcAsInt = bitwise_cast<uintptr_t>(pc);
-    uintptr_t llintStart = untagCodePtr<uintptr_t, CFunctionPtrTag>(llintPCRangeStart);
-    uintptr_t llintEnd = untagCodePtr<uintptr_t, CFunctionPtrTag>(llintPCRangeEnd);
+    uintptr_t llintStart = untagCodePtr<uintptr_t>(llintPCRangeStart, CFunctionPtrTag);
+    uintptr_t llintEnd = untagCodePtr<uintptr_t>(llintPCRangeEnd, CFunctionPtrTag);
     RELEASE_ASSERT(llintStart < llintEnd);
     return llintStart <= pcAsInt && pcAsInt <= llintEnd;