hanhanW wrote: The first commit is cherry-picked from https://github.com/llvm/llvm-project/pull/89488 and the second commit addresses the issues from https://github.com/llvm/llvm-project/pull/89488#discussion_r1586703345 https://github.com/llvm/llvm-project/pull/94045