https://github.com/andykaylor approved this pull request. This looks good with one minor note. Sorry about the ongoing conflicts requiring rebase. Feel free to merge after rebasing. https://github.com/llvm/llvm-project/pull/143377