https://github.com/jmorse approved this pull request. This LGTM, with Orlando away for a bit I'll put up a CI PR that fixes the merge conflict and build issue. https://github.com/llvm/llvm-project/pull/144102