Changeset 94448 in webkit

Timestamp:

Sep 2, 2011 2:08:27 PM (13 years ago)

Author:

oliver@apple.com

Message:

Fix 32bit build.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/NewSpace.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-02  Oliver Hunt  <oliver@apple.com>
+
+        Fix 32bit build.
+
+        * heap/NewSpace.h:
+        (JSC::NewSpace::allocatePropertyStorage):
+        (JSC::NewSpace::inPropertyStorageNursery):
+
 2011-09-02  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/heap/NewSpace.h

@@ -47 +47 @@
     public:
         static const size_t maxCellSize = 1024;
-        static const ptrdiff_t PropertyStorageNurserySize = 1024 * 1024 * 4;
+        static const size_t PropertyStorageNurserySize = 1024 * 1024 * 4;
 
         struct SizeClass {
@@ -176 +176 @@
     {
         char* result = m_propertyStorageAllocationPoint;
-        if (size > static_cast<size_t>(PropertyStorageNurserySize))
+        if (size > PropertyStorageNurserySize)
             CRASH();
         m_propertyStorageAllocationPoint += size;
-        if ((m_propertyStorageAllocationPoint - m_propertyStorageNursery) > PropertyStorageNurserySize) {
+        if (static_cast<size_t>(m_propertyStorageAllocationPoint - m_propertyStorageNursery) > PropertyStorageNurserySize) {
             m_propertyStorageAllocationPoint = result;
             return 0;
@@ -189 +189 @@
     {
         char* addr = static_cast<char*>(ptr);
-        return static_cast<uintptr_t>(addr - m_propertyStorageNursery) < PropertyStorageNurserySize;
+        return static_cast<size_t>(addr - m_propertyStorageNursery) < PropertyStorageNurserySize;
     }