fix JvmtiEnv::SuspendThreadList to set result for current thread

sspitsyn · sspitsyn · commit e9d1b3e02902 · 2021-05-08T12:06:01.000Z
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1008,7 +1008,6 @@ JvmtiEnv::SuspendThread(jthread thread) {
 // results - pre-checked for NULL
 jvmtiError
 JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvmtiError* results) {
-  int self_index = -1;
   oop thread_oop = NULL;
   JavaThread *java_thread = NULL;
   JavaThread* current = JavaThread::current();
@@ -1027,9 +1026,9 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm
         }
       }
       if (java_thread == current) {
-        self_index = i;
         // current thread will be suspended in the ~VTMTDisabler
         vtmt_disabler.set_self_suspend();
+        results[i] = JVMTI_ERROR_NONE;
         continue;
       }
       results[i] = suspend_thread(thread_oop,

Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,6 @@ JvmtiEnv::SuspendThread(jthread thread) {`
`1008`	`1008`	`// results - pre-checked for NULL`
`1009`	`1009`	`jvmtiError`
`1010`	`1010`	`JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvmtiError* results) {`
`1011`		`- int self_index = -1;`
`1012`	`1011`	`oop thread_oop = NULL;`
`1013`	`1012`	`JavaThread *java_thread = NULL;`
`1014`	`1013`	`JavaThread* current = JavaThread::current();`
`@@ -1027,9 +1026,9 @@ JvmtiEnv::SuspendThreadList(jint request_count, const jthread* request_list, jvm`
`1027`	`1026`	`}`
`1028`	`1027`	`}`
`1029`	`1028`	`if (java_thread == current) {`
`1030`		`- self_index = i;`
`1031`	`1029`	`// current thread will be suspended in the ~VTMTDisabler`
`1032`	`1030`	`vtmt_disabler.set_self_suspend();`
	`1031`	`+ results[i] = JVMTI_ERROR_NONE;`
`1033`	`1032`	`continue;`
`1034`	`1033`	`}`
`1035`	`1034`	`results[i] = suspend_thread(thread_oop,`