Skip to content

Commit 5e26e64

Browse files
author
Daniel D. Daugherty
committed
8307067: remove broken EnableThreadSMRExtraValidityChecks option
Reviewed-by: coleenp, dholmes, sspitsyn, rehn
1 parent e54051a commit 5e26e64

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

src/hotspot/share/prims/jvmtiExport.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -829,8 +829,6 @@ JvmtiExport::cv_external_thread_to_JavaThread(ThreadsList * t_list,
829829
}
830830
// Looks like a live JavaThread at this point.
831831

832-
// We do not check the EnableThreadSMRExtraValidityChecks option
833-
// for this includes() call because JVM/TI's spec is tighter.
834832
if (!t_list->includes(java_thread)) {
835833
// Not on the JavaThreads list so it is not alive.
836834
return JVMTI_ERROR_THREAD_NOT_ALIVE;
@@ -872,8 +870,6 @@ JvmtiExport::cv_oop_to_JavaThread(ThreadsList * t_list, oop thread_oop,
872870
}
873871
// Looks like a live JavaThread at this point.
874872

875-
// We do not check the EnableThreadSMRExtraValidityChecks option
876-
// for this includes() call because JVM/TI's spec is tighter.
877873
if (!t_list->includes(java_thread)) {
878874
// Not on the JavaThreads list so it is not alive.
879875
return JVMTI_ERROR_THREAD_NOT_ALIVE;

src/hotspot/share/runtime/globals.hpp

-3
Original file line numberDiff line numberDiff line change
@@ -953,9 +953,6 @@ const int ObjectAlignmentInBytes = 8;
953953
"null (+offset) will not raise a SIGSEGV, i.e.," \
954954
"ImplicitNullChecks don't work (PPC64).") \
955955
\
956-
product(bool, EnableThreadSMRExtraValidityChecks, true, DIAGNOSTIC, \
957-
"Enable Thread SMR extra validity checks") \
958-
\
959956
product(bool, EnableThreadSMRStatistics, trueInDebug, DIAGNOSTIC, \
960957
"Enable Thread SMR Statistics") \
961958
\

src/hotspot/share/runtime/threadSMR.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,10 @@ bool ThreadsListHandle::cv_internal_thread_to_JavaThread(jobject jthread,
824824
// Looks like a live JavaThread at this point.
825825

826826
if (java_thread != JavaThread::current()) {
827-
// jthread is not for the current JavaThread so have to verify
828-
// the JavaThread * against the ThreadsList.
829-
if (EnableThreadSMRExtraValidityChecks && !includes(java_thread)) {
830-
// Not on the JavaThreads list so it is not alive.
827+
// java_thread is not the current JavaThread so we have to verify it
828+
// against the ThreadsList.
829+
if (!includes(java_thread)) {
830+
// Not on this ThreadsList so it is not protected.
831831
return false;
832832
}
833833
}

0 commit comments

Comments
 (0)