As discussed in https://github.com/llvm/llvm-project/pull/81427/files#r1509266817 rename the variable as a separate commit
std::atomic::wait
std::allocator::is_always_equal