Merge pull request #21995 from jdmpapin/revert-21928-fej9-app-ext-loaders-0.53

pshipton · web-flow · commit 21d19c08fce2 · 2025-05-30T13:48:01.000-04:00
(0.53) Revert "Make the extension and application loaders available via TR_J9VMBase"
diff --git a/runtime/compiler/control/JITClientCompilationThread.cpp b/runtime/compiler/control/JITClientCompilationThread.cpp
@@ -443,8 +443,6 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
          ClientSessionData::VMInfo vmInfo = {};
          J9JavaVM * javaVM = vmThread->javaVM;
          vmInfo._systemClassLoader = fe->getSystemClassLoader();
-         vmInfo._extensionClassLoader = fe->getExtensionClassLoader();
-         vmInfo._applicationClassLoader = fe->getApplicationClassLoader();
          vmInfo._processID = fe->getProcessID();
          vmInfo._canMethodEnterEventBeHooked = fe->canMethodEnterEventBeHooked();
          vmInfo._canMethodExitEventBeHooked = fe->canMethodExitEventBeHooked();
@@ -3512,13 +3510,6 @@ remoteCompile(J9VMThread *vmThread, TR::Compilation *compiler, TR_ResolvedMethod
    ((TR::CompilationInfoPerThread *)compInfoPT)->clearDeserializerWasReset();
    std::vector<uintptr_t> newKnownIds = deserializer ? deserializer->getNewKnownIds(compiler) : std::vector<uintptr_t>();
 
-   // The server might have cached the VMInfo for this client before the
-   // extension and/or application class loader existed. Send the class loader
-   // pointers with the compilation request so that in that case, if they have
-   // since been created, the server will have a chance to become aware of them.
-   void *extensionClassLoader = compiler->fej9vm()->getExtensionClassLoader();
-   void *applicationClassLoader = compiler->fej9vm()->getApplicationClassLoader();
-
    // TODO: make this a synchronized region to avoid bad_alloc exceptions
    compInfo->getSequencingMonitor()->enter();
    // Collect the list of unloaded classes
@@ -3573,8 +3564,7 @@ remoteCompile(J9VMThread *vmThread, TR::Compilation *compiler, TR_ResolvedMethod
          detailsStr, details.getType(), unloadedClasses, illegalModificationList, classInfoTuple, optionsStr,
          recompMethodInfoStr, chtableUpdates.first, chtableUpdates.second, useAotCompilation,
          TR::Compiler->vm.isVMInStartupPhase(compInfoPT->getJitConfig()), aotCacheStore, aotCacheLoad, methodIndex,
-         classChainOffset, ramClassChain, uncachedRAMClasses, uncachedClassInfos, newKnownIds,
-         extensionClassLoader, applicationClassLoader
+         classChainOffset, ramClassChain, uncachedRAMClasses, uncachedClassInfos, newKnownIds
       );
 
       JITServer::MessageType response;
diff --git a/runtime/compiler/control/JITServerCompilationThread.cpp b/runtime/compiler/control/JITServerCompilationThread.cpp
@@ -588,8 +588,6 @@ TR::CompilationInfoPerThreadRemote::processCompilationRequest(CompilationRequest
    auto &uncachedRAMClasses      = std::get<22>(req);
    auto &uncachedClassInfos      = std::get<23>(req);
    auto &newKnownIds             = std::get<24>(req);
-   void *extensionClassLoader    = std::get<25>(req);
-   void *applicationClassLoader  = std::get<26>(req);
 
    TR_ASSERT_FATAL(TR::Compiler->persistentMemory() == compInfo->persistentMemory(),
                      "per-client persistent memory must not be set at this point");
@@ -642,8 +640,6 @@ TR::CompilationInfoPerThreadRemote::processCompilationRequest(CompilationRequest
          throw std::bad_alloc();
 
       setClientData(clientSession); // Cache the session data into CompilationInfoPerThreadRemote object
-      clientSession->setExtensionClassLoader(extensionClassLoader);
-      clientSession->setApplicationClassLoader(applicationClassLoader);
 
       // After this line, all persistent allocations are made per-client,
       // until exitPerClientAllocationRegion is called
diff --git a/runtime/compiler/control/JITServerCompilationThread.hpp b/runtime/compiler/control/JITServerCompilationThread.hpp
@@ -41,7 +41,7 @@ using CompilationRequest = std::tuple<
    J9::IlGeneratorMethodDetailsType, std::vector<TR_OpaqueClassBlock *>, std::vector<TR_OpaqueClassBlock *>,
    JITServerHelpers::ClassInfoTuple, std::string, std::string, std::string, std::string,
    bool, bool, bool, bool, uint32_t, uintptr_t, std::vector<J9Class *>, std::vector<J9Class *>,
-   std::vector<JITServerHelpers::ClassInfoTuple>, std::vector<uintptr_t>, void *, void *
+   std::vector<JITServerHelpers::ClassInfoTuple>, std::vector<uintptr_t>
 >;
 
 void outOfProcessCompilationEnd(TR_MethodToBeCompiled *entry, TR::Compilation *comp);
diff --git a/runtime/compiler/env/VMJ9.cpp b/runtime/compiler/env/VMJ9.cpp
@@ -7179,18 +7179,6 @@ TR_J9VMBase::getSystemClassLoader()
    return vmThread()->javaVM->systemClassLoader;
    }
 
-void *
-TR_J9VMBase::getExtensionClassLoader()
-   {
-   return vmThread()->javaVM->extensionClassLoader;
-   }
-
-void *
-TR_J9VMBase::getApplicationClassLoader()
-   {
-   return vmThread()->javaVM->applicationClassLoader;
-   }
-
 bool
 TR_J9VMBase::acquireClassTableMutex()
    {
diff --git a/runtime/compiler/env/VMJ9.h b/runtime/compiler/env/VMJ9.h
@@ -1465,8 +1465,6 @@ class TR_J9VMBase : public TR_FrontEnd
    virtual int32_t maxInternalPlusPinningArrayPointers(TR::Compilation* comp);
 
    virtual void *getSystemClassLoader();
-   virtual void *getExtensionClassLoader();
-   virtual void *getApplicationClassLoader();
 
    virtual TR_EstimateCodeSize *getCodeEstimator( TR::Compilation *comp);
    virtual void releaseCodeEstimator( TR::Compilation *comp, TR_EstimateCodeSize *estimator);
diff --git a/runtime/compiler/env/VMJ9Server.cpp b/runtime/compiler/env/VMJ9Server.cpp
@@ -407,22 +407,6 @@ TR_J9ServerVM::getSystemClassLoader()
    return vmInfo->_systemClassLoader;
    }
 
-void *
-TR_J9ServerVM::getExtensionClassLoader()
-   {
-   JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
-   auto *vmInfo = _compInfoPT->getClientData()->getOrCacheVMInfo(stream);
-   return vmInfo->_extensionClassLoader;
-   }
-
-void *
-TR_J9ServerVM::getApplicationClassLoader()
-   {
-   JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
-   auto *vmInfo = _compInfoPT->getClientData()->getOrCacheVMInfo(stream);
-   return vmInfo->_applicationClassLoader;
-   }
-
 bool
 TR_J9ServerVM::jitFieldsOrStaticsAreIdentical(TR_ResolvedMethod * method1, I_32 cpIndex1, TR_ResolvedMethod * method2, I_32 cpIndex2, int32_t isStatic)
    {
diff --git a/runtime/compiler/env/VMJ9Server.hpp b/runtime/compiler/env/VMJ9Server.hpp
@@ -82,8 +82,6 @@ class TR_J9ServerVM: public TR_J9VM
    virtual TR_OpaqueClassBlock * getLeafComponentClassFromArrayClass(TR_OpaqueClassBlock * arrayClass) override;
    virtual TR_OpaqueClassBlock *getClassFromSignature(const char *sig, int32_t length, J9ConstantPool *constantPool, bool isVettedForAOT = false) override;
    virtual void * getSystemClassLoader() override;
-   virtual void * getExtensionClassLoader() override;
-   virtual void * getApplicationClassLoader() override;
    virtual bool jitFieldsAreSame(TR_ResolvedMethod * method1, I_32 cpIndex1, TR_ResolvedMethod * method2, I_32 cpIndex2, int32_t isStatic) override;
    virtual bool jitStaticsAreSame(TR_ResolvedMethod *method1, I_32 cpIndex1, TR_ResolvedMethod *method2, I_32 cpIndex2) override;
    virtual TR_OpaqueClassBlock * getComponentClassFromArrayClass(TR_OpaqueClassBlock *arrayClass) override;
diff --git a/runtime/compiler/net/CommunicationStream.hpp b/runtime/compiler/net/CommunicationStream.hpp
@@ -129,7 +129,7 @@ class CommunicationStream
    // likely to lose an increment when merging/rebasing/etc.
    //
    static const uint8_t MAJOR_NUMBER = 1;
-   static const uint16_t MINOR_NUMBER = 81; // ID: FoxOMSLFyVA0Xn2XHmL1
+   static const uint16_t MINOR_NUMBER = 80; // ID: snCDuoE2+InCmAiOg6YU
    static const uint8_t PATCH_NUMBER = 0;
    static uint32_t CONFIGURATION_FLAGS;
 
diff --git a/runtime/compiler/runtime/JITClientSession.cpp b/runtime/compiler/runtime/JITClientSession.cpp
@@ -2103,35 +2103,6 @@ ClientSessionData::printSharedProfileCacheStats() const
       }
    }
 
-void
-ClientSessionData::setExtensionClassLoader(void *loader)
-   {
-   if (_vmInfo != NULL)
-      {
-      setClassLoader(&_vmInfo->_extensionClassLoader, loader, "extension");
-      }
-   }
-
-void
-ClientSessionData::setApplicationClassLoader(void *loader)
-   {
-   if (_vmInfo != NULL)
-      {
-      setClassLoader(&_vmInfo->_applicationClassLoader, loader, "application");
-      }
-   }
-
-void
-ClientSessionData::setClassLoader(void **slot, void *loader, const char *which)
-   {
-   TR_ASSERT_FATAL(
-      *slot == NULL || *slot == loader,
-      "inconsistent %s loaders: %p vs %p",
-      *slot,
-      loader);
-
-   *slot = loader;
-   }
 
 ClientSessionHT*
 ClientSessionHT::allocate()
diff --git a/runtime/compiler/runtime/JITClientSession.hpp b/runtime/compiler/runtime/JITClientSession.hpp
@@ -278,8 +278,6 @@ class ClientSessionData
    struct VMInfo
       {
       void *_systemClassLoader;
-      void *_extensionClassLoader;
-      void *_applicationClassLoader;
       uintptr_t _processID;
       bool _canMethodEnterEventBeHooked;
       bool _canMethodExitEventBeHooked;
@@ -553,11 +551,7 @@ class ClientSessionData
    void printSharedProfileCacheStats() const;
    void printIProfilerCacheStats();
 
-   void setExtensionClassLoader(void *loader);
-   void setApplicationClassLoader(void *loader);
-
 private:
-   void setClassLoader(void **slot, void *loader, const char *which);
    void destroyMonitors();
 
    // If this function sets the missingLoaderInfo flag then a NULL result is due to missing class loader info;
