Changeset 106686 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

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

Author:

[email protected]

Message:

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

Patch by Rob Buis <​[email protected]> 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/heap

Files:

• HandleTypes.h (modified) (1 diff)
• MarkedBlock.cpp (modified) (1 diff)
• MarkedBlock.h (modified) (1 diff)

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;