Title: [229262] releases/WebKitGTK/webkit-2.20/Source/_javascript_Core
- Revision
- 229262
- Author
- [email protected]
- Date
- 2018-03-05 04:34:36 -0800 (Mon, 05 Mar 2018)
Log Message
Merge r229125 - [ARM] Fix compile error in debug builds by invoking unpoisoned().
Patch by Dominik Infuehr <[email protected]> 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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (229261 => 229262)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-03-05 12:34:31 UTC (rev 229261)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-03-05 12:34:36 UTC (rev 229262)
@@ -1,3 +1,16 @@
+2018-02-28 Dominik Infuehr <[email protected]>
+
+ [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 <[email protected]>
GC should sweep code block before deleting
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (229261 => 229262)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2018-03-05 12:34:31 UTC (rev 229261)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2018-03-05 12:34:36 UTC (rev 229262)
@@ -290,7 +290,7 @@
{
m_value.assertIsPoisoned();
ASSERT(value);
- ASSERT_VALID_CODE_POINTER(m_value);
+ ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
}
static MacroAssemblerCodePtr createFromExecutableAddress(void* value)
@@ -310,7 +310,7 @@
{
ASSERT(ra.value());
m_value.assertIsPoisoned();
- ASSERT_VALID_CODE_POINTER(m_value);
+ ASSERT_VALID_CODE_POINTER(m_value.unpoisoned());
}
PoisonedMasmPtr poisonedPtr() const { return m_value; }
@@ -327,7 +327,7 @@
T dataLocation() const
{
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);
}
#else
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/yarr/YarrInterpreter.cpp (229261 => 229262)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2018-03-05 12:34:31 UTC (rev 229261)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/yarr/YarrInterpreter.cpp 2018-03-05 12:34:36 UTC (rev 229262)
@@ -2125,7 +2125,7 @@
auto outputTermIndexAndNest = [&](size_t index, unsigned termNesting) {
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(" ");
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
