Title: [94448] trunk/Source/_javascript_Core
- Revision
- 94448
- Author
- [email protected]
- Date
- 2011-09-02 14:08:27 -0700 (Fri, 02 Sep 2011)
Log Message
Fix 32bit build.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (94447 => 94448)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-02 20:49:55 UTC (rev 94447)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-02 21:08:27 UTC (rev 94448)
@@ -1,5 +1,13 @@
2011-09-02 Oliver Hunt <[email protected]>
+ Fix 32bit build.
+
+ * heap/NewSpace.h:
+ (JSC::NewSpace::allocatePropertyStorage):
+ (JSC::NewSpace::inPropertyStorageNursery):
+
+2011-09-02 Oliver Hunt <[email protected]>
+
Use bump allocator for initial property storage
https://bugs.webkit.org/show_bug.cgi?id=67494
Modified: trunk/Source/_javascript_Core/heap/NewSpace.h (94447 => 94448)
--- trunk/Source/_javascript_Core/heap/NewSpace.h 2011-09-02 20:49:55 UTC (rev 94447)
+++ trunk/Source/_javascript_Core/heap/NewSpace.h 2011-09-02 21:08:27 UTC (rev 94448)
@@ -46,7 +46,7 @@
WTF_MAKE_NONCOPYABLE(NewSpace);
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 {
SizeClass();
@@ -175,10 +175,10 @@
inline void* NewSpace::allocatePropertyStorage(size_t size)
{
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;
}
@@ -188,7 +188,7 @@
inline bool NewSpace::inPropertyStorageNursery(void* ptr)
{
char* addr = static_cast<char*>(ptr);
- return static_cast<uintptr_t>(addr - m_propertyStorageNursery) < PropertyStorageNurserySize;
+ return static_cast<size_t>(addr - m_propertyStorageNursery) < PropertyStorageNurserySize;
}
template <typename Functor> inline typename Functor::ReturnType NewSpace::forEachBlock(Functor& functor)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
