Changeset 229125 in webkit

Timestamp:

Feb 28, 2018 11:35:30 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[ARM] Fix compile error in debug builds by invoking unpoisoned().

Patch by Dominik Infuehr <​dinfuehr@igalia.com> on 2018-02-28
Reviewed by Mark Lam.

• assembler/MacroAssemblerCodeRef.h:

(JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr): Fix compile error.
(JSC::MacroAssemblerCodePtr::createFromExecutableAddress()): Ditto.
(JSC::MacroAssemblerCodePtr::dataLocation()): Ditto.

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::ByteCompiler::dumpDisjunction): use %zu for printf'ing size_t.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MacroAssemblerCodeRef.h (modified) (3 diffs)
• yarr/YarrInterpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-02-28  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        [ARM] Fix compile error in debug builds by invoking unpoisoned().
+
+        Reviewed by Mark Lam.
+
+        * assembler/MacroAssemblerCodeRef.h:
+        (JSC::MacroAssemblerCodePtr::MacroAssemblerCodePtr): Fix compile error.
+        (JSC::MacroAssemblerCodePtr::createFromExecutableAddress()): Ditto.
+        (JSC::MacroAssemblerCodePtr::dataLocation()): Ditto.
+        * yarr/YarrInterpreter.cpp:
+        (JSC::Yarr::ByteCompiler::dumpDisjunction): use %zu for printf'ing size_t.
+
 2018-02-28  JF Bastien  <jfbastien@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -291 +291 @@
         m_value.assertIsPoisoned();
         ASSERT(value);
-        ASSERT_VALID_CODE_POINTER(m_value);
+        ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
     }
     
@@ -311 +311 @@
         ASSERT(ra.value());
         m_value.assertIsPoisoned();
-        ASSERT_VALID_CODE_POINTER(m_value);
+        ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
     }
 
@@ -328 +328 @@
     {
         m_value.assertIsPoisoned();
-        ASSERT_VALID_CODE_POINTER(m_value);
+        ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
         return bitwise_cast<T>(m_value ? m_value.unpoisoned<char*>() - 1 : nullptr);
     }

trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

@@ -2126 +2126 @@
             for (unsigned nestingDepth = 0; nestingDepth < termIndexNest; nestingDepth++)
                 out.print("  ");
-            out.printf("%4lu", index);
+            out.printf("%4zu", index);
             for (unsigned nestingDepth = 0; nestingDepth < termNesting; nestingDepth++)
                 out.print("  ");