ojhunt wrote: This PR is a draft as it will need to be updated to merged correctly, and verify test output (conflicts, unintentional mismatches coming from splitting out the PR) after #136828 https://github.com/llvm/llvm-project/pull/136828