am c26b4512: Merge "Revert "Revert "Fix deoptimization with pending exception"""

* commit 'c26b4512a01d46756683a4f5e186a0b7f397f251':
  Revert "Revert "Fix deoptimization with pending exception""