From cc1248379935db2ee8729e44315aa628bce856cb Mon Sep 17 00:00:00 2001 From: Jacob Bramley Date: Fri, 12 Jan 2024 12:38:42 +0000 Subject: [PATCH] fixup! CapableVMs: Disable revocation to unblock CI. --- Source/WTF/wtf/ContinuousArenaMalloc.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/WTF/wtf/ContinuousArenaMalloc.cpp b/Source/WTF/wtf/ContinuousArenaMalloc.cpp index 12de55fd18a..98b02088420 100644 --- a/Source/WTF/wtf/ContinuousArenaMalloc.cpp +++ b/Source/WTF/wtf/ContinuousArenaMalloc.cpp @@ -50,6 +50,12 @@ void ContinuousArenaMalloc::initialize(void) { s_Mutex = new Mutex(); +#if __has_feature(capabilities) + // CheriBSD revocation does not support MALLOCX_ARENA. + // See: https://man.cheribsd.org/cgi-bin/man.cgi/mrs + ASSERT(!malloc_is_revoking()); +#endif + void *area_start = mmap(NULL, k_AreaSize, PROT_NONE | PROT_MAX(PROT_READ | PROT_WRITE), MAP_GUARD | MAP_ALIGNED(k_LgAreaSize),