Changeset 106686 in webkit

Timestamp:

Feb 3, 2012 12:59:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix alignment warnings in ARMv7
​https://bugs.webkit.org/show_bug.cgi?id=55368

Patch by Rob Buis <​rbuis@rim.com> on 2012-02-03
Reviewed by Filip Pizlo.

Use reinterpret_cast_ptr and static_cast to get rid of alignment issues in ARMv7 code.

• heap/HandleTypes.h:

(JSC::HandleTypes::getFromSlot):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::specializedSweep):

• heap/MarkedBlock.h:

(JSC::MarkedBlock::forEachCell):

• runtime/WriteBarrier.h:

(JSC::WriteBarrierBase::get):
(JSC::WriteBarrierBase::unvalidatedGet):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/HandleTypes.h (modified) (1 diff)
• heap/MarkedBlock.cpp (modified) (1 diff)
• heap/MarkedBlock.h (modified) (1 diff)
• runtime/WriteBarrier.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-02-03  Rob Buis  <rbuis@rim.com>
+
+        Fix alignment warnings in ARMv7
+        https://bugs.webkit.org/show_bug.cgi?id=55368
+
+        Reviewed by Filip Pizlo.
+
+        Use reinterpret_cast_ptr and static_cast to get rid of alignment issues in ARMv7 code.
+
+        * heap/HandleTypes.h:
+        (JSC::HandleTypes::getFromSlot):
+        * heap/MarkedBlock.cpp:
+        (JSC::MarkedBlock::specializedSweep):
+        * heap/MarkedBlock.h:
+        (JSC::MarkedBlock::forEachCell):
+        * runtime/WriteBarrier.h:
+        (JSC::WriteBarrierBase::get):
+        (JSC::WriteBarrierBase::unvalidatedGet):
+
 2012-02-03  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/heap/HandleTypes.h

@@ -36 +36 @@
 template<typename T> struct HandleTypes {
     typedef T* ExternalType;
-    static ExternalType getFromSlot(HandleSlot slot) { return (slot && *slot) ? reinterpret_cast<ExternalType>(slot->asCell()) : 0; }
+    static ExternalType getFromSlot(HandleSlot slot) { return (slot && *slot) ? reinterpret_cast<ExternalType>(static_cast<void*>(slot->asCell())) : 0; }
     static JSValue toJSValue(T* cell) { return reinterpret_cast<JSCell*>(cell); }
     template<typename U> static void validateUpcast() { T* temp; temp = (U*)0; }

trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -90 +90 @@
             continue;
 
-        JSCell* cell = reinterpret_cast<JSCell*>(&atoms()[i]);
+        JSCell* cell = reinterpret_cast_ptr<JSCell*>(&atoms()[i]);
         if (blockState == Zapped && !cell->isZapped())
             continue;

trunk/Source/JavaScriptCore/heap/MarkedBlock.h

@@ -318 +318 @@
     {
         for (size_t i = firstAtom(); i < m_endAtom; i += m_atomsPerCell) {
-            JSCell* cell = reinterpret_cast<JSCell*>(&atoms()[i]);
+            JSCell* cell = reinterpret_cast_ptr<JSCell*>(&atoms()[i]);
             if (!isLive(cell))
                 continue;

trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

@@ -94 +94 @@
         if (m_cell)
             validateCell(m_cell);
-        return reinterpret_cast<T*>(m_cell);
+        return reinterpret_cast<T*>(static_cast<void*>(m_cell));
     }
 
@@ -129 +129 @@
 
 #if ENABLE(GC_VALIDATION)
-    T* unvalidatedGet() const { return reinterpret_cast<T*>(m_cell); }
+    T* unvalidatedGet() const { return reinterpret_cast<T*>(static_cast<void*>(m_cell)); }
 #endif