Title: [179927] trunk/Source/bmalloc
- Revision
- 179927
- Author
- [email protected]
- Date
- 2015-02-11 08:12:13 -0800 (Wed, 11 Feb 2015)
Log Message
bmalloc buildfix on 32 bit Linux (x86/ARM)
https://bugs.webkit.org/show_bug.cgi?id=141472
Reviewed by Gyuyoung Kim.
* bmalloc/Algorithm.h:
(bmalloc::roundUpToMultipleOf):
* bmalloc/FixedVector.h:
(bmalloc::FixedVector::clear):
* bmalloc/Sizes.h:
(bmalloc::Sizes::sizeClass):
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (179926 => 179927)
--- trunk/Source/bmalloc/ChangeLog 2015-02-11 15:34:13 UTC (rev 179926)
+++ trunk/Source/bmalloc/ChangeLog 2015-02-11 16:12:13 UTC (rev 179927)
@@ -1,3 +1,17 @@
+2015-02-11 Csaba Osztrogonác <[email protected]>
+
+ bmalloc buildfix on 32 bit Linux (x86/ARM)
+ https://bugs.webkit.org/show_bug.cgi?id=141472
+
+ Reviewed by Gyuyoung Kim.
+
+ * bmalloc/Algorithm.h:
+ (bmalloc::roundUpToMultipleOf):
+ * bmalloc/FixedVector.h:
+ (bmalloc::FixedVector::clear):
+ * bmalloc/Sizes.h:
+ (bmalloc::Sizes::sizeClass):
+
2015-02-11 Gyuyoung Kim <[email protected]>
[EFL][GTK] Use bmalloc instead of tcmalloc
Modified: trunk/Source/bmalloc/bmalloc/Algorithm.h (179926 => 179927)
--- trunk/Source/bmalloc/bmalloc/Algorithm.h 2015-02-11 15:34:13 UTC (rev 179926)
+++ trunk/Source/bmalloc/bmalloc/Algorithm.h 2015-02-11 16:12:13 UTC (rev 179927)
@@ -70,7 +70,7 @@
template<typename T> inline T roundUpToMultipleOf(size_t divisor, T x)
{
BASSERT(isPowerOfTwo(divisor));
- return reinterpret_cast<T>((reinterpret_cast<uintptr_t>(x) + (divisor - 1ul)) & ~(divisor - 1ul));
+ return reinterpret_cast<T>((reinterpret_cast<uintptr_t>(x) + (divisor - 1)) & ~(divisor - 1));
}
template<size_t divisor, typename T> inline constexpr T roundUpToMultipleOf(T x)
Modified: trunk/Source/bmalloc/bmalloc/FixedVector.h (179926 => 179927)
--- trunk/Source/bmalloc/bmalloc/FixedVector.h 2015-02-11 15:34:13 UTC (rev 179926)
+++ trunk/Source/bmalloc/bmalloc/FixedVector.h 2015-02-11 16:12:13 UTC (rev 179927)
@@ -59,7 +59,7 @@
void shrink(T*);
void shrink(size_t);
- void clear() { shrink(0ul); }
+ void clear() { shrink(static_cast<size_t>(0)); }
bool isEmpty() { return !m_size; }
private:
Modified: trunk/Source/bmalloc/bmalloc/Sizes.h (179926 => 179927)
--- trunk/Source/bmalloc/bmalloc/Sizes.h 2015-02-11 15:34:13 UTC (rev 179926)
+++ trunk/Source/bmalloc/bmalloc/Sizes.h 2015-02-11 16:12:13 UTC (rev 179927)
@@ -100,7 +100,7 @@
inline size_t sizeClass(size_t size)
{
static const size_t sizeClassMask = (mediumMax / alignment) - 1;
- return mask((size - 1ul) / alignment, sizeClassMask);
+ return mask((size - 1) / alignment, sizeClassMask);
}
inline size_t objectSize(size_t sizeClass)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
