Mercurial > hg > graal-jvmci-8
diff src/share/vm/prims/jvmtiEnvBase.hpp @ 14321:e4062d6c5f22
8032223: nsk/regression/b4663146 gets assert(SafepointSynchronize::is_at_safepoint() || JvmtiEnv::is_thread_fully_suspended(get_thread(), false, &debug_bits))
Summary: It is better to calculate frame count for suspended threads at a safepoint
Reviewed-by: twisti, dsamersoff, sla, dholmes, dcubed
Contributed-by: serguei.spitsyn@oracle.com
| author | sspitsyn |
|---|---|
| date | Tue, 04 Feb 2014 19:41:46 -0800 |
| parents | de6a9e811145 |
| children | 402677ca28ed |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.hpp Mon Feb 03 15:24:20 2014 +0100 +++ b/src/share/vm/prims/jvmtiEnvBase.hpp Tue Feb 04 19:41:46 2014 -0800 @@ -533,7 +533,11 @@ VMOp_Type type() const { return VMOp_GetFrameCount; } jvmtiError result() { return _result; } void doit() { - _result = ((JvmtiEnvBase*)_env)->get_frame_count(_state, _count_ptr); + _result = JVMTI_ERROR_THREAD_NOT_ALIVE; + JavaThread* jt = _state->get_thread(); + if (Threads::includes(jt) && !jt->is_exiting() && jt->threadObj() != NULL) { + _result = ((JvmtiEnvBase*)_env)->get_frame_count(_state, _count_ptr); + } } }; @@ -559,8 +563,12 @@ VMOp_Type type() const { return VMOp_GetFrameLocation; } jvmtiError result() { return _result; } void doit() { - _result = ((JvmtiEnvBase*)_env)->get_frame_location(_java_thread, _depth, - _method_ptr, _location_ptr); + _result = JVMTI_ERROR_THREAD_NOT_ALIVE; + if (Threads::includes(_java_thread) && !_java_thread->is_exiting() && + _java_thread->threadObj() != NULL) { + _result = ((JvmtiEnvBase*)_env)->get_frame_location(_java_thread, _depth, + _method_ptr, _location_ptr); + } } };