Build fix for GCC 4.2. Cast via a union to avoid strict-aliasing issues.

Reviewed by Oliver.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28455 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9e44520bd505470adf0021714aa4fd77fa95995c..d0294130efd82f8e9eba81bbf5b5ca28e555bbb5 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-05  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Oliver.
+
+        Build fix for GCC 4.2. Cast via a union to avoid strict-aliasing issues.
+
+        * wtf/FastMalloc.cpp:
+        (WTF::):
+        (WTF::getPageHeap):
+
 2007-12-05  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Darin.

diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
index af2e760e128ad9e5de59c586bcee1be14e46f994..ed819435492e21701b33d88287207dddfbd3b46c 100644 (file)
--- a/JavaScriptCore/wtf/FastMalloc.cpp
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
@@ -1835,7 +1835,18 @@ static bool phinited = false;
 
 // Avoid extra level of indirection by making "pageheap" be just an alias
 // of pageheap_memory.
-#define pageheap ((TCMalloc_PageHeap*) pageheap_memory)
+typedef union {
+    void* m_memory;
+    TCMalloc_PageHeap* m_pageHeap;
+} PageHeapUnion;
+
+static inline TCMalloc_PageHeap* getPageHeap()
+{
+    PageHeapUnion u = { &pageheap_memory[0] };
+    return u.m_pageHeap;
+}
+
+#define pageheap getPageHeap()
 
 // If TLS is available, we also store a copy
 // of the per-thread object in a __thread variable