From 2b87ae0073256e909e15f464300912552e58ee48 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 23 Aug 2017 10:16:26 +0000 Subject: Revert "Allow deoptimization when returning from a runtime method." Reason for revert: Some tests failing even after a minor fix. This reverts commit edeba10d523c3e283ab939a16c7203af32c7707e. Change-Id: I6407c9b489c016d19a12c28d1da0efa55ad554a7 --- runtime/interpreter/interpreter.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'runtime/interpreter/interpreter.h') diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h index df8568edcd..65cfade09a 100644 --- a/runtime/interpreter/interpreter.h +++ b/runtime/interpreter/interpreter.h @@ -30,7 +30,6 @@ class ArtMethod; union JValue; class ShadowFrame; class Thread; -enum class DeoptimizationMethodType; namespace interpreter { @@ -45,11 +44,8 @@ extern void EnterInterpreterFromInvoke(Thread* self, ArtMethod* method, REQUIRES_SHARED(Locks::mutator_lock_); // 'from_code' denotes whether the deoptimization was explicitly triggered by compiled code. -extern void EnterInterpreterFromDeoptimize(Thread* self, - ShadowFrame* shadow_frame, - JValue* ret_val, - bool from_code, - DeoptimizationMethodType method_type) +extern void EnterInterpreterFromDeoptimize(Thread* self, ShadowFrame* shadow_frame, bool from_code, + JValue* ret_val) REQUIRES_SHARED(Locks::mutator_lock_); extern JValue EnterInterpreterFromEntryPoint(Thread* self, const DexFile::CodeItem* code_item, -- cgit v1.2.3-59-g8ed1b