Refactor the Deserializer to use a helper struct

To faciltate a non-compilation thread invoking the deserializer, which
can happen outside the context of a compilation, the APIs in the
Deserializer need to be updated to no longer require a TR::Compilation
object directly.

Signed-off-by: Irwin D'Souza <dsouzai.gh@gmail.com>

Author: dsouzai

runtime/compiler/control/JITClientCompilationThread.cpp

@@ -3031,13 +3031,14 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
          if (auto deserializer = compInfo->getJITServerAOTDeserializer())
             {
             bool wasReset = false;
-            deserializer->cacheRecords((const uint8_t *)recordsStr.data(), recordsStr.size(), comp,
+            auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+            deserializer->cacheRecords((const uint8_t *)recordsStr.data(), recordsStr.size(), &helper,
                                        /*ignoreFailures=*/true, wasReset);
             if (!wasReset)
                {
                for (uintptr_t id : classIds)
                   {
-                  J9Class *ramClass = deserializer->getRAMClass(id, comp, wasReset);
+                  J9Class *ramClass = deserializer->getRAMClass(id, &helper, wasReset);
                   if (wasReset)
                      {
                      ramClasses.clear();
@@ -3446,7 +3447,8 @@ remoteCompile(J9VMThread *vmThread, TR::Compilation *compiler, TR_ResolvedMethod
    // 2. Accesses the JITServer AOT deserializer in any way.
    // That moment is currently right here, when we get the new known IDs that are cached in the deserializer.
    compInfoPT->getJ9VM()->clearDeserializerWasReset();
-   std::vector<uintptr_t> newKnownIds = deserializer ? deserializer->getNewKnownIds(compiler) : std::vector<uintptr_t>();
+   auto helper = DeserializerHelper(compiler->j9VMThread(), compiler->fej9(), compiler->trMemory(), compiler);
+   std::vector<uintptr_t> newKnownIds = deserializer ? deserializer->getNewKnownIds(&helper) : std::vector<uintptr_t>();
 
    // TODO: make this a synchronized region to avoid bad_alloc exceptions
    compInfo->getSequencingMonitor()->enter();
@@ -3564,7 +3566,8 @@ remoteCompile(J9VMThread *vmThread, TR::Compilation *compiler, TR_ResolvedMethod
 
          auto method = SerializedAOTMethod::get(methodStr);
          bool usesSVM = false;
-         if (deserializer->deserialize(method, records, compiler, usesSVM))
+         auto helper = DeserializerHelper(compiler->j9VMThread(), compiler->fej9(), compiler->trMemory(), compiler);
+         if (deserializer->deserialize(method, records, &helper, usesSVM))
             {
             compiler->setDeserializedAOTMethodStore(true);
             compiler->setDeserializedAOTMethod(true);
@@ -3598,7 +3601,8 @@ remoteCompile(J9VMThread *vmThread, TR::Compilation *compiler, TR_ResolvedMethod
 
          auto method = SerializedAOTMethod::get(methodStr);
          bool usesSVM = false;
-         if (deserializer->deserialize(method, records, compiler, usesSVM))
+         auto helper = DeserializerHelper(compiler->j9VMThread(), compiler->fej9(), compiler->trMemory(), compiler);
+         if (deserializer->deserialize(method, records, &helper, usesSVM))
             {
             compiler->setDeserializedAOTMethod(true);
             compiler->setDeserializedAOTMethodUsingSVM(usesSVM);

runtime/compiler/env/J9SharedCache.cpp

@@ -1428,7 +1428,8 @@ TR_J9SharedCache::lookupClassFromChainAndLoader(uintptr_t *chainData, void *clas
    if (!clazz && comp->isDeserializedAOTMethod())
       {
       auto deserializer = TR::CompilationInfo::get()->getJITServerAOTDeserializer();
-      clazz = deserializer->getGeneratedClass((J9ClassLoader *)classLoader, romClassOffset, comp);
+      auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+      clazz = deserializer->getGeneratedClass((J9ClassLoader *)classLoader, romClassOffset, &helper);
       }
 #endif /* defined(J9VM_OPT_JITSERVER) */
 
@@ -1870,7 +1871,8 @@ TR_J9DeserializerSharedCache::romClassFromOffsetInSharedCache(uintptr_t offset)
    {
    TR::Compilation *comp = _compInfoPT->getCompilation();
    bool wasReset = false;
-   auto romClass = _deserializer->romClassFromOffsetInSharedCache(offset, comp, wasReset);
+   auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+   auto romClass = _deserializer->romClassFromOffsetInSharedCache(offset, &helper, wasReset);
    if (wasReset)
       comp->failCompilation<J9::AOTDeserializerReset>(
          "Deserializer reset during relocation of method %s", comp->signature());
@@ -1886,7 +1888,8 @@ TR_J9DeserializerSharedCache::pointerFromOffsetInSharedCache(uintptr_t offset)
    {
    TR::Compilation *comp = _compInfoPT->getCompilation();
    bool wasReset = false;
-   auto ptr = _deserializer->pointerFromOffsetInSharedCache(offset, comp, wasReset);
+   auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+   auto ptr = _deserializer->pointerFromOffsetInSharedCache(offset, &helper, wasReset);
    if (wasReset)
       comp->failCompilation<J9::AOTDeserializerReset>(
          "Deserializer reset during relocation of method %s", comp->signature());
@@ -1916,7 +1919,8 @@ TR_J9DeserializerSharedCache::classMatchesCachedVersion(J9Class *clazz, UDATA *c
    // is equal to the one we are trying to validate.
    TR::Compilation *comp = _compInfoPT->getCompilation();
    bool wasReset = false;
-   auto ramClass = _deserializer->classFromOffset(chainData[1], comp, wasReset);
+   auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+   auto ramClass = _deserializer->classFromOffset(chainData[1], &helper, wasReset);
    if (wasReset)
       comp->failCompilation<J9::AOTDeserializerReset>(
          "Deserializer reset during relocation of method %s", comp->signature());
@@ -1935,7 +1939,8 @@ TR_J9DeserializerSharedCache::lookupClassFromChainAndLoader(uintptr_t *chainData
    // We do not need to perform that checking here, because during deserialization we will have already resolved the first class in the chain to
    // a J9Class and verified that it matches. Thus we can simply return that cached first J9Class.
    bool wasReset = false;
-   auto clazz = _deserializer->classFromOffset(chainData[1], comp, wasReset);
+   auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+   auto clazz = _deserializer->classFromOffset(chainData[1], &helper, wasReset);
    if (wasReset)
       comp->failCompilation<J9::AOTDeserializerReset>(
          "Deserializer reset during relocation of method %s", comp->signature());
@@ -1951,7 +1956,8 @@ TR_J9DeserializerSharedCache::romMethodFromOffsetInSharedCache(uintptr_t offset)
    {
    TR::Compilation *comp = _compInfoPT->getCompilation();
    bool wasReset = false;
-   auto romMethod = _deserializer->romMethodFromOffsetInSharedCache(offset, comp, wasReset);
+   auto helper = DeserializerHelper(comp->j9VMThread(), comp->fej9(), comp->trMemory(), comp);
+   auto romMethod = _deserializer->romMethodFromOffsetInSharedCache(offset, &helper, wasReset);
    if (wasReset)
       comp->failCompilation<J9::AOTDeserializerReset>(
          "Deserializer reset during relocation of method %s", comp->signature());