Backport https://github.com/llvm/llvm-project/commit/281d71604f418eb952e967d9dc4b26241b7f96aa to 18.x

Backport https://github.com/llvm/llvm-project/commit/281d71604f418eb952e967d9dc4b26241b7f96aa to 18.x #36