https://github.com/tex3d approved this pull request. I had a comment/question, but even if that's an issue, it's probably an issue for a separate follow-up. So, I approve the current fix. https://github.com/llvm/llvm-project/pull/163832