[GLIB] WebKit doesn't build with -DENABLE_MALLOC_HEAP_BREAKDOWN=ON

GeorgesStavracas · GeorgesStavracas · commit f5f08704ee11 · 2025-09-04T07:17:16.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=298223 Reviewed by Michael Catanzaro. There were a few issues here: * Commit 37d4a68 introduced a new argument to the WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER() macro, but didn't update all places accordingly * There's a conflicting symbol with the ResourceLoader expansion, so rename it. * The heap identifier in StyleInterpolationWrapperBase.h was misnamed, probably a copy-paste mistake. * In FastMalloc.{cpp,h}, relevant parts of the code were compiled out due to not having a BENABLE(MALLOC_HEAP_BREAKDOWN) check. Add them. * Source/WebCore/Modules/fetch/FetchLoader.cpp: * Source/WebCore/Modules/fetch/FetchLoader.h: * Source/WebCore/Modules/notifications/NotificationResourcesLoader.cpp: * Source/WebCore/Modules/notifications/NotificationResourcesLoader.h: * Source/WebCore/css/CSSSelector.h: * Source/WebCore/css/parser/CSSTokenizer.cpp: * Source/WebCore/css/parser/CSSTokenizerInputStream.cpp: * Source/WebCore/fileapi/FileReaderLoader.cpp: * Source/WebCore/fileapi/FileReaderLoader.h: * Source/WebCore/loader/LoaderMalloc.cpp: * Source/WebCore/loader/ResourceLoader.cpp: * Source/WebCore/loader/ResourceLoader.h: * Source/WebCore/page/PerformanceEntry.cpp: * Source/WebCore/style/StyleInterpolation.cpp: * Source/WebCore/style/StyleInterpolationWrapperBase.h: * Source/WebCore/style/StyleTreeResolver.h: * Source/bmalloc/bmalloc/SystemHeap.cpp: * Source/bmalloc/bmalloc/SystemHeap.h: Canonical link: https://commits.webkit.org/299555@main
diff --git a/Source/WebCore/Modules/fetch/FetchLoader.cpp b/Source/WebCore/Modules/fetch/FetchLoader.cpp
@@ -49,6 +49,7 @@
 namespace WebCore {
 
 WTF_MAKE_TZONE_ALLOCATED_IMPL(FetchLoaderClient);
+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FetchLoader);
 
 void FetchLoader::start(ScriptExecutionContext& context, const Blob& blob)
 {
diff --git a/Source/WebCore/Modules/fetch/FetchLoader.h b/Source/WebCore/Modules/fetch/FetchLoader.h
@@ -43,6 +43,7 @@ class FetchRequest;
 class ScriptExecutionContext;
 class FragmentedSharedBuffer;
 
+DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FetchLoader);
 class WEBCORE_EXPORT FetchLoader final : public RefCounted<FetchLoader>, public ThreadableLoaderClient {
     WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(FetchLoader, FetchLoader);
     WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(FetchLoader);
diff --git a/Source/WebCore/Modules/notifications/NotificationResourcesLoader.cpp b/Source/WebCore/Modules/notifications/NotificationResourcesLoader.cpp
@@ -44,6 +44,7 @@ namespace WebCore {
 // https://notifications.spec.whatwg.org/#resources
 
 WTF_MAKE_TZONE_ALLOCATED_IMPL(NotificationResourcesLoader);
+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ResourceLoader);
 
 NotificationResourcesLoader::NotificationResourcesLoader(Notification& notification)
     : m_notification(notification)
diff --git a/Source/WebCore/Modules/notifications/NotificationResourcesLoader.h b/Source/WebCore/Modules/notifications/NotificationResourcesLoader.h
@@ -42,6 +42,7 @@ class NotificationResources;
 class ResourceError;
 class ResourceResponse;
 
+DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ResourceLoader);
 class NotificationResourcesLoader {
     WTF_MAKE_TZONE_ALLOCATED(NotificationResourcesLoader);
 public:
diff --git a/Source/WebCore/css/CSSSelector.h b/Source/WebCore/css/CSSSelector.h
@@ -236,7 +236,7 @@ WTF_ALLOW_UNSAFE_BUFFER_USAGE_END
     CSSSelector(CSSSelector&&) = delete;
 
     struct RareData : public RefCounted<RareData> {
-        WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(CSSSelectorRareData, RareData);
+        WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(CSSSelectorRareData, CSSSelectorRareData);
         static Ref<RareData> create(AtomString);
         WEBCORE_EXPORT ~RareData();
 
diff --git a/Source/WebCore/css/parser/CSSTokenizer.cpp b/Source/WebCore/css/parser/CSSTokenizer.cpp
@@ -34,6 +34,7 @@
 #include "CSSParserObserverWrapper.h"
 #include "CSSParserTokenRange.h"
 #include "CSSTokenizerInputStream.h"
+#include <wtf/NeverDestroyed.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringToIntegerConversion.h>
 #include <wtf/unicode/CharacterNames.h>
diff --git a/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp b/Source/WebCore/css/parser/CSSTokenizerInputStream.cpp
@@ -32,6 +32,8 @@
 
 #include "CSSTokenizer.h"
 
+#include <wtf/NeverDestroyed.h>
+
 namespace WebCore {
 DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(CSSTokenizerInputStream);
 
diff --git a/Source/WebCore/fileapi/FileReaderLoader.cpp b/Source/WebCore/fileapi/FileReaderLoader.cpp
@@ -49,6 +49,7 @@
 #include "ThreadableBlobRegistry.h"
 #include "ThreadableLoader.h"
 #include <JavaScriptCore/ArrayBuffer.h>
+#include <wtf/NeverDestroyed.h>
 #include <wtf/RefPtr.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
@@ -58,6 +59,8 @@
 
 namespace WebCore {
 
+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FileReaderLoader);
+
 const int defaultBufferLength = 32768;
 
 FileReaderLoader::FileReaderLoader(ReadType readType, FileReaderLoaderClient* client)
diff --git a/Source/WebCore/fileapi/FileReaderLoader.h b/Source/WebCore/fileapi/FileReaderLoader.h
@@ -53,6 +53,7 @@ class ScriptExecutionContext;
 class TextResourceDecoder;
 class ThreadableLoader;
 
+DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FileReaderLoader);
 class FileReaderLoader final : public ThreadableLoaderClient {
     WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(FileReaderLoader, FileReaderLoader);
     WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(FileReaderLoader);
diff --git a/Source/WebCore/loader/LoaderMalloc.cpp b/Source/WebCore/loader/LoaderMalloc.cpp
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "LoaderMalloc.h"
 
+#include <wtf/NeverDestroyed.h>
+
 namespace WebCore {
 DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(Loader);
 }
diff --git a/Source/WebCore/loader/ResourceLoader.cpp b/Source/WebCore/loader/ResourceLoader.cpp
@@ -85,7 +85,7 @@
 
 namespace WebCore {
 
-DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ResourceLoader);
+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(CoreResourceLoader);
 
 ResourceLoader::ResourceLoader(LocalFrame& frame, ResourceLoaderOptions options)
     : m_frame { &frame }
diff --git a/Source/WebCore/loader/ResourceLoader.h b/Source/WebCore/loader/ResourceLoader.h
@@ -65,9 +65,9 @@ class NetworkLoadMetrics;
 class ResourceMonitor;
 #endif
 
-DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(ResourceLoader);
+DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(CoreResourceLoader);
 class ResourceLoader : public RefCountedAndCanMakeWeakPtr<ResourceLoader>, protected ResourceHandleClient {
-    WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ResourceLoader, ResourceLoader);
+    WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(ResourceLoader, CoreResourceLoader);
 public:
     virtual ~ResourceLoader() = 0;
 
diff --git a/Source/WebCore/page/PerformanceEntry.cpp b/Source/WebCore/page/PerformanceEntry.cpp
@@ -31,6 +31,8 @@
 #include "config.h"
 #include "PerformanceEntry.h"
 
+#include <wtf/NeverDestroyed.h>
+
 namespace WebCore {
 
 DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(PerformanceEntry);
diff --git a/Source/WebCore/style/StyleInterpolation.cpp b/Source/WebCore/style/StyleInterpolation.cpp
@@ -42,7 +42,7 @@
 
 namespace WebCore::Style::Interpolation {
 
-DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(Animation);
+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(StyleInterpolationWrapperBase);
 // MARK: - Standard property interpolation support
 
 static void interpolateStandardProperty(CSSPropertyID property, RenderStyle& destination, const RenderStyle& from, const RenderStyle& to, double progress, CompositeOperation compositeOperation, IterationCompositeOperation iterationCompositeOperation, double currentIteration, const Client& client)
diff --git a/Source/WebCore/style/StyleInterpolationWrapperBase.h b/Source/WebCore/style/StyleInterpolationWrapperBase.h
@@ -44,10 +44,10 @@ namespace Style::Interpolation {
 
 struct Context;
 
-DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(Animation);
+DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(StyleInterpolationWrapperBase);
 class WrapperBase {
     WTF_MAKE_NONCOPYABLE(WrapperBase);
-    WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(Animation, WrapperBase);
+    WTF_DEPRECATED_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(WrapperBase, StyleInterpolationWrapperBase);
 public:
     explicit WrapperBase(CSSPropertyID property)
         : m_property(property)
diff --git a/Source/WebCore/style/StyleTreeResolver.h b/Source/WebCore/style/StyleTreeResolver.h
@@ -105,7 +105,7 @@ class TreeResolver {
     std::optional<ResolvedStyle> resolveAncestorFirstLetterPseudoElement(Element&, const ElementUpdate&, ResolutionContext&);
 
     struct Scope : RefCounted<Scope> {
-        WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(TreeResolverScope, Scope);
+        WTF_DEPRECATED_MAKE_STRUCT_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(TreeResolverScope, TreeResolverScope);
         Ref<Resolver> resolver;
         SelectorMatchingState selectorMatchingState;
         RefPtr<ShadowRoot> shadowRoot;
diff --git a/Source/bmalloc/bmalloc/SystemHeap.cpp b/Source/bmalloc/bmalloc/SystemHeap.cpp
@@ -42,7 +42,7 @@ SystemHeap* systemHeapCache { nullptr };
 
 DEFINE_STATIC_PER_PROCESS_STORAGE(SystemHeap);
 
-#if BOS(DARWIN)
+#if BENABLE(MALLOC_HEAP_BREAKDOWN) || BOS(DARWIN)
 
 static bool shouldUseDefaultMallocZone()
 {
diff --git a/Source/bmalloc/bmalloc/SystemHeap.h b/Source/bmalloc/bmalloc/SystemHeap.h
@@ -64,7 +64,7 @@ class SystemHeap : private StaticPerProcess<SystemHeap> {
     static SystemHeap* tryGet();
     static SystemHeap* getExisting();
 
-#if BOS(DARWIN)
+#if BENABLE(MALLOC_HEAP_BREAKDOWN) || BOS(DARWIN)
     malloc_zone_t* zone() const { return m_zone; };
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@`
`49`	`49`	`namespace WebCore {`
`50`	`50`
`51`	`51`	`WTF_MAKE_TZONE_ALLOCATED_IMPL(FetchLoaderClient);`
	`52`	`+DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(FetchLoader);`
`52`	`53`
`53`	`54`	`void FetchLoader::start(ScriptExecutionContext& context, const Blob& blob)`
`54`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`#include "config.h"`
`27`	`27`	`#include "LoaderMalloc.h"`
`28`	`28`
	`29`	`+#include <wtf/NeverDestroyed.h>`
	`30`	`+`
`29`	`31`	`namespace WebCore {`
`30`	`32`	`DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(Loader);`
`31`	`33`	`}`