diff options
| author | 2018-10-05 23:42:12 +0000 | |
|---|---|---|
| committer | 2018-10-08 13:18:35 -0700 | |
| commit | 1c7b1fcf0ff29d83d13d38d0451a54474ccf5964 (patch) | |
| tree | b978817acd252f10bd4648d3582ac9459fc9a0f4 /openjdkjvmti/art_jvmti.h | |
| parent | 59b950f53152c169464ba8c63d44102eeba1e594 (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/art_jvmti.h')
| -rw-r--r-- | openjdkjvmti/art_jvmti.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openjdkjvmti/art_jvmti.h b/openjdkjvmti/art_jvmti.h index 82f3866c65..1218e3b9a7 100644 --- a/openjdkjvmti/art_jvmti.h +++ b/openjdkjvmti/art_jvmti.h @@ -249,7 +249,7 @@ const jvmtiCapabilities kPotentialCapabilities = { .can_get_owned_monitor_info = 1, .can_get_current_contended_monitor = 1, .can_get_monitor_info = 1, - .can_pop_frame = 0, + .can_pop_frame = 1, .can_redefine_classes = 1, .can_signal_thread = 1, .can_get_source_file_name = 1, @@ -291,6 +291,7 @@ const jvmtiCapabilities kPotentialCapabilities = { // can_retransform_classes: // can_redefine_any_class: // can_redefine_classes: +// can_pop_frame: // We need to ensure that inlined code is either not present or can always be deoptimized. This // is not guaranteed for non-debuggable processes since we might have inlined bootclasspath code // on a threads stack. @@ -303,7 +304,7 @@ const jvmtiCapabilities kNonDebuggableUnsupportedCapabilities = { .can_get_owned_monitor_info = 0, .can_get_current_contended_monitor = 0, .can_get_monitor_info = 0, - .can_pop_frame = 0, + .can_pop_frame = 1, .can_redefine_classes = 1, .can_signal_thread = 0, .can_get_source_file_name = 0, |