Merge changes I6407c9b4,I49d9da67

* changes:
  Revert "Allow deoptimization when returning from a runtime method."
  Revert "Fix some issues for deoptimizing runtime methods."

1 files changed, 2 insertions, 13 deletions

diff --git a/runtime/thread.h b/runtime/thread.h
index ad4506e309..7540fd2563 100644
--- a/runtime/thread.h
+++ b/runtime/thread.h
@@ -117,13 +117,6 @@ enum class StackedShadowFrameType {
   kDeoptimizationShadowFrame,
 };
 
-// The type of method that triggers deoptimization. It contains info on whether
-// the deoptimized method should advance dex_pc.
-enum class DeoptimizationMethodType {
-  kKeepDexPc,  // dex pc is required to be kept upon deoptimization.
-  kDefault     // dex pc may or may not advance depending on other conditions.
-};
-
 // This should match RosAlloc::kNumThreadLocalSizeBrackets.
 static constexpr size_t kNumRosAllocThreadLocalSizeBracketsInThread = 16;
 
@@ -967,18 +960,14 @@ class Thread {
   // values on stacks.
   // 'from_code' denotes whether the deoptimization was explicitly made from
   // compiled code.
-  // 'method_type' contains info on whether deoptimization should advance
-  // dex_pc.
   void PushDeoptimizationContext(const JValue& return_value,
                                  bool is_reference,
-                                 ObjPtr<mirror::Throwable> exception,
                                  bool from_code,
-                                 DeoptimizationMethodType method_type)
+                                 ObjPtr<mirror::Throwable> exception)
       REQUIRES_SHARED(Locks::mutator_lock_);
   void PopDeoptimizationContext(JValue* result,
                                 ObjPtr<mirror::Throwable>* exception,
-                                bool* from_code,
-                                DeoptimizationMethodType* method_type)
+                                bool* from_code)
       REQUIRES_SHARED(Locks::mutator_lock_);
   void AssertHasDeoptimizationContext()
       REQUIRES_SHARED(Locks::mutator_lock_);