diff options
| author | 2018-10-05 23:39:54 +0000 | |
|---|---|---|
| committer | 2018-10-05 23:40:30 +0000 | |
| commit | f67d0cbf2743b29aa6e1be7ae2f71762b8762785 (patch) | |
| tree | b0b1b8a1908541791bfeb18c1117482d559ded38 /runtime/common_dex_operations.h | |
| parent | 88a2a9d7a14b67e10525d93b0ee57d9dd6bc345a (diff) | |
Revert "JVMTI PopFrame support"
This reverts commit 88a2a9d7a14b67e10525d93b0ee57d9dd6bc345a.
Reason for revert: Fails class-load/prepare tests with jit-at-first-use.
Bug: 73255278
Bug: 111357976
Test: None
Change-Id: Id8dea6dcf124d56e3a8dfa19e6ed39cc70370c34
Diffstat (limited to 'runtime/common_dex_operations.h')
| -rw-r--r-- | runtime/common_dex_operations.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/runtime/common_dex_operations.h b/runtime/common_dex_operations.h index 15ab5f0387..c29043e7c6 100644 --- a/runtime/common_dex_operations.h +++ b/runtime/common_dex_operations.h @@ -27,7 +27,6 @@ #include "dex/primitive.h" #include "handle_scope-inl.h" #include "instrumentation.h" -#include "interpreter/interpreter.h" #include "interpreter/shadow_frame.h" #include "interpreter/unstarted_runtime.h" #include "jvalue-inl.h" @@ -173,14 +172,6 @@ ALWAYS_INLINE bool DoFieldPutCommon(Thread* self, if (UNLIKELY(self->IsExceptionPending())) { return false; } - if (shadow_frame.GetForcePopFrame()) { - // We need to check this here since we expect that the FieldWriteEvent happens before the - // actual field write. If one pops the stack we should not modify the field. The next - // instruction will force a pop. Return true. - DCHECK(Runtime::Current()->AreNonStandardExitsEnabled()); - DCHECK(interpreter::PrevFrameWillRetry(self, shadow_frame)); - return true; - } } switch (field_type) { |