Sisyph wrote: Sorry, the file changes on this PR is not clear. This PR contains https://github.com/llvm/llvm-project/pull/137425 plus the fix on top of it. https://github.com/llvm/llvm-project/pull/138141