Changeset 230327 in webkit

Timestamp:

Apr 5, 2018 11:18:54 PM (6 years ago)

Author:

mark.lam@apple.com

Message:

MacroAssemblerCodePtr::retagged() should not re-decorate the pointer on ARMv7.
​https://bugs.webkit.org/show_bug.cgi?id=184347
<rdar://problem/39183165>

Reviewed by Michael Saboff.

• assembler/MacroAssemblerCodeRef.h:

(JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
(JSC::MacroAssemblerCodePtr::retagged const):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerCodeRef.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-04-05  Mark Lam  <mark.lam@apple.com>
+
+        MacroAssemblerCodePtr::retagged() should not re-decorate the pointer on ARMv7.
+        https://bugs.webkit.org/show_bug.cgi?id=184347
+        <rdar://problem/39183165>
+
+        Reviewed by Michael Saboff.
+
+        * assembler/MacroAssemblerCodeRef.h:
+        (JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr):
+        (JSC::MacroAssemblerCodePtr::retagged const):
+
 2018-04-05  Stanislav Ocovaj  <stanislav.ocovaj@rt-rk.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -198 +198 @@
         m_value.assertIsPoisoned();
         ASSERT(value);
+#if CPU(ARM_THUMB2)
+        ASSERT(!(reinterpret_cast<uintptr_t>(value) & 1));
+#endif
         ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
     }
@@ -225 +228 @@
     MacroAssemblerCodePtr retagged(PtrTag oldTag, PtrTag newTag) const
     {
-        return MacroAssemblerCodePtr(retagCodePtr(executableAddress(), oldTag, newTag));
+        return MacroAssemblerCodePtr::createFromExecutableAddress(retagCodePtr(executableAddress(), oldTag, newTag));
     }