Merge "Revert "Revert "Fix deoptimization with pending exception"""