[CMake] Fix Mac CMake build for bmalloc by pascoej · Pull Request #62544 · WebKit/WebKit

pascoej · 2026-04-11T15:18:47Z

`be740b1`

[CMake] Fix Mac CMake build for bmalloc
https://bugs.webkit.org/show_bug.cgi?id=312019
rdar://problem/174561810

Reviewed by BJ Burg.

Reorganize bmalloc headers into public and private sets so downstream
targets only see the API surface they need. Add missing TZoneLog.h to
the public list. Remove stale IsoHeap.cpp reference and add Foundation
framework linking for ProcessCheck.mm. Add missing BAssert.h include
in TZoneHeap.h.

Based on a base patch by Simon Lewis. Incorporates private header
reorganization from Ian Grunert (PR #62543).

* Source/bmalloc/CMakeLists.txt:
* Source/bmalloc/PlatformMac.cmake:
* Source/bmalloc/bmalloc/TZoneHeap.h:

Canonical link: https://commits.webkit.org/311104@main

33e626c

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk1~~	✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv		✅ 🧪 jsc-armv7-tests
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-04-11T15:18:53Z

EWS run on previous version of this PR (hash c3afb42)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	~~🧪 api-ios~~	~~🧪 mac-wk1~~	✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv		~~🧪 jsc-armv7-tests~~
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-04-11T16:28:13Z

EWS run on previous version of this PR (hash 48ecc5c)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	❌ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	❌ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	❌ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk1	❌ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	❌ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	❌ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	❌ 🛠 jsc-armv7
	✅ 🛠 tv		❌ 🧪 jsc-armv7-tests
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

aperezdc · 2026-04-11T20:59:39Z

+find_library(FOUNDATION_LIBRARY Foundation)
+list(APPEND bmalloc_LIBRARIES ${FOUNDATION_LIBRARY})


Typically for CMake we put all platform-specific find_library() and find_package() calls in Source/cmake/Options{Mac,GTK,..}.cmake to have a single source where the main dependencies are listed. Is there some particular reason for this to be an exception?

Also, it may be possible to use bmalloc_PRIVATE_LIBRARIES here.

All the existing CMake Mac code is structured in this way in PlatformMac.cmake. Let's clean it up in the second pass of PRs, once the main targets are fixed.

I filed https://bugs.webkit.org/show_bug.cgi?id=312165 for this.

webkit-early-warning-system · 2026-04-12T05:22:08Z

EWS run on previous version of this PR (hash d09043a)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
🧪 services	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv		✅ 🧪 jsc-armv7-tests
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-04-12T19:49:37Z

EWS run on previous version of this PR (hash dfc4d99)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	❌ 🧪 win-tests	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 jsc-armv7
	✅ 🛠 tv		✅ 🧪 jsc-armv7-tests
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

burg

r=me, cool!

burg · 2026-04-13T03:36:33Z

@@ -624,6 +572,55 @@ set(bmalloc_PUBLIC_HEADERS
    libpas/src/libpas/pas_zero_memory.h
    libpas/src/libpas/pas_zero_mode.h
    libpas/src/libpas/thingy_heap_config.h


thingy is a debug API, should this header belong alongside the other two thingy headers?

burg · 2026-04-13T03:38:25Z

+find_library(FOUNDATION_LIBRARY Foundation)
+list(APPEND bmalloc_LIBRARIES ${FOUNDATION_LIBRARY})


All the existing CMake Mac code is structured in this way in PlatformMac.cmake. Let's clean it up in the second pass of PRs, once the main targets are fixed.

webkit-early-warning-system · 2026-04-13T15:06:12Z

EWS run on current version of this PR (hash 33e626c)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
✅ 🛠 🧪 jsc	✅ 🧪 api-ios	~~🧪 mac-wk1~~	✅ 🛠 gtk
✅ 🛠 🧪 jsc-debug-arm64		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~	✅ 🛠 jsc-armv7
	✅ 🛠 tv		✅ 🧪 jsc-armv7-tests
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=312019 rdar://problem/174561810 Reviewed by BJ Burg. Reorganize bmalloc headers into public and private sets so downstream targets only see the API surface they need. Add missing TZoneLog.h to the public list. Remove stale IsoHeap.cpp reference and add Foundation framework linking for ProcessCheck.mm. Add missing BAssert.h include in TZoneHeap.h. Based on a base patch by Simon Lewis. Incorporates private header reorganization from Ian Grunert (PR WebKit#62543). * Source/bmalloc/CMakeLists.txt: * Source/bmalloc/PlatformMac.cmake: * Source/bmalloc/bmalloc/TZoneHeap.h: Canonical link: https://commits.webkit.org/311104@main

webkit-commit-queue · 2026-04-13T17:20:21Z

Committed 311104@main (be740b1): https://commits.webkit.org/311104@main

Reviewed commits have been landed. Closing PR #62544 and removing active labels.

pascoej requested a review from a team as a code owner April 11, 2026 15:18

pascoej self-assigned this Apr 11, 2026

pascoej added the CMake Bugzilla component for CMake build system changes label Apr 11, 2026

pascoej requested a review from burg April 11, 2026 15:20

pascoej changed the title ~~[CMake] Fix Mac CMake build for bmalloc~~ [CMake] Fix Mac CMake build for bmalloc https://bugs.webkit.org/show_bug.cgi?id=312019 rdar://problem/174561810 Apr 11, 2026

pascoej force-pushed the eng/cmake-mac-bmalloc branch from c3afb42 to 48ecc5c Compare April 11, 2026 16:28

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 11, 2026

aperezdc reviewed Apr 11, 2026

View reviewed changes

pascoej removed the merging-blocked Applied to prevent a change from being merged label Apr 12, 2026

pascoej changed the title ~~[CMake] Fix Mac CMake build for bmalloc https://bugs.webkit.org/show_bug.cgi?id=312019 rdar://problem/174561810~~ [CMake] Fix Mac CMake build for bmalloc Apr 12, 2026

pascoej force-pushed the eng/cmake-mac-bmalloc branch from 48ecc5c to d09043a Compare April 12, 2026 05:22

pascoej force-pushed the eng/cmake-mac-bmalloc branch from d09043a to dfc4d99 Compare April 12, 2026 19:49

burg approved these changes Apr 13, 2026

View reviewed changes

pascoej force-pushed the eng/cmake-mac-bmalloc branch from dfc4d99 to 33e626c Compare April 13, 2026 15:06

pascoej added the merge-queue Applied to send a pull request to merge-queue label Apr 13, 2026

webkit-commit-queue force-pushed the eng/cmake-mac-bmalloc branch from 33e626c to be740b1 Compare April 13, 2026 17:20

webkit-commit-queue merged commit be740b1 into WebKit:main Apr 13, 2026

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Apr 13, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CMake] Fix Mac CMake build for bmalloc#62544

[CMake] Fix Mac CMake build for bmalloc#62544
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
pascoej:eng/cmake-mac-bmalloc

pascoej commented Apr 11, 2026 •

edited by webkit-early-warning-system

Loading

Uh oh!

webkit-early-warning-system commented Apr 11, 2026 •

edited

Loading

Uh oh!

webkit-early-warning-system commented Apr 11, 2026 •

edited

Loading

Uh oh!

aperezdc Apr 11, 2026

Uh oh!

burg Apr 13, 2026

Uh oh!

pascoej Apr 13, 2026

Uh oh!

webkit-early-warning-system commented Apr 12, 2026 •

edited

Loading

Uh oh!

webkit-early-warning-system commented Apr 12, 2026 •

edited

Loading

Uh oh!

burg left a comment

Uh oh!

burg Apr 13, 2026

Uh oh!

burg Apr 13, 2026

Uh oh!

webkit-early-warning-system commented Apr 13, 2026 •

edited

Loading

Uh oh!

webkit-commit-queue commented Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

		find_library(FOUNDATION_LIBRARY Foundation)
		list(APPEND bmalloc_LIBRARIES ${FOUNDATION_LIBRARY})

Conversation

pascoej commented Apr 11, 2026 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

be740b1

Uh oh!

webkit-early-warning-system commented Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aperezdc Apr 11, 2026

Choose a reason for hiding this comment

Uh oh!

burg Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

pascoej Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Apr 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

burg left a comment

Choose a reason for hiding this comment

Uh oh!

burg Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

burg Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-commit-queue commented Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

pascoej commented Apr 11, 2026 •

edited by webkit-early-warning-system

Loading

`be740b1`

webkit-early-warning-system commented Apr 11, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 11, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 12, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 12, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 13, 2026 •

edited

Loading