Changeset 46999 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.h

Timestamp:

Aug 10, 2009, 12:42:10 PM (16 years ago)

Author:

Darin Adler

Message:

FastMalloc.h has cross-platform code but marked as WinCE-only
​https://bugs.webkit.org/show_bug.cgi?id=28160

Patch by Darin Adler <Darin Adler> on 2009-08-10
Reviewed by Mark Rowe.

1) The support for nothrow was inside #if PLATFORM(WINCE) even though it is

not platform-specific.

2) The code tried to override operator delete nothrow, which does not exist.
3) The code in the header checks the value of USE_SYSTEM_MALLOC, but the code

in FastMalloc.cpp checks only if the macro is defined.

• wtf/FastMalloc.h: See above.
• wtf/FastMalloc.cpp: Ditto.

File:

• trunk/JavaScriptCore/wtf/FastMalloc.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -1 +1 @@
 /*
- *  Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ *  Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -29 +29 @@
 
     // These functions call CRASH() if an allocation fails.
-    void* fastMalloc(size_t n);
-    void* fastZeroedMalloc(size_t n);
-    void* fastCalloc(size_t n_elements, size_t element_size);
-    void* fastRealloc(void* p, size_t n);
+    void* fastMalloc(size_t);
+    void* fastZeroedMalloc(size_t);
+    void* fastCalloc(size_t numElements, size_t elementSize);
+    void* fastRealloc(void*, size_t);
 
-    // These functions return NULL if an allocation fails.
-    void* tryFastMalloc(size_t n);
-    void* tryFastZeroedMalloc(size_t n);
-    void* tryFastCalloc(size_t n_elements, size_t element_size);
-    void* tryFastRealloc(void* p, size_t n);
+    // These functions return 0 if an allocation fails.
+    void* tryFastMalloc(size_t);
+    void* tryFastZeroedMalloc(size_t);
+    void* tryFastCalloc(size_t numElements, size_t elementSize);
+    void* tryFastRealloc(void*, size_t);
 
-    void fastFree(void* p);
+    void fastFree(void*);
 
 #ifndef NDEBUG    
@@ -173 +173 @@
 #endif
 
-#ifndef _CRTDBG_MAP_ALLOC
+#if !defined(_CRTDBG_MAP_ALLOC) && !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
 
-#if !defined(USE_SYSTEM_MALLOC) || !(USE_SYSTEM_MALLOC)
-WTF_PRIVATE_INLINE void* operator new(size_t s) { return fastMalloc(s); }
+// The nothrow functions here are actually not all that helpful, because fastMalloc will
+// call CRASH() rather than returning 0, and returning 0 is what nothrow is all about.
+// But since WebKit code never uses exceptions or nothrow at all, this is probably OK.
+// Long term we will adopt FastAllocBase.h everywhere, and and replace this with
+// debug-only code to make sure we don't use the system malloc via the default operator
+// new by accident.
+
+WTF_PRIVATE_INLINE void* operator new(size_t size) { return fastMalloc(s); }
+WTF_PRIVATE_INLINE void* operator new(size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void operator delete(void* p) { fastFree(p); }
-WTF_PRIVATE_INLINE void* operator new[](size_t s) { return fastMalloc(s); }
+WTF_PRIVATE_INLINE void* operator new[](size_t size) { return fastMalloc(size); }
+WTF_PRIVATE_INLINE void* operator new[](size_t size, const std::nothrow_t&) throw() { return fastMalloc(size); }
 WTF_PRIVATE_INLINE void operator delete[](void* p) { fastFree(p); }
 
-#if PLATFORM(WINCE)
-WTF_PRIVATE_INLINE void* operator new(size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); }
-WTF_PRIVATE_INLINE void operator delete(void* p, const std::nothrow_t&) throw() { fastFree(p); }
-WTF_PRIVATE_INLINE void* operator new[](size_t s, const std::nothrow_t&) throw() { return fastMalloc(s); }
-WTF_PRIVATE_INLINE void operator delete[](void* p, const std::nothrow_t&) throw() { fastFree(p); }
-#endif
 #endif
 
-#endif // _CRTDBG_MAP_ALLOC
-
 #endif /* WTF_FastMalloc_h */