https://github.com/efriedma-quic approved this pull request. LGTM As a followup, if we really don't need the carveout for mutexes anymore, could you look at removing it? https://github.com/llvm/llvm-project/pull/94699