am 9dc601eb: Merge "Revert "Fix deoptimization with pending exception""

* commit '9dc601eb65da0cd5f53172699dacd6e5dd38ab44':
  Revert "Fix deoptimization with pending exception"