Title: [233550] trunk/Source/bmalloc
- Revision
- 233550
- Author
- [email protected]
- Date
- 2018-07-05 17:19:57 -0700 (Thu, 05 Jul 2018)
Log Message
Build fix (r233547): Disable IsoHeaps when Gigacage is off
<https://webkit.org/b/187160>
* bmalloc/PerThread.cpp: Add #if !HAVE_PTHREAD_MACHDEP_H/#endif
around variables only used when that macro is 0. Include what
you use: Cache.h and Heap.h.
* bmalloc/PerThread.h: Include <memory> for std::once_flag.
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (233549 => 233550)
--- trunk/Source/bmalloc/ChangeLog 2018-07-05 23:24:53 UTC (rev 233549)
+++ trunk/Source/bmalloc/ChangeLog 2018-07-06 00:19:57 UTC (rev 233550)
@@ -1,3 +1,13 @@
+2018-07-05 David Kilzer <[email protected]>
+
+ Build fix (r233547): Disable IsoHeaps when Gigacage is off
+ <https://webkit.org/b/187160>
+
+ * bmalloc/PerThread.cpp: Add #if !HAVE_PTHREAD_MACHDEP_H/#endif
+ around variables only used when that macro is 0. Include what
+ you use: Cache.h and Heap.h.
+ * bmalloc/PerThread.h: Include <memory> for std::once_flag.
+
2018-07-05 Michael Saboff <[email protected]>
Disable IsoHeaps when Gigacage is off
Modified: trunk/Source/bmalloc/bmalloc/PerThread.cpp (233549 => 233550)
--- trunk/Source/bmalloc/bmalloc/PerThread.cpp 2018-07-05 23:24:53 UTC (rev 233549)
+++ trunk/Source/bmalloc/bmalloc/PerThread.cpp 2018-07-06 00:19:57 UTC (rev 233550)
@@ -26,9 +26,13 @@
#include "PerThread.h"
#include "BExport.h"
+#include "Cache.h"
+#include "Heap.h"
namespace bmalloc {
-
+
+#if !HAVE_PTHREAD_MACHDEP_H
+
template<> BEXPORT bool PerThreadStorage<PerHeapKind<Cache>>::s_didInitialize = false;
template<> BEXPORT pthread_key_t PerThreadStorage<PerHeapKind<Cache>>::s_key = 0;
template<> BEXPORT std::once_flag PerThreadStorage<PerHeapKind<Cache>>::s_onceFlag = { };
@@ -37,4 +41,6 @@
template<> BEXPORT pthread_key_t PerThreadStorage<PerHeapKind<Heap>>::s_key = 0;
template<> BEXPORT std::once_flag PerThreadStorage<PerHeapKind<Heap>>::s_onceFlag = { };
+#endif
+
} // namespace bmalloc
Modified: trunk/Source/bmalloc/bmalloc/PerThread.h (233549 => 233550)
--- trunk/Source/bmalloc/bmalloc/PerThread.h 2018-07-05 23:24:53 UTC (rev 233549)
+++ trunk/Source/bmalloc/bmalloc/PerThread.h 2018-07-06 00:19:57 UTC (rev 233550)
@@ -30,6 +30,7 @@
#include "BPlatform.h"
#include "PerHeapKind.h"
#include "VMAllocate.h"
+#include <memory>
#include <mutex>
#include <pthread.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
