am 24ce79eb: Merge "Update locations of registers after slow paths spilling."

* commit '24ce79ebb11b7ea2947a35d447e0df1ab39b24bf':
  Update locations of registers after slow paths spilling.