arsenm wrote: It also occurred to me that https://github.com/llvm/llvm-project/pull/170328 may also have fixed this (although at the possible price of an extra run of the pass) https://github.com/llvm/llvm-project/pull/168622