https://github.com/AaronBallman approved this pull request. These changes seem reasonable to me, and likely worth backporting (CC @tbaederr for a second set of eyes just to be sure) https://github.com/llvm/llvm-project/pull/112708