Skip to content

Conversation

dpino
Copy link
Contributor

@dpino dpino commented Sep 19, 2025

f74166b

Fix build on 32-bit

Reviewed by Yusuke Suzuki and Justin Michaud.

I attempted to build WebKitGTK on Debian 12 32-bit using only system
libraries ('--no-experimetal-features').  Exactly the same build
procedure as the WebKitGTK Debian 12 64-bit bot, but on 32-bit.

I got a couple of build errors, which this commit fixes.

* Source/JavaScriptCore/CMakeLists.txt:
* Source/WebCore/dom/EventTarget.h:

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

22ab395

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2 ✅ 🛠 playstation
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🛠 mac-safer-cpp ✅ 🛠 jsc-armv7
✅ 🛠 tv-sim ❌ 🧪 jsc-armv7-tests
✅ 🛠 watch
✅ 🛠 watch-sim

@dpino dpino requested review from rniwa, cdumez and a team as code owners September 19, 2025 15:54
@dpino dpino self-assigned this Sep 19, 2025
@dpino dpino requested a review from justinmichaud September 19, 2025 15:54
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 19, 2025
#if !USE(SYSTEM_MALLOC)
#include <bmalloc/TZoneHeap.h>
#include <bmalloc/bmalloc.h>
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not look right. Do we need to include bmalloc headers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, 'bmalloc.h' was not adtually needed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this means that we should include wtf/TZoneMalloc instead

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why isn't it wtf/TZoneMalloc.h? Also, SYSTEM_MALLOC guard is not necessary

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Header wtf/TZoneMalloc.h is already included in the file. It doesn't seem header <bmalloc/TZoneHeap.h> is necessary as it's already included via wtf/TZoneMalloc.h, so I removed it.

Copy link
Contributor Author

@dpino dpino Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, the inclusion of header bmalloc/TZoneHeap.h was causing a build error in WebKitGTK 32-bit (Debian 12):

/home/buildbot/worker/webkit/WebKitBuild/GTK/Release/WebCore/PrivateHeaders/WebCore/EventTarget.h:50:10: fatal error: bmalloc/TZoneHeap.h: No such file or directory
   50 | #include <bmalloc/TZoneHeap.h>
	  |          ^~~~~~~~~~~~~~~~~~~~~

To fix this build error I followed the same pattern as other files that also include <bmalloc/TZoneHeap.h>, such as https://github.com/WebKit/WebKit/blob/main/Source/WebKit/Platform/IPC/Connection.h#L87 and https://github.com/WebKit/WebKit/blob/main/Source/WebKit/Platform/IPC/Decoder.h#L48.

Copy link
Member

@Constellation Constellation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include wtf headers

@dpino dpino removed the merging-blocked Applied to prevent a change from being merged label Sep 21, 2025
@dpino dpino changed the title [GTK] Fix build on 32-bit Fix build on 32-bit Sep 21, 2025
@dpino
Copy link
Contributor Author

dpino commented Sep 21, 2025

Please include wtf headers

Sorry, I don't understand this comment. The changes applied are enough to make WebKitGTK build on Debian 12 32-bit.

@dpino dpino requested a review from Constellation September 21, 2025 11:23
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 21, 2025
Copy link
Member

@Constellation Constellation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See Justin's comment. Including bmalloc header is not correct

@dpino dpino removed the merging-blocked Applied to prevent a change from being merged label Sep 21, 2025
Copy link
Member

@Constellation Constellation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove NO TEST comment in the commit log.

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Sep 21, 2025
@dpino dpino removed the merging-blocked Applied to prevent a change from being merged label Sep 21, 2025
@dpino dpino requested a review from Constellation September 21, 2025 19:41
@dpino dpino added the WebKitGTK Bugs related to the Gtk API layer. label Sep 21, 2025
@dpino dpino added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Sep 22, 2025
Reviewed by Yusuke Suzuki and Justin Michaud.

I attempted to build WebKitGTK on Debian 12 32-bit using only system
libraries ('--no-experimetal-features').  Exactly the same build
procedure as the WebKitGTK Debian 12 64-bit bot, but on 32-bit.

I got a couple of build errors, which this commit fixes.

* Source/JavaScriptCore/CMakeLists.txt:
* Source/WebCore/dom/EventTarget.h:

Canonical link: https://commits.webkit.org/300313@main
@webkit-commit-queue
Copy link
Collaborator

Committed 300313@main (f74166b): https://commits.webkit.org/300313@main

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

@webkit-commit-queue webkit-commit-queue merged commit f74166b into WebKit:main Sep 22, 2025
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Sep 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebKitGTK Bugs related to the Gtk API layer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants