commit 6e2d5747d00697a25251d25dd33b953e54709507
author Sebastien Hertz <shertz@google.com> Tue Aug 25 15:05:17 2015 +0000
committer Sebastien Hertz <shertz@google.com> Tue Aug 25 15:05:17 2015 +0000
tree b68a418e93780ed55abd79dc8e76f3459e884254
parent 54b62480636ae846d705fc180c7bd6cd08ec1e42

Revert "Fix deoptimization with pending exception"

This reverts commit 54b62480636ae846d705fc180c7bd6cd08ec1e42.

This is causing test failures with Optimizing compiler.

Bug: 23371176
Bug: 19944235
Change-Id: Ie3ffbcf2b6d2ca8bc93cb008a4e29a7567d04a7c

runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
index 0f77647..a4feac1 100644
--- a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
@@ -36,7 +36,7 @@
     self->Dump(LOG(INFO));
   }
 
-  self->AssertHasDeoptimizationContext();
+  self->PushAndClearDeoptimizationReturnValue();
   self->SetException(Thread::GetDeoptimizationException());
   self->QuickDeliverException();
 }