Title: [261207] trunk
- Revision
- 261207
- Author
- [email protected]
- Date
- 2020-05-05 17:11:10 -0700 (Tue, 05 May 2020)
Log Message
Don't use the DebugHeap for catalyst
https://bugs.webkit.org/show_bug.cgi?id=211471
Reviewed by Tim Horton.
Source/bmalloc:
* bmalloc/BPlatform.h:
* bmalloc/Environment.cpp:
(bmalloc::Environment::computeIsDebugHeapEnabled):
* bmalloc/ProcessCheck.h:
(bmalloc::shouldProcessUnconditionallyUseBmalloc): Deleted.
* bmalloc/ProcessCheck.mm:
Tools:
* TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp:
(TEST):
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (261206 => 261207)
--- trunk/Source/bmalloc/ChangeLog 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Source/bmalloc/ChangeLog 2020-05-06 00:11:10 UTC (rev 261207)
@@ -1,3 +1,17 @@
+2020-05-05 Saam Barati <[email protected]>
+
+ Don't use the DebugHeap for catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=211471
+
+ Reviewed by Tim Horton.
+
+ * bmalloc/BPlatform.h:
+ * bmalloc/Environment.cpp:
+ (bmalloc::Environment::computeIsDebugHeapEnabled):
+ * bmalloc/ProcessCheck.h:
+ (bmalloc::shouldProcessUnconditionallyUseBmalloc): Deleted.
+ * bmalloc/ProcessCheck.mm:
+
2020-05-01 Don Olmstead <[email protected]>
Use export macros on all platforms
Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (261206 => 261207)
--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2020-05-06 00:11:10 UTC (rev 261207)
@@ -63,7 +63,10 @@
#if TARGET_OS_SIMULATOR
#define BPLATFORM_IOS_SIMULATOR 1
#endif
+#if defined(TARGET_OS_MACCATALYST) && TARGET_OS_MACCATALYST
+#define BPLATFORM_MACCATALYST 1
#endif
+#endif
#if TARGET_OS_IPHONE
#define BPLATFORM_IOS_FAMILY 1
#if TARGET_OS_SIMULATOR
@@ -302,12 +305,6 @@
/* This is used for debugging when hacking on how bmalloc calculates its physical footprint. */
#define ENABLE_PHYSICAL_PAGE_MAP 0
-#if BPLATFORM(IOS_FAMILY) && (BCPU(ARM64) || BCPU(ARM))
-#define BUSE_CHECK_NANO_MALLOC 1
-#else
-#define BUSE_CHECK_NANO_MALLOC 0
-#endif
-
#if BPLATFORM(MAC)
#define BUSE_PARTIAL_SCAVENGE 1
#else
Modified: trunk/Source/bmalloc/bmalloc/Environment.cpp (261206 => 261207)
--- trunk/Source/bmalloc/bmalloc/Environment.cpp 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Source/bmalloc/bmalloc/Environment.cpp 2020-05-06 00:11:10 UTC (rev 261207)
@@ -34,6 +34,12 @@
#include <dlfcn.h>
#endif
+#if BPLATFORM(IOS_FAMILY) && !BPLATFORM(MACCATALYST) && !BPLATFORM(IOS_FAMILY_SIMULATOR)
+#define BUSE_CHECK_NANO_MALLOC 1
+#else
+#define BUSE_CHECK_NANO_MALLOC 0
+#endif
+
#if BUSE(CHECK_NANO_MALLOC)
extern "C" {
#if __has_include(<malloc_private.h>)
@@ -140,13 +146,16 @@
return true;
if (isSanitizerEnabled())
return true;
+
#if BUSE(CHECK_NANO_MALLOC)
if (!isNanoMallocEnabled() && !shouldProcessUnconditionallyUseBmalloc())
return true;
#endif
+
#if BENABLE_MALLOC_HEAP_BREAKDOWN
return true;
#endif
+
return false;
}
Modified: trunk/Source/bmalloc/bmalloc/ProcessCheck.h (261206 => 261207)
--- trunk/Source/bmalloc/bmalloc/ProcessCheck.h 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Source/bmalloc/bmalloc/ProcessCheck.h 2020-05-06 00:11:10 UTC (rev 261207)
@@ -39,10 +39,8 @@
inline bool gigacageEnabledForProcess() { return true; }
#endif
-#if BUSE(CHECK_NANO_MALLOC)
+#if BPLATFORM(IOS_FAMILY)
bool shouldProcessUnconditionallyUseBmalloc();
-#else
-inline bool shouldProcessUnconditionallyUseBmalloc() { return true; }
#endif
}
Modified: trunk/Source/bmalloc/bmalloc/ProcessCheck.mm (261206 => 261207)
--- trunk/Source/bmalloc/bmalloc/ProcessCheck.mm 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Source/bmalloc/bmalloc/ProcessCheck.mm 2020-05-06 00:11:10 UTC (rev 261207)
@@ -53,7 +53,7 @@
}
#endif // !BPLATFORM(WATCHOS)
-#if BUSE(CHECK_NANO_MALLOC)
+#if BPLATFORM(IOS_FAMILY)
bool shouldProcessUnconditionallyUseBmalloc()
{
static bool result;
@@ -74,6 +74,6 @@
return result;
}
-#endif // BUSE(CHECK_NANO_MALLOC)
+#endif // BPLATFORM(IOS_FAMILY)
}
Modified: trunk/Tools/ChangeLog (261206 => 261207)
--- trunk/Tools/ChangeLog 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Tools/ChangeLog 2020-05-06 00:11:10 UTC (rev 261207)
@@ -1,3 +1,13 @@
+2020-05-05 Saam Barati <[email protected]>
+
+ Don't use the DebugHeap for catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=211471
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp:
+ (TEST):
+
2020-05-05 Daniel Bates <[email protected]>
Should show selection highlight during text interaction
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp (261206 => 261207)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp 2020-05-05 23:52:48 UTC (rev 261206)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/bmalloc/IsoHeap.cpp 2020-05-06 00:11:10 UTC (rev 261207)
@@ -280,6 +280,11 @@
TEST(bmalloc, ScavengedMemoryShouldBeReused)
{
+ if (Environment::get()->isDebugHeapEnabled()) {
+ printf(" skipping test because DebugHeap.\n");
+ return;
+ }
+
static IsoHeap<double> heap;
auto run = [] (unsigned numPagesToCommit) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
