Title: [225471] trunk/Source/WTF
- Revision
- 225471
- Author
- tpop...@redhat.com
- Date
- 2017-12-03 22:26:13 -0800 (Sun, 03 Dec 2017)
Log Message
Build fails on x86_64 and arm64 with BMalloc disabled
https://bugs.webkit.org/show_bug.cgi?id=180188
Reviewed by Carlos Garcia Campos.
Add missing methods in WTF's Gigacage.h and fix g_gigacageBasePtr
definition.
* wtf/Gigacage.cpp:
* wtf/Gigacage.h:
(Gigacage::basePtr):
(Gigacage::isEnabled):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (225470 => 225471)
--- trunk/Source/WTF/ChangeLog 2017-12-04 06:13:05 UTC (rev 225470)
+++ trunk/Source/WTF/ChangeLog 2017-12-04 06:26:13 UTC (rev 225471)
@@ -1,3 +1,18 @@
+2017-12-03 Tomas Popela <tpop...@redhat.com>
+
+ Build fails on x86_64 and arm64 with BMalloc disabled
+ https://bugs.webkit.org/show_bug.cgi?id=180188
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add missing methods in WTF's Gigacage.h and fix g_gigacageBasePtr
+ definition.
+
+ * wtf/Gigacage.cpp:
+ * wtf/Gigacage.h:
+ (Gigacage::basePtr):
+ (Gigacage::isEnabled):
+
2017-12-03 Yusuke Suzuki <utatane....@gmail.com>
WTF shouldn't have both Thread and ThreadIdentifier
Modified: trunk/Source/WTF/wtf/Gigacage.cpp (225470 => 225471)
--- trunk/Source/WTF/wtf/Gigacage.cpp 2017-12-04 06:13:05 UTC (rev 225470)
+++ trunk/Source/WTF/wtf/Gigacage.cpp 2017-12-04 06:26:13 UTC (rev 225471)
@@ -32,9 +32,7 @@
#if defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
-extern "C" {
-void* g_gigacageBasePtr;
-}
+char g_gigacageBasePtrs[GIGACAGE_BASE_PTRS_SIZE];
namespace Gigacage {
Modified: trunk/Source/WTF/wtf/Gigacage.h (225470 => 225471)
--- trunk/Source/WTF/wtf/Gigacage.h 2017-12-04 06:13:05 UTC (rev 225470)
+++ trunk/Source/WTF/wtf/Gigacage.h 2017-12-04 06:26:13 UTC (rev 225471)
@@ -97,6 +97,16 @@
return *reinterpret_cast<BasePtrs*>(g_gigacageBasePtrs);
}
+ALWAYS_INLINE void*& basePtr(Kind kind)
+{
+ return basePtr(basePtrs(), kind);
+}
+
+ALWAYS_INLINE bool isEnabled(Kind kind)
+{
+ return !!basePtr(kind);
+}
+
ALWAYS_INLINE size_t mask(Kind) { return 0; }
template<typename T>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
