https://github.com/AaronBallman approved this pull request. LGTM aside from the test bit that needs to be updated; feel free to land when CI comes back green. Thank you! https://github.com/llvm/llvm-project/pull/203392