Merge pull request #16014 from tajila/loom

Init jitTOC on ppc64
eclipse-openj9 · Oct 18, 2022 · b851034 · b851034
2 parents b14e1ed + c861b58
commit b851034
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/runtime/vm/ContinuationHelpers.cpp b/runtime/vm/ContinuationHelpers.cpp
@@ -97,7 +97,9 @@ enterContinuation(J9VMThread *currentThread, j9object_t continuationObject)
 
 	Assert_VM_Null(currentThread->currentContinuation);
 
-	VM_ContinuationHelpers::swapFieldsWithContinuation(currentThread, continuation);
+
+	VM_ContinuationHelpers::swapFieldsWithContinuation(currentThread, continuation, started);
+
 	continuation->carrierThread = currentThread;
 	currentThread->currentContinuation = continuation;
 

diff --git a/runtime/vm/ContinuationHelpers.hpp b/runtime/vm/ContinuationHelpers.hpp
@@ -49,7 +49,7 @@ class VM_ContinuationHelpers {
 public:
 
 	static VMINLINE void
-	swapFieldsWithContinuation(J9VMThread *vmThread, J9VMContinuation *continuation)
+	swapFieldsWithContinuation(J9VMThread *vmThread, J9VMContinuation *continuation, bool swapJ9VMthreadSavedRegisters = true)
 	{
 	/* Helper macro to swap fields between the two J9Class structs. */
 #define SWAP_MEMBER(fieldName, fieldType, class1, class2) \
@@ -73,10 +73,12 @@ class VM_ContinuationHelpers {
 		J9VMEntryLocalStorage *threadELS = vmThread->entryLocalStorage;
 		/* Swap the JIT GPR registers data referenced by ELS */
 		J9JITGPRSpillArea tempGPRs = continuation->jitGPRs;
-		continuation->jitGPRs = *(J9JITGPRSpillArea*)threadELS->jitGlobalStorageBase;
-		*(J9JITGPRSpillArea*)threadELS->jitGlobalStorageBase = tempGPRs;
 		J9I2JState tempI2J = continuation->i2jState;
+		continuation->jitGPRs = *(J9JITGPRSpillArea*)threadELS->jitGlobalStorageBase;
 		continuation->i2jState = threadELS->i2jState;
+		if (swapJ9VMthreadSavedRegisters) {
+			*(J9JITGPRSpillArea*)threadELS->jitGlobalStorageBase = tempGPRs;
+		}
 		threadELS->i2jState = tempI2J;
 		SWAP_MEMBER(oldEntryLocalStorage, J9VMEntryLocalStorage*, threadELS, continuation);
 	}

diff --git a/test/functional/Java19andUp/playlist.xml b/test/functional/Java19andUp/playlist.xml
@@ -38,7 +38,7 @@
 			-excludegroups $(DEFAULT_EXCLUDE); \
 			$(TEST_STATUS)
 		</command>
-		<platformRequirements>bits.64,^os.zos,^os.sunos,^arch.ppc</platformRequirements>
+		<platformRequirements>bits.64,^os.zos,^os.sunos</platformRequirements>
 		<levels>
 			<level>sanity</level>
 		</levels>