https://github.com/AaronBallman approved this pull request. Thank you! LGTM modulo tiny nits. FWIW, the precommit CI failure looks unrelated to your changes, I wouldn't worry about it (the issue hopefully goes away if you rebase). https://github.com/llvm/llvm-project/pull/105983