ymand wrote: Just a note: I've siginfiicantly simplified the code that you're modifying in this PR (https://github.com/llvm/llvm-project/pull/84499), so expect some merge conflicts next time you pull from main. https://github.com/llvm/llvm-project/pull/80989