AMP999 wrote: @mordante Thank you! I've resolved merge conflicts. I've also added an NFC commit to remove empty messages from `static_assert`s for consistency with the rest of the file. https://github.com/llvm/llvm-project/pull/77092