summaryrefslogtreecommitdiff
path: root/openjdkjvmti/ti_stack.h
diff options
context:
space:
mode:
author Alex Light <allight@google.com> 2018-10-05 23:42:12 +0000
committer Alex Light <allight@google.com> 2018-10-08 13:18:35 -0700
commit1c7b1fcf0ff29d83d13d38d0451a54474ccf5964 (patch)
treeb978817acd252f10bd4648d3582ac9459fc9a0f4 /openjdkjvmti/ti_stack.h
parent59b950f53152c169464ba8c63d44102eeba1e594 (diff)
Revert^2 "JVMTI PopFrame support"
This reverts commit f67d0cbf2743b29aa6e1be7ae2f71762b8762785. Redefine-stress causes classes to be loaded at slightly different places due to the deep verification needed to redefine a class. This would cause the parts of tests 1953 and 1954 to fail due to classes loading at unexpected times. We changed the test to skip these test-cases when they cannot be correctly executed. Reason for revert: Fixed issue causing tests to fail under redefine-stress Test: ./test.py --host Test: ./art/tools/run-libjdwp-tests.sh --mode=host Test: ./test/testrunner/testrunner.py --host --redefine-stress Bug: 73255278 Bug: 111357976 Change-Id: I46fb4aed878bcc9398f2b73ad5040d7c97aec3ef
Diffstat (limited to 'openjdkjvmti/ti_stack.h')
-rw-r--r--openjdkjvmti/ti_stack.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/openjdkjvmti/ti_stack.h b/openjdkjvmti/ti_stack.h
index b41fa4bf5a..55c4269086 100644
--- a/openjdkjvmti/ti_stack.h
+++ b/openjdkjvmti/ti_stack.h
@@ -81,6 +81,8 @@ class StackUtil {
jobject** owned_monitors_ptr);
static jvmtiError NotifyFramePop(jvmtiEnv* env, jthread thread, jint depth);
+
+ static jvmtiError PopFrame(jvmtiEnv* env, jthread thread);
};
struct FindFrameAtDepthVisitor : art::StackVisitor {
@@ -110,6 +112,9 @@ struct FindFrameAtDepthVisitor : art::StackVisitor {
}
}
+ art::ShadowFrame* GetOrCreateShadowFrame(/*out*/bool* created_frame)
+ REQUIRES_SHARED(art::Locks::mutator_lock_);
+
private:
bool found_frame_;
size_t cnt_;