tblah wrote: Thanks for taking a look > Can you check whether the following renaming works correctly? Yes that works. I added a test for this. The test doesn't need the other changes in this PR to pass https://github.com/llvm/llvm-project/pull/85114