Unreviewed, rolling out r181307.

https://bugs.webkit.org/show_bug.cgi?id=142525

Broke ASan tests (Requested by ap on #webkit).

Reverted changeset:

"bmalloc: tryFastMalloc shouldn't crash"
https://bugs.webkit.org/show_bug.cgi?id=142443
http://trac.webkit.org/changeset/181307

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181313 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 828b7c9..f93765b 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-09  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181307.
+        https://bugs.webkit.org/show_bug.cgi?id=142525
+
+        Broke ASan tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "bmalloc: tryFastMalloc shouldn't crash"
+        https://bugs.webkit.org/show_bug.cgi?id=142443
+        http://trac.webkit.org/changeset/181307
+
 2015-03-09  Geoffrey Garen  <ggaren@apple.com>
 
         bmalloc: tryFastMalloc shouldn't crash

diff --git a/Source/WTF/wtf/FastMalloc.cpp b/Source/WTF/wtf/FastMalloc.cpp
index 2e8186c..381951b 100644 (file)
--- a/Source/WTF/wtf/FastMalloc.cpp
+++ b/Source/WTF/wtf/FastMalloc.cpp
@@ -150,6 +150,11 @@ void fastFree(void* p)
     free(p);
 }
 
+TryMallocReturnValue tryFastRealloc(void* p, size_t n)
+{
+    return realloc(p, n);
+}
+
 void* fastRealloc(void* p, size_t n)
 {
     void* result = realloc(p, n);
@@ -189,7 +194,10 @@ namespace WTF {
 
 void* fastMalloc(size_t size)
 {
-    return bmalloc::api::malloc(size);
+    void* result = bmalloc::api::malloc(size);
+    if (!result)
+        CRASH();
+    return result;
 }
 
 void* fastCalloc(size_t numElements, size_t elementSize)
@@ -204,7 +212,10 @@ void* fastCalloc(size_t numElements, size_t elementSize)
 
 void* fastRealloc(void* object, size_t size)
 {
-    return bmalloc::api::realloc(object, size);
+    void* result = bmalloc::api::realloc(object, size);
+    if (!result)
+        CRASH();
+    return result;
 }
 
 void fastFree(void* object)
@@ -228,7 +239,10 @@ size_t fastMallocGoodSize(size_t size)
 
 void* fastAlignedMalloc(size_t alignment, size_t size) 
 {
-    return bmalloc::api::memalign(alignment, size);
+    void* result = bmalloc::api::memalign(alignment, size);
+    if (!result)
+        CRASH();
+    return result;
 }
 
 void fastAlignedFree(void* p) 
@@ -238,7 +252,12 @@ void fastAlignedFree(void* p)
 
 TryMallocReturnValue tryFastMalloc(size_t size)
 {
-    return bmalloc::api::tryMalloc(size);
+    return bmalloc::api::malloc(size);
+}
+    
+TryMallocReturnValue tryFastRealloc(void* object, size_t size)
+{
+    return bmalloc::api::realloc(object, size);
 }
     
 TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize)

diff --git a/Source/WTF/wtf/FastMalloc.h b/Source/WTF/wtf/FastMalloc.h
index 7151771..d099245 100644 (file)
--- a/Source/WTF/wtf/FastMalloc.h
+++ b/Source/WTF/wtf/FastMalloc.h
@@ -48,6 +48,7 @@ WTF_EXPORT_PRIVATE char* fastStrDup(const char*);
 WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastMalloc(size_t);
 TryMallocReturnValue tryFastZeroedMalloc(size_t);
 WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastCalloc(size_t numElements, size_t elementSize);
+WTF_EXPORT_PRIVATE TryMallocReturnValue tryFastRealloc(void*, size_t);
 
 WTF_EXPORT_PRIVATE void fastFree(void*);
 
@@ -107,6 +108,7 @@ using WTF::fastStrDup;
 using WTF::fastZeroedMalloc;
 using WTF::tryFastCalloc;
 using WTF::tryFastMalloc;
+using WTF::tryFastRealloc;
 using WTF::tryFastZeroedMalloc;
 using WTF::fastAlignedMalloc;
 using WTF::fastAlignedFree;

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index 363d493..5d3b347 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-09  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r181307.
+        https://bugs.webkit.org/show_bug.cgi?id=142525
+
+        Broke ASan tests (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "bmalloc: tryFastMalloc shouldn't crash"
+        https://bugs.webkit.org/show_bug.cgi?id=142443
+        http://trac.webkit.org/changeset/181307
+
 2015-03-09  Geoffrey Garen  <ggaren@apple.com>
 
         bmalloc: tryFastMalloc shouldn't crash

diff --git a/Source/bmalloc/bmalloc/Heap.cpp b/Source/bmalloc/bmalloc/Heap.cpp
index ae7d709..6502a74 100644 (file)
--- a/Source/bmalloc/bmalloc/Heap.cpp
+++ b/Source/bmalloc/bmalloc/Heap.cpp
@@ -281,10 +281,14 @@ void Heap::deallocateMediumLine(std::lock_guard<StaticMutex>& lock, MediumLine*
     }
 }
 
-void* Heap::allocateXLarge(std::lock_guard<StaticMutex>& lock, size_t alignment, size_t size)
+void* Heap::allocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t size)
 {
-    void* result = tryAllocateXLarge(lock, alignment, size);
-    RELEASE_BASSERT(result);
+    BASSERT(isPowerOfTwo(alignment));
+    BASSERT(alignment >= xLargeAlignment);
+    BASSERT(size == roundUpToMultipleOf<xLargeAlignment>(size));
+
+    void* result = vmAllocate(alignment, size);
+    m_xLargeObjects.push(Range(result, size));
     return result;
 }
 
