Revert^4 "Allow deoptimization when returning from a runtime method."
This reverts commit 07c7028e518b98d3267a77dfe0d149db1adbe858.
Need some special treatment of string init's shorty.
Test: run-test/gtest on both host and target
Test: 597-deopt-busy-loop, 597-deopt-invoke-stub
Bug: 33616143
Change-Id: Id4c64910acfdd088835b6db6fc503e6ade0218e7
diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h
index 65cfade..df8568e 100644
--- a/runtime/interpreter/interpreter.h
+++ b/runtime/interpreter/interpreter.h
@@ -30,6 +30,7 @@
union JValue;
class ShadowFrame;
class Thread;
+enum class DeoptimizationMethodType;
namespace interpreter {
@@ -44,8 +45,11 @@
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, bool from_code,
- JValue* ret_val)
+extern void EnterInterpreterFromDeoptimize(Thread* self,
+ ShadowFrame* shadow_frame,
+ JValue* ret_val,
+ bool from_code,
+ DeoptimizationMethodType method_type)
REQUIRES_SHARED(Locks::mutator_lock_);
extern JValue EnterInterpreterFromEntryPoint(Thread* self, const DexFile::CodeItem* code_item,