diff options
| author | 2018-10-05 23:39:54 +0000 | |
|---|---|---|
| committer | 2018-10-05 23:40:30 +0000 | |
| commit | f67d0cbf2743b29aa6e1be7ae2f71762b8762785 (patch) | |
| tree | b0b1b8a1908541791bfeb18c1117482d559ded38 /runtime/interpreter/interpreter_common.cc | |
| 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/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) { |