Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 6acf180f923eab9c0aef3d85430ad3e1a52afc62
https://github.com/WebKit/WebKit/commit/6acf180f923eab9c0aef3d85430ad3e1a52afc62
Author: Simon Lewis <[email protected]>
Date: 2026-05-19 (Tue, 19 May 2026)
Changed paths:
M CMakePresets.json
M Source/cmake/OptionsMac.cmake
Log Message:
-----------
[CMake][Mac] mac-tsan: set USE_SYSTEM_MALLOC=ON and guard TSan bindir against
uninstrumented reconfigure
https://bugs.webkit.org/show_bug.cgi?id=315050
rdar://177376705
Reviewed by Geoffrey Garen.
Two fixes for the mac-tsan preset:
1. Set USE_SYSTEM_MALLOC=ON. e05f64d91da made bmalloc force
BUSE_SYSTEM_MALLOC=1 under __has_feature(thread_sanitizer)
(BPlatform.h:388), so BUSE_TZONE=0. But WTF's PlatformUse.h:246 has
no matching TSan branch, so USE_TZONE_MALLOC stays 1, and
TZoneMalloc.h:81 #errors "TZones enabled in WTF, but not enabled in
bmalloc". Setting USE_SYSTEM_MALLOC at the preset level keeps WTF
and bmalloc in agreement.
2. Extend the OptionsMac.cmake bindir-name guard to TSan. When a
ninja-triggered RERUN_CMAKE wipes CMakeCache.txt ("You have changed
variables that require your cache to be deleted"), the reconfigure
runs without --preset and silently produces an uninstrumented
build. The ASan tree already FATAL_ERRORs on this; do the same for
TSan.
* CMakePresets.json:
* Source/cmake/OptionsMac.cmake:
Canonical link: https://commits.webkit.org/313486@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
