erichkeane wrote: I thought about this more, I agree with Andy that this is hacky. I think I am going to explore doing this at the 'correct' time, during lowering and just put up with all the additional work it requires. https://github.com/llvm/llvm-project/pull/218008