From 40b9d455e416a14816612ba03e25e15f70dfb47f Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Sun, 6 Jul 2008 08:37:28 +0200 Subject: [PATCH] Fixed some alignment problems on sparc Fixed some alignment problems on sparc (and some that might occur on arm, too). Some compiler warnings about alignment remain, but I don't know if they are a real problem yet. Gbp-Pq: Name 30_webkit_unaligned_access.diff --- .../webkit/Source/JavaScriptCore/wtf/ListHashSet.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h index 25b73c188..f54559631 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ListHashSet.h @@ -145,7 +145,7 @@ namespace WTF { : m_freeList(pool()) , m_isDoneWithInitialFreeList(false) { - memset(m_pool.pool, 0, sizeof(m_pool.pool)); + memset(m_pool, 0, sizeof(m_pool)); } Node* allocate() @@ -189,7 +189,7 @@ namespace WTF { } private: - Node* pool() { return reinterpret_cast_ptr(m_pool.pool); } + Node* pool() { return reinterpret_cast_ptr(m_pool); } Node* pastPool() { return pool() + m_poolSize; } bool inPool(Node* node) @@ -200,10 +200,7 @@ namespace WTF { Node* m_freeList; bool m_isDoneWithInitialFreeList; static const size_t m_poolSize = inlineCapacity; - union { - char pool[sizeof(Node) * m_poolSize]; - double forAlignment; - } m_pool; + uint32_t m_pool[(sizeof(Node) * m_poolSize + sizeof(uint32_t) - 1) / sizeof(uint32_t)]; }; template struct ListHashSetNode { -- 2.30.2