am 3d2d7fb7: Merge "Fix a bug in the register allocator."

* commit '3d2d7fb7ad24f4aec681ddc68a9565fa837b97ef':
  Fix a bug in the register allocator.