Changeset 35691 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Aug 12, 2008, 1:54:12 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

• JavaScriptCore part of <rdar://problem/6121636> Make fast*alloc() abort() on failure and add "try" variants that return NULL on failure.

Reviewed by Darin Adler.

• JavaScriptCore.exp: Exported tryFastCalloc().
• VM/RegisterFile.h: (KJS::RegisterFile::RegisterFile): Removed an ASSERT().
• kjs/JSArray.cpp: (KJS::JSArray::putSlowCase): Changed to use tryFastRealloc(). (KJS::JSArray::increaseVectorLength): Ditto.
• kjs/ustring.cpp: (KJS::allocChars): Changed to use tryFastMalloc(). (KJS::reallocChars): Changed to use tryFastRealloc().
• wtf/FastMalloc.cpp: (WTF::fastZeroedMalloc): Removed null checking of fastMalloc()'s result and removed extra call to InvokeNewHook(). (WTF::tryFastZeroedMalloc): Added. Uses tryFastMalloc(). (WTF::tryFastMalloc): Renamed fastMalloc() to this. (WTF::fastMalloc): Added. This version abort()s if allocation fails. (WTF::tryFastCalloc): Renamed fastCalloc() to this. (WTF::fastCalloc): Added. This version abort()s if allocation fails. (WTF::tryFastRealloc): Renamed fastRealloc() to this. (WTF::fastRealloc): Added. This version abort()s if allocation fails. (WTF::do_malloc): Made this a function template. When the abortOnFailure template parameter is set, the function abort()s on failure to allocate. Otherwise, it sets errno to ENOMEM and returns zero. (WTF::TCMallocStats::fastMalloc): Defined to abort() on failure. (WTF::TCMallocStats::tryFastMalloc): Added. Does not abort() on failure. (WTF::TCMallocStats::fastCalloc): Defined to abort() on failure. (WTF::TCMallocStats::tryFastCalloc): Added. Does not abort() on failure. (WTF::TCMallocStats::fastRealloc): Defined to abort() on failure. (WTF::TCMallocStats::tryFastRealloc): Added. Does not abort() on failure.
• wtf/FastMalloc.h: Declared the "try" variants.

WebCore:

• WebCore part of <rdar://problem/6121636> Make fast*alloc() abort() on failure and add "try" variants that return NULL on failure.

Reviewed by Darin Adler.

• platform/Arena.cpp: (WebCore::ArenaAllocate): Removed null checking of fastMalloc()'s result.
• platform/graphics/cg/ImageBufferCG.cpp: (WebCore::ImageBuffer::create): Changed to use tryFastCalloc().

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -65 +65 @@
     if (length > maxUChars())
         return 0;
-    return static_cast<UChar*>(fastMalloc(sizeof(UChar) * length));
+    return static_cast<UChar*>(tryFastMalloc(sizeof(UChar) * length));
 }
 
@@ -73 +73 @@
     if (length > maxUChars())
         return 0;
-    return static_cast<UChar*>(fastRealloc(buffer, sizeof(UChar) * length));
+    return static_cast<UChar*>(tryFastRealloc(buffer, sizeof(UChar) * length));
 }