https://github.com/RKSimon requested changes to this pull request. Sorry this fell off my radar - please can you merge/rebase against trunk latest to fix the merge conflicts and I'll take another look https://github.com/llvm/llvm-project/pull/183067