diff options
| author | 2018-10-05 23:41:16 +0000 | |
|---|---|---|
| committer | 2018-10-05 23:41:16 +0000 | |
| commit | 068a9bec8d637ce907f6c2829b772a99cae60611 (patch) | |
| tree | f099925c0269895935c9eea9a0caca8e8f801dce /runtime/interpreter/interpreter_common.cc | |
| parent | bc550bbbf2fcd82b5b888683a4e3708a26d0efe6 (diff) | |
| parent | f67d0cbf2743b29aa6e1be7ae2f71762b8762785 (diff) | |
Merge "Revert "JVMTI PopFrame support""
Diffstat (limited to 'runtime/interpreter/interpreter_common.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index dc3cc4585f..92d4731480 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -371,12 +371,6 @@ bool DoIPutQuick(const ShadowFrame& shadow_frame, const Instruction* inst, uint1 if (UNLIKELY(self->IsExceptionPending())) { return false; } - if (UNLIKELY(shadow_frame.GetForcePopFrame())) { - // Don't actually set the field. The next instruction will force us to pop. - DCHECK(Runtime::Current()->AreNonStandardExitsEnabled()); - DCHECK(PrevFrameWillRetry(self, shadow_frame)); - return true; - } } // Note: iput-x-quick instructions are only for non-volatile fields. switch (field_type) { |