paulwalker-arm wrote: A quick look at https://github.com/llvm/llvm-project/pull/81141 suggests at worst you'd just move from the `std::optional<unsigned>` this patch would introduce to `std::optional<std::pair<unsigned,MachineInstr*>>`. https://github.com/llvm/llvm-project/pull/87802