Merge pull request #15642 from fengxue-IS/carrier_access

Call setContinuation before/after entry
eclipse-openj9 · Aug 10, 2022 · 0cca472 · 0cca472
2 parents 2eedf1b + 3e54a78
commit 0cca472
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java
@@ -39,6 +39,8 @@ public class Continuation {
 	private boolean started;
 	private volatile boolean finished;
 
+	private static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
+
 	/**
 	 * Continuation's Pinned reasons
 	 */
@@ -155,7 +157,7 @@ public final void run() {
 		if (finished) {
 			throw new IllegalStateException("Continuation has already finished.");
 		}
-/*
+
 		Thread carrier = JLA.currentCarrierThread();
 		Continuation currentContinuation = JLA.getContinuation(carrier);
 
@@ -166,7 +168,7 @@ public final void run() {
 		}
 
 		JLA.setContinuation(carrier, this);
-*/
+
 		boolean result = true;
 		try {
 			result = enterImpl();
@@ -176,10 +178,8 @@ public final void run() {
 			} else {
 				/* Continuation yielded */
 			}
+			JLA.setContinuation(carrier, parent);
 		}
-/*
-		JLA.setContinuation(carrier, parent);
-*/
 	}
 
 	/**

diff --git a/runtime/jcl/common/jclcinit.c b/runtime/jcl/common/jclcinit.c
@@ -595,7 +595,6 @@ initializeRequiredClasses(J9VMThread *vmThread, char* dllName)
 #endif /* JAVA_SPEC_VERSION >= 18 */
 #if JAVA_SPEC_VERSION >= 19
 			J9VMCONSTANTPOOL_JAVALANGTHREADFIELDHOLDER,
-			J9VMCONSTANTPOOL_JDKINTERNALVMCONTINUATION,
 #endif /* JAVA_SPEC_VERSION >= 19 */
 	};