Merge "Update locations of registers after slow paths spilling."