diff options
author | 2018-03-14 14:44:29 -0700 | |
---|---|---|
committer | 2018-10-04 11:04:49 -0700 | |
commit | 88a2a9d7a14b67e10525d93b0ee57d9dd6bc345a (patch) | |
tree | a19af813a97be817a76072534139a77b16f3ad87 /openjdkjvmti/OpenjdkJvmTi.cc | |
parent | fc7d33fc052d993eaa205337e6a805022d2cd822 (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 'openjdkjvmti/OpenjdkJvmTi.cc')
-rw-r--r-- | openjdkjvmti/OpenjdkJvmTi.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openjdkjvmti/OpenjdkJvmTi.cc b/openjdkjvmti/OpenjdkJvmTi.cc index 3213bbe91a..48f326a54d 100644 --- a/openjdkjvmti/OpenjdkJvmTi.cc +++ b/openjdkjvmti/OpenjdkJvmTi.cc @@ -313,10 +313,10 @@ class JvmtiFunctions { return StackUtil::GetFrameCount(env, thread, count_ptr); } - static jvmtiError PopFrame(jvmtiEnv* env, jthread thread ATTRIBUTE_UNUSED) { + static jvmtiError PopFrame(jvmtiEnv* env, jthread thread) { ENSURE_VALID_ENV(env); ENSURE_HAS_CAP(env, can_pop_frame); - return ERR(NOT_IMPLEMENTED); + return StackUtil::PopFrame(env, thread); } static jvmtiError GetFrameLocation(jvmtiEnv* env, |