diff options
| author | 2018-10-10 07:47:58 +0000 | |
|---|---|---|
| committer | 2018-10-10 07:47:58 +0000 | |
| commit | 202b617acf477e8e8e11915f467120a0bd518e74 (patch) | |
| tree | 4d1124b540984f970acaf494f4fd85cc347fbd57 /runtime/common_dex_operations.h | |
| parent | 1c7b1fcf0ff29d83d13d38d0451a54474ccf5964 (diff) | |
Revert "Revert^2 "JVMTI PopFrame support""
This reverts commit 1c7b1fcf0ff29d83d13d38d0451a54474ccf5964.
Bug: 73255278
Bug: 111357976
bug: 117533193
Reason for revert: Test failures
Change-Id: I9da863fd95264007c4efeb85539e704e83499dcf
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) { |