summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter.h
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2018-03-14 14:44:29 -0700
committer Alex Light <allight@google.com> 2018-10-04 11:04:49 -0700
commit88a2a9d7a14b67e10525d93b0ee57d9dd6bc345a (patch)
treea19af813a97be817a76072534139a77b16f3ad87 /runtime/interpreter/interpreter.h
parentfc7d33fc052d993eaa205337e6a805022d2cd822 (diff)
JVMTI PopFrame support
Implement support for the JVMTI can_pop_frames capability. This works by marking shadow-frames with a bit that forces it to be popped or an instruction to be retried. When a PopFrame is requested the plugin will deoptimize the targeted thread and force the interpreter to deal with the frame pop. If the can_pop_frames capability is enabled the runtime will be forced to handle all exceptions through the interpreter. This is required to support PopFrame during some exception events. Test: ./test.py --host Test: ./art/tools/run-libjdwp-tests.sh --mode=host Bug: 73255278 Bug: 111357976 Change-Id: I62d6b1f4ff387c794ba45093c3d6773aaf642067
Diffstat (limited to 'runtime/interpreter/interpreter.h')
-rw-r--r--runtime/interpreter/interpreter.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h
index 0d43b9090a..d7e69a6755 100644
--- a/runtime/interpreter/interpreter.h
+++ b/runtime/interpreter/interpreter.h
@@ -69,6 +69,12 @@ void CheckInterpreterAsmConstants();
void InitInterpreterTls(Thread* self);
+// Returns true if the previous frame has the ForceRetryInstruction bit set. This is required for
+// ForPopFrame to work correctly since that will cause the java function return with null/0 which
+// might not be expected by the code being run.
+bool PrevFrameWillRetry(Thread* self, const ShadowFrame& frame)
+ REQUIRES_SHARED(Locks::mutator_lock_);
+
} // namespace interpreter
} // namespace art