Merge pull request #18059 from cjjdespres/store-if-delay

Store JITServer AOT methods if they are delayed
eclipse-openj9 · Sep 1, 2023 · 2b34667 · 2b34667
2 parents 022a2a4 + ae32250
commit 2b34667
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/runtime/compiler/control/JITClientCompilationThread.cpp b/runtime/compiler/control/JITClientCompilationThread.cpp
@@ -2969,7 +2969,12 @@ remoteCompilationEnd(J9VMThread *vmThread, TR::Compilation *comp, TR_ResolvedMet
          }
 #endif /* J9VM_INTERP_AOT_RUNTIME_SUPPORT */
 
-      if (!compInfo->getPersistentInfo()->getJITServerUseAOTCache() || shouldStoreRemoteAOTMethods)
+      // If we're not using the AOT cache, we still store by default. This avoids certain test failures in the short term.
+      // Also, if we've explicitly been requested by the user to delay method relocations then we need to store methods
+      // in the SCC to support that option.
+      if (comp->getPersistentInfo()->getJITServerAOTCacheDelayMethodRelocation() ||
+          !compInfo->getPersistentInfo()->getJITServerUseAOTCache() ||
+          shouldStoreRemoteAOTMethods)
          {
          J9ROMMethod *romMethod = comp->fej9()->getROMMethodFromRAMMethod(method);
          TR::CompilationInfo::storeAOTInSharedCache(