Title: [200386] trunk/Source/bmalloc
- Revision
- 200386
- Author
- [email protected]
- Date
- 2016-05-03 13:54:51 -0700 (Tue, 03 May 2016)
Log Message
2016-05-03 Geoffrey Garen <[email protected]>
Assertion failure in bmalloc::vmRevokePermissions(void*, unsigned long).
https://bugs.webkit.org/show_bug.cgi?id=157047
Reviewed by Filip Pizlo.
Renamed roundUpToMultipleOfSloppy => roundUpToMultipleOfNonPowerOfTwo.
* bmalloc/Algorithm.h:
(bmalloc::roundUpToMultipleOfNonPowerOfTwo):
(bmalloc::roundUpToMultipleOfSloppy): Deleted.
* bmalloc/VMHeap.cpp:
(bmalloc::VMHeap::allocateSmallChunk):
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (200385 => 200386)
--- trunk/Source/bmalloc/ChangeLog 2016-05-03 19:43:56 UTC (rev 200385)
+++ trunk/Source/bmalloc/ChangeLog 2016-05-03 20:54:51 UTC (rev 200386)
@@ -5,6 +5,21 @@
Reviewed by Filip Pizlo.
+ Renamed roundUpToMultipleOfSloppy => roundUpToMultipleOfNonPowerOfTwo.
+
+ * bmalloc/Algorithm.h:
+ (bmalloc::roundUpToMultipleOfNonPowerOfTwo):
+ (bmalloc::roundUpToMultipleOfSloppy): Deleted.
+ * bmalloc/VMHeap.cpp:
+ (bmalloc::VMHeap::allocateSmallChunk):
+
+2016-05-03 Geoffrey Garen <[email protected]>
+
+ Assertion failure in bmalloc::vmRevokePermissions(void*, unsigned long).
+ https://bugs.webkit.org/show_bug.cgi?id=157047
+
+ Reviewed by Filip Pizlo.
+
The previous fix aligned the guard page sizes correctly but forgot to
align the guard page start address correctly.
Modified: trunk/Source/bmalloc/bmalloc/Algorithm.h (200385 => 200386)
--- trunk/Source/bmalloc/bmalloc/Algorithm.h 2016-05-03 19:43:56 UTC (rev 200385)
+++ trunk/Source/bmalloc/bmalloc/Algorithm.h 2016-05-03 20:54:51 UTC (rev 200386)
@@ -101,7 +101,7 @@
return (numerator + denominator - 1) / denominator;
}
-template<typename T> inline T roundUpToMultipleOfSloppy(size_t divisor, T x)
+template<typename T> inline T roundUpToMultipleOfNonPowerOfTwo(size_t divisor, T x)
{
return divideRoundingUp(x, divisor) * divisor;
}
Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (200385 => 200386)
--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-05-03 19:43:56 UTC (rev 200385)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-05-03 20:54:51 UTC (rev 200386)
@@ -68,7 +68,7 @@
// guarantee that we can service aligned allocation requests at equal
// and smaller powers of two.
size_t vmPageSize = roundUpToMultipleOf(bmalloc::vmPageSize(), pageSize);
- size_t metadataSize = roundUpToMultipleOfSloppy(vmPageSize, sizeof(Chunk));
+ size_t metadataSize = roundUpToMultipleOfNonPowerOfTwo(vmPageSize, sizeof(Chunk));
Object begin(chunk, metadataSize);
Object end(chunk, chunkSize);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
