Title: [257988] releases/WebKitGTK/webkit-2.28/Source
- Revision
- 257988
- Author
- [email protected]
- Date
- 2020-03-06 06:28:33 -0800 (Fri, 06 Mar 2020)
Log Message
Merge r257721 - Fix JSC 32bit alignment increase gcc warning
https://bugs.webkit.org/show_bug.cgi?id=208445
Patch by Paulo Matos <[email protected]> on 2020-03-02
Reviewed by Yusuke Suzuki.
Use reinterpret_cast_ptr<>() instead of reinterpret_cast<>() to
avoid GCC warning about increase in alignment requirement for cast
target type.
Source/_javascript_Core:
* dfg/DFGOSRExit.cpp:
(JSC::DFG::OSRExit::compileExit):
Source/WTF:
* wtf/HashTable.h:
(WTF::HashTable::tableSize const):
(WTF::HashTable::setTableSize const):
(WTF::HashTable::tableSizeMask const):
(WTF::HashTable::setTableSizeMask):
(WTF::HashTable::keyCount const):
(WTF::HashTable::setKeyCount const):
(WTF::HashTable::deletedCount const):
(WTF::HashTable::setDeletedCount const):
(WTF::KeyTraits>::allocateTable):
(WTF::KeyTraits>::deallocateTable):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog (257987 => 257988)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-03-06 14:28:28 UTC (rev 257987)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/ChangeLog 2020-03-06 14:28:33 UTC (rev 257988)
@@ -1,3 +1,17 @@
+2020-03-02 Paulo Matos <[email protected]>
+
+ Fix JSC 32bit alignment increase gcc warning
+ https://bugs.webkit.org/show_bug.cgi?id=208445
+
+ Reviewed by Yusuke Suzuki.
+
+ Use reinterpret_cast_ptr<>() instead of reinterpret_cast<>() to
+ avoid GCC warning about increase in alignment requirement for cast
+ target type.
+
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::OSRExit::compileExit):
+
2020-02-26 Caio Lima <[email protected]>
[JSC][MIPS] Adding support to Checkpoints
Modified: releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/dfg/DFGOSRExit.cpp (257987 => 257988)
--- releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2020-03-06 14:28:28 UTC (rev 257987)
+++ releases/WebKitGTK/webkit-2.28/Source/_javascript_Core/dfg/DFGOSRExit.cpp 2020-03-06 14:28:33 UTC (rev 257988)
@@ -651,7 +651,7 @@
continue;
auto* inlineCallFrame = codeOrigin->inlineCallFrame();
- addSideState(reinterpret_cast<CallFrame*>(reinterpret_cast<char*>(callFrame) + inlineCallFrame->returnPCOffset() - sizeof(CPURegister)), callBytecodeIndex, inlineCallFrame->tmpOffset);
+ addSideState(reinterpret_cast_ptr<CallFrame*>(reinterpret_cast<char*>(callFrame) + inlineCallFrame->returnPCOffset() - sizeof(CPURegister)), callBytecodeIndex, inlineCallFrame->tmpOffset);
}
if (!codeOrigin)
Modified: releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog (257987 => 257988)
--- releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog 2020-03-06 14:28:28 UTC (rev 257987)
+++ releases/WebKitGTK/webkit-2.28/Source/WTF/ChangeLog 2020-03-06 14:28:33 UTC (rev 257988)
@@ -1,3 +1,26 @@
+2020-03-02 Paulo Matos <[email protected]>
+
+ Fix JSC 32bit alignment increase gcc warning
+ https://bugs.webkit.org/show_bug.cgi?id=208445
+
+ Reviewed by Yusuke Suzuki.
+
+ Use reinterpret_cast_ptr<>() instead of reinterpret_cast<>() to
+ avoid GCC warning about increase in alignment requirement for cast
+ target type.
+
+ * wtf/HashTable.h:
+ (WTF::HashTable::tableSize const):
+ (WTF::HashTable::setTableSize const):
+ (WTF::HashTable::tableSizeMask const):
+ (WTF::HashTable::setTableSizeMask):
+ (WTF::HashTable::keyCount const):
+ (WTF::HashTable::setKeyCount const):
+ (WTF::HashTable::deletedCount const):
+ (WTF::HashTable::setDeletedCount const):
+ (WTF::KeyTraits>::allocateTable):
+ (WTF::KeyTraits>::deallocateTable):
+
2020-02-25 Philippe Normand <[email protected]>
[WPE] Enable BACKTRACE_SYMBOLS
Modified: releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/HashTable.h (257987 => 257988)
--- releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/HashTable.h 2020-03-06 14:28:28 UTC (rev 257987)
+++ releases/WebKitGTK/webkit-2.28/Source/WTF/wtf/HashTable.h 2020-03-06 14:28:33 UTC (rev 257988)
@@ -580,14 +580,14 @@
static constexpr int deletedCountOffset = -4;
static constexpr unsigned metadataSize = 4 * sizeof(unsigned);
- unsigned tableSize() const { return m_table ? reinterpret_cast<unsigned*>(m_table)[tableSizeOffset] : 0; }
- void setTableSize(unsigned size) const { ASSERT(m_table); reinterpret_cast<unsigned*>(m_table)[tableSizeOffset] = size; }
- unsigned tableSizeMask() const { ASSERT(m_table); return m_table ? reinterpret_cast<unsigned*>(m_table)[tableSizeMaskOffset] : 0; }
- void setTableSizeMask(unsigned mask) { ASSERT(m_table); reinterpret_cast<unsigned*>(m_table)[tableSizeMaskOffset] = mask; }
- unsigned keyCount() const { return m_table ? reinterpret_cast<unsigned*>(m_table)[keyCountOffset] : 0; }
- void setKeyCount(unsigned count) const { ASSERT(m_table); reinterpret_cast<unsigned*>(m_table)[keyCountOffset] = count; }
- unsigned deletedCount() const { ASSERT(m_table); return reinterpret_cast<unsigned*>(m_table)[deletedCountOffset]; }
- void setDeletedCount(unsigned count) const { ASSERT(m_table); reinterpret_cast<unsigned*>(m_table)[deletedCountOffset] = count; }
+ unsigned tableSize() const { return m_table ? reinterpret_cast_ptr<unsigned*>(m_table)[tableSizeOffset] : 0; }
+ void setTableSize(unsigned size) const { ASSERT(m_table); reinterpret_cast_ptr<unsigned*>(m_table)[tableSizeOffset] = size; }
+ unsigned tableSizeMask() const { ASSERT(m_table); return m_table ? reinterpret_cast_ptr<unsigned*>(m_table)[tableSizeMaskOffset] : 0; }
+ void setTableSizeMask(unsigned mask) { ASSERT(m_table); reinterpret_cast_ptr<unsigned*>(m_table)[tableSizeMaskOffset] = mask; }
+ unsigned keyCount() const { return m_table ? reinterpret_cast_ptr<unsigned*>(m_table)[keyCountOffset] : 0; }
+ void setKeyCount(unsigned count) const { ASSERT(m_table); reinterpret_cast_ptr<unsigned*>(m_table)[keyCountOffset] = count; }
+ unsigned deletedCount() const { ASSERT(m_table); return reinterpret_cast_ptr<unsigned*>(m_table)[deletedCountOffset]; }
+ void setDeletedCount(unsigned count) const { ASSERT(m_table); reinterpret_cast_ptr<unsigned*>(m_table)[deletedCountOffset] = count; }
ValueType* m_table { nullptr };
@@ -1207,9 +1207,9 @@
// would use a template member function with explicit specializations here, but
// gcc doesn't appear to support that
if (Traits::emptyValueIsZero)
- return reinterpret_cast<ValueType*>(static_cast<char*>(HashTableMalloc::zeroedMalloc(metadataSize + size * sizeof(ValueType))) + metadataSize);
+ return reinterpret_cast_ptr<ValueType*>(static_cast<char*>(HashTableMalloc::zeroedMalloc(metadataSize + size * sizeof(ValueType))) + metadataSize);
- ValueType* result = reinterpret_cast<ValueType*>(static_cast<char*>(HashTableMalloc::malloc(metadataSize + size * sizeof(ValueType))) + metadataSize);
+ ValueType* result = reinterpret_cast_ptr<ValueType*>(static_cast<char*>(HashTableMalloc::malloc(metadataSize + size * sizeof(ValueType))) + metadataSize);
for (unsigned i = 0; i < size; i++)
initializeBucket(result[i]);
return result;
@@ -1218,7 +1218,7 @@
template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::deallocateTable(ValueType* table)
{
- unsigned size = reinterpret_cast<unsigned*>(table)[tableSizeOffset];
+ unsigned size = reinterpret_cast_ptr<unsigned*>(table)[tableSizeOffset];
for (unsigned i = 0; i < size; ++i) {
if (!isDeletedBucket(table[i]))
table[i].~ValueType();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
