Changeset 28455 in webkit

Timestamp:

Dec 5, 2007 2:29:05 PM (16 years ago)

Author:

mrowe@apple.com

Message:

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

Reviewed by Oliver.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/FastMalloc.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

trunk/JavaScriptCore/wtf/FastMalloc.cpp

@@ -1836 +1836 @@
 // 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