Merge r223844 - bmalloc::api::tryLargeMemalignVirtual() shouldn't ass…

…ert on a failed allocation

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

Reviewed by Geoffrey Garen.

* bmalloc/bmalloc.h:
(bmalloc::api::tryLargeMemalignVirtual): Call Heap::tryAllocateLarge()
instead of Heap::allocateLarge(). The former will return a null pointer
upon a failed allocation, allowing the caller to fail gracefully just as
the API entrypoint implies, while the latter currently provokes a crash
in these circumstances.

Source/bmalloc/ChangeLog

@@ -1,3 +1,17 @@
+2017-10-23  Zan Dobersek  <zdobersek@igalia.com>
+
+        bmalloc::api::tryLargeMemalignVirtual() shouldn't assert on a failed allocation
+        https://bugs.webkit.org/show_bug.cgi?id=178654
+
+        Reviewed by Geoffrey Garen.
+
+        * bmalloc/bmalloc.h:
+        (bmalloc::api::tryLargeMemalignVirtual): Call Heap::tryAllocateLarge()
+        instead of Heap::allocateLarge(). The former will return a null pointer
+        upon a failed allocation, allowing the caller to fail gracefully just as
+        the API entrypoint implies, while the latter currently provokes a crash
+        in these circumstances.
+
 2017-10-05  Filip Pizlo  <fpizlo@apple.com>
 
         Use one Scavenger thread for all Heaps

Source/bmalloc/bmalloc/bmalloc.h

@@ -70,7 +70,7 @@ inline void* tryLargeMemalignVirtual(size_t alignment, size_t size, HeapKind kin
 {
     Heap& heap = PerProcess<PerHeapKind<Heap>>::get()->at(kind);
     std::lock_guard<StaticMutex> lock(Heap::mutex());
-    return heap.allocateLarge(lock, alignment, size, AllocationKind::Virtual);
+    return heap.tryAllocateLarge(lock, alignment, size, AllocationKind::Virtual);
 }
 
 inline void free(void* object, HeapKind kind = HeapKind::Primary)