Merge pull request #19477 from mpirvu/classlibraryclass

Eliminate VM_isClassLibraryClass messages for JITServer
eclipse-openj9 · May 14, 2024 · dd6f997 · dd6f997
2 parents f270cb4 + 1208a4a
commit dd6f997
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/runtime/compiler/control/JITClientCompilationThread.cpp b/runtime/compiler/control/JITClientCompilationThread.cpp
@@ -269,12 +269,6 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
             }
          }
          break;
-      case MessageType::VM_isClassLibraryClass:
-         {
-         bool rv = fe->isClassLibraryClass(std::get<0>(client->getRecvData<TR_OpaqueClassBlock*>()));
-         client->write(response, rv);
-         }
-         break;
       case MessageType::VM_isClassLibraryMethod:
          {
          auto tup = client->getRecvData<TR_OpaqueMethodBlock*, bool>();

diff --git a/runtime/compiler/env/VMJ9Server.cpp b/runtime/compiler/env/VMJ9Server.cpp
@@ -60,17 +60,20 @@ TR_J9ServerVM::getResolvedMethodsAndMethods(TR_Memory *trMemory, TR_OpaqueClassB
 bool
 TR_J9ServerVM::isClassLibraryMethod(TR_OpaqueMethodBlock *method, bool vettedForAOT)
    {
-   JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
-   stream->write(JITServer::MessageType::VM_isClassLibraryMethod, method, vettedForAOT);
-   return std::get<0>(stream->read<bool>());
+   return isClassLibraryClass(getClassFromMethodBlock(method));
    }
 
 bool
 TR_J9ServerVM::isClassLibraryClass(TR_OpaqueClassBlock *clazz)
    {
+   // Use the local cache to determine whether the class loader of the given
+   // class is the same as the system classloader
    JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
-   stream->write(JITServer::MessageType::VM_isClassLibraryClass, clazz);
-   return std::get<0>(stream->read<bool>());
+   void *classLoader = NULL;
+   JITServerHelpers::getAndCacheRAMClassInfo((J9Class *)clazz, _compInfoPT->getClientData(), stream, JITServerHelpers::CLASSINFO_CLASS_LOADER, &classLoader);
+   auto *vmInfo = _compInfoPT->getClientData()->getOrCacheVMInfo(stream);
+   TR_ASSERT(vmInfo->_systemClassLoader, "_systemClassLoader cannot be NULL");
+   return vmInfo->_systemClassLoader == classLoader;
    }
 
 TR_OpaqueClassBlock *

diff --git a/runtime/compiler/net/CommunicationStream.hpp b/runtime/compiler/net/CommunicationStream.hpp
@@ -118,7 +118,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 = 61; // ID: 2WUGRj9RjAt4xrMCntc/
+   static const uint16_t MINOR_NUMBER = 62; // ID: TNff0n0QdLOhsH6CmQlT/
    static const uint8_t PATCH_NUMBER = 0;
    static uint32_t CONFIGURATION_FLAGS;
 

diff --git a/runtime/compiler/net/MessageTypes.cpp b/runtime/compiler/net/MessageTypes.cpp
@@ -94,7 +94,6 @@ const char *messageNames[] =
    "ResolvedRelocatableMethod_fieldAttributes",
    "ResolvedRelocatableMethod_staticAttributes",
    "ResolvedRelocatableMethod_getFieldType",
-   "VM_isClassLibraryClass",
    "VM_isClassLibraryMethod",
    "VM_isClassArray",
    "VM_transformJlrMethodInvoke",

diff --git a/runtime/compiler/net/MessageTypes.hpp b/runtime/compiler/net/MessageTypes.hpp
@@ -103,7 +103,6 @@ enum MessageType : uint16_t
    ResolvedRelocatableMethod_getFieldType,
 
    // For TR_J9ServerVM methods
-   VM_isClassLibraryClass,
    VM_isClassLibraryMethod,
    VM_isClassArray,
    VM_transformJlrMethodInvoke,