phoebewang wrote: /cherry-pick https://github.com/llvm/llvm-project/commit/0d334d83a4c7ce16fa1bc0e5e56bbdeaf01c2b2d https://github.com/llvm/llvm-project/commit/70529b24a30943d46e361d2990268499921e28a2 https://github.com/llvm/llvm-project/pull/109579