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

trunk/Source/JavaScriptCore/llint/LLIntData.cpp

@@ -63 +63 @@
 
     for (int i = 0; i < numOpcodeIDs + numWasmOpcodeIDs; ++i) {
-        g_jscConfig.llint.opcodeMap[i] = tagCodePtr<BytecodePtrTag>(g_jscConfig.llint.opcodeMap[i]);
-        g_jscConfig.llint.opcodeMapWide16[i] = tagCodePtr<BytecodePtrTag>(g_jscConfig.llint.opcodeMapWide16[i]);
-        g_jscConfig.llint.opcodeMapWide32[i] = tagCodePtr<BytecodePtrTag>(g_jscConfig.llint.opcodeMapWide32[i]);
+        g_jscConfig.llint.opcodeMap[i] = tagCodePtr(g_jscConfig.llint.opcodeMap[i], BytecodePtrTag);
+        g_jscConfig.llint.opcodeMapWide16[i] = tagCodePtr(g_jscConfig.llint.opcodeMapWide16[i], BytecodePtrTag);
+        g_jscConfig.llint.opcodeMapWide32[i] = tagCodePtr(g_jscConfig.llint.opcodeMapWide32[i], BytecodePtrTag);
     }