Title: [200024] releases/WebKitGTK/webkit-2.12/Source/bmalloc
- Revision
- 200024
- Author
- [email protected]
- Date
- 2016-04-25 08:53:03 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199756 - Unreviewed, try to fix an ASSERT seen on the bots.
* bmalloc/Heap.cpp:
(bmalloc::Heap::tryAllocateLarge): This ASSERT is supposed to be about
alignment, not size. Oops.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog (200023 => 200024)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-04-25 15:50:29 UTC (rev 200023)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-04-25 15:53:03 UTC (rev 200024)
@@ -1,5 +1,13 @@
2016-04-19 Geoffrey Garen <[email protected]>
+ Unreviewed, try to fix an ASSERT seen on the bots.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::tryAllocateLarge): This ASSERT is supposed to be about
+ alignment, not size. Oops.
+
+2016-04-19 Geoffrey Garen <[email protected]>
+
bmalloc: Merge the large and xlarge allocators
https://bugs.webkit.org/show_bug.cgi?id=156734
Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp (200023 => 200024)
--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp 2016-04-25 15:50:29 UTC (rev 200023)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp 2016-04-25 15:53:03 UTC (rev 200024)
@@ -343,7 +343,7 @@
void* Heap::tryAllocateLarge(std::lock_guard<StaticMutex>& lock, size_t alignment, size_t size)
{
BASSERT(size <= largeMax);
- BASSERT(size <= largeMax / 2);
+ BASSERT(alignment <= largeMax / 2);
BASSERT(isPowerOfTwo(alignment));
size = size ? roundUpToMultipleOf(largeAlignment, size) : largeAlignment;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