@@ -293,19 +297,6 @@ void* Heap::allocateXLarge(std::lock_guard<StaticMutex>& lock, size_t size)
     return allocateXLarge(lock, superChunkSize, size);
 }
 
-void* Heap::tryAllocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t size)
-{
-    BASSERT(isPowerOfTwo(alignment));
-    BASSERT(alignment >= superChunkSize);
-    BASSERT(size == roundUpToMultipleOf<xLargeAlignment>(size));
-
-    void* result = tryVMAllocate(alignment, size);
-    if (!result)
-        return nullptr;
-    m_xLargeObjects.push(Range(result, size));
-    return result;
-}
-
 Range Heap::findXLarge(std::lock_guard<StaticMutex>&, void* object)
 {
     for (auto& range : m_xLargeObjects) {

diff --git a/Source/bmalloc/bmalloc/Heap.h b/Source/bmalloc/bmalloc/Heap.h
index 3f61462..b3a80c0 100644 (file)
--- a/Source/bmalloc/bmalloc/Heap.h
+++ b/Source/bmalloc/bmalloc/Heap.h
@@ -65,7 +65,6 @@ public:
 
     void* allocateXLarge(std::lock_guard<StaticMutex>&, size_t);
     void* allocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t);
-    void* tryAllocateXLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t);
     Range findXLarge(std::lock_guard<StaticMutex>&, void*);
     void deallocateXLarge(std::unique_lock<StaticMutex>&, void*);
 

diff --git a/Source/bmalloc/bmalloc/VMAllocate.h b/Source/bmalloc/bmalloc/VMAllocate.h
index d9d0a9c..31f79b4 100644 (file)
--- a/Source/bmalloc/bmalloc/VMAllocate.h
+++ b/Source/bmalloc/bmalloc/VMAllocate.h
@@ -73,19 +73,11 @@ inline void vmValidate(void* p, size_t vmSize)
     BASSERT(p == mask(p, ~(getpagesize() - 1)));
 }
 
-inline void* tryVMAllocate(size_t vmSize)
+inline void* vmAllocate(size_t vmSize)
 {
     vmValidate(vmSize);
     void* result = mmap(0, vmSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, BMALLOC_VM_TAG, 0);
-    if (result == MAP_FAILED)
-        return nullptr;
-    return result;
-}
-
-inline void* vmAllocate(size_t vmSize)
-{
-    void* result = tryVMAllocate(vmSize);
-    RELEASE_BASSERT(result);
+    RELEASE_BASSERT(result != MAP_FAILED);
     return result;
 }
 
@@ -98,15 +90,13 @@ inline void vmDeallocate(void* p, size_t vmSize)
 // Allocates vmSize bytes at a specified power-of-two alignment.
 // Use this function to create maskable memory regions.
 
-inline void* tryVMAllocate(size_t vmAlignment, size_t vmSize)
+inline void* vmAllocate(size_t vmAlignment, size_t vmSize)
 {
     vmValidate(vmSize);
     vmValidate(vmAlignment);
 
     size_t mappedSize = std::max(vmSize, vmAlignment) + vmAlignment;
-    char* mapped = static_cast<char*>(tryVMAllocate(mappedSize));
-    if (!mapped)
-        return nullptr;
+    char* mapped = static_cast<char*>(vmAllocate(mappedSize));
     char* mappedEnd = mapped + mappedSize;
 
     char* aligned = roundUpToMultipleOf(vmAlignment, mapped);
@@ -121,13 +111,6 @@ inline void* tryVMAllocate(size_t vmAlignment, size_t vmSize)
     return aligned;
 }
 
-inline void* vmAllocate(size_t vmAlignment, size_t vmSize)
-{
-    void* result = tryVMAllocate(vmAlignment, vmSize);
-    RELEASE_BASSERT(result);
-    return result;
-}
-
 inline void vmDeallocatePhysicalPages(void* p, size_t vmSize)
 {
     vmValidate(p, vmSize);

diff --git a/Source/bmalloc/bmalloc/bmalloc.h b/Source/bmalloc/bmalloc/bmalloc.h
index d8c9bf9..e2861c1 100644 (file)
--- a/Source/bmalloc/bmalloc/bmalloc.h
+++ b/Source/bmalloc/bmalloc/bmalloc.h
@@ -31,37 +31,24 @@
 namespace bmalloc {
 namespace api {
 
-// Returns null on failure.
-inline void* tryMalloc(size_t size)
-{
-    if (size <= largeMax)
-        return Cache::allocate(size);
-
-    std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
-    return PerProcess<Heap>::get()->tryAllocateXLarge(lock, superChunkSize, roundUpToMultipleOf<xLargeAlignment>(size));
-}
-
-// Crashes on failure.
 inline void* malloc(size_t size)
 {
     return Cache::allocate(size);
 }
 
-// Crashes on failure.
 inline void* memalign(size_t alignment, size_t size)
 {
     return Cache::allocate(alignment, size);
 }
 
-// Crashes on failure.
-inline void* realloc(void* object, size_t newSize)
+inline void free(void* object)
 {
-    return Cache::reallocate(object, newSize);
+    Cache::deallocate(object);
 }
 
-inline void free(void* object)
+inline void* realloc(void* object, size_t newSize)
 {
-    Cache::deallocate(object);
+    return Cache::reallocate(object, newSize);
 }
 
 inline void scavengeThisThread()