DavidSpickett wrote: I'm gonna merge this so I can do a patch on top of this where we both understand the starting point. I think I've got to the bottom of the issues my workarounds were addressing. https://github.com/llvm/llvm-project/pull/70742