Merge pull request #19901 from fengxue-IS/v047-19842

babsingh · web-flow · commit b4f2424162a9 · 2024-07-22T18:24:15.000-04:00
(0.47) Update VThread alive check to check continuation state
diff --git a/runtime/jvmti/jvmtiHelpers.cpp b/runtime/jvmti/jvmtiHelpers.cpp
@@ -179,7 +179,14 @@ getVMThread(J9VMThread *currentThread, jthread thread, J9VMThread **vmThreadPtr,
 				targetThread = carrierVMThread;
 			}
 		}
-		isThreadAlive = (JVMTI_VTHREAD_STATE_NEW != vthreadState) && (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState);
+		j9object_t continuationObj = J9VMJAVALANGVIRTUALTHREAD_CONT(currentThread, threadObject);
+		ContinuationState continuationState = *VM_ContinuationHelpers::getContinuationStateAddress(currentThread, continuationObj);
+		if ((JVMTI_VTHREAD_STATE_NEW != vthreadState)
+		&& (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState)
+		&& !VM_ContinuationHelpers::isFinished(continuationState)
+		) {
+			isThreadAlive = TRUE;
+		}
 	} else
 #endif /* JAVA_SPEC_VERSION >= 19 */
 	{

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,14 @@ getVMThread(J9VMThread currentThread, jthread thread, J9VMThread *vmThreadPtr,`
`179`	`179`	`targetThread = carrierVMThread;`
`180`	`180`	`}`
`181`	`181`	`}`
`182`		`- isThreadAlive = (JVMTI_VTHREAD_STATE_NEW != vthreadState) && (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState);`
	`182`	`+ j9object_t continuationObj = J9VMJAVALANGVIRTUALTHREAD_CONT(currentThread, threadObject);`
	`183`	`+ ContinuationState continuationState = *VM_ContinuationHelpers::getContinuationStateAddress(currentThread, continuationObj);`
	`184`	`+ if ((JVMTI_VTHREAD_STATE_NEW != vthreadState)`
	`185`	`+ && (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState)`
	`186`	`+ && !VM_ContinuationHelpers::isFinished(continuationState)`
	`187`	`+ ) {`
	`188`	`+ isThreadAlive = TRUE;`
	`189`	`+ }`
`183`	`190`	`} else`
`184`	`191`	`#endif /* JAVA_SPEC_VERSION >= 19 */`
`185`	`192`	`{`