https://github.com/hekota approved this pull request. LGTM! My change will probably take a bit longer to land, so feel free to revert the last commit with test changes and merge this one first. https://github.com/llvm/llvm-project/pull/195153