summaryrefslogtreecommitdiff
path: root/runtime/common_dex_operations.h
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/common_dex_operations.h')
-rw-r--r--runtime/common_dex_operations.h9
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) {