Merge pull request #23064 from mpirvu/knot-fix-cleanup

Code cleanup after knownObjectTable caching

Author: dsouzai

runtime/compiler/control/JITClientCompilationThread.cpp

@@ -632,16 +632,6 @@ handleResponse(JITServer::MessageType response, JITServer::ClientStream *client,
          client->write(response, result, isJL);
          }
          break;
-      case MessageType::VM_getObjectClassInfoFromObjectReferenceLocation:
-         {
-         auto recv = client->getRecvData<uintptr_t>();
-         uintptr_t objectReferenceLocation = std::get<0>(recv);
-         auto ci = fe->getObjectClassInfoFromObjectReferenceLocation(comp, objectReferenceLocation);
-         client->write(response,
-                       ci,
-                       knot->getPointerLocation(ci.knownObjectIndex));
-         }
-         break;
       case MessageType::VM_getObjectClassInfoFromKnotIndex:
          {
          auto recv = client->getRecvData<TR::KnownObjectTable::Index>();

runtime/compiler/env/VMJ9.cpp

@@ -1253,47 +1253,6 @@ TR_J9VMBase::getStaticReferenceFieldAtAddress(uintptr_t fieldAddress)
    return (uintptr_t)J9STATIC_OBJECT_LOAD(vmThread(), NULL, fieldAddress);
    }
 
-TR_J9VMBase::ObjectClassInfo
-TR_J9VMBase::getObjectClassInfoFromObjectReferenceLocation(TR::Compilation *comp,
-                                               uintptr_t objectReferenceLocation)
-   {
-   // The objectReferenceLocation is required to have come from
-   // KnownObjectTable::getPointerLocation().
-   TR::KnownObjectTable *knot = comp->getKnownObjectTable();
-   TR_ASSERT_FATAL(knot != NULL, "missing known object table");
-
-   TR::KnownObjectTable::Index knownObjectIndex =
-      knot->getExistingIndexAt((uintptr_t*)objectReferenceLocation);
-
-   TR_ASSERT_FATAL(
-      knownObjectIndex != TR::KnownObjectTable::UNKNOWN,
-      "objectReferenceLocation must originate from the known object table");
-
-   TR_J9VMBase::ObjectClassInfo ci = {};
-   TR::VMAccessCriticalSection vmAccess(comp);
-
-   uintptr_t objectReference = knot->getPointer(knownObjectIndex);
-   ci.clazz = getObjectClass(objectReference);
-   ci.isString = isString(ci.clazz);
-   ci.jlClass = getClassClassPointer(ci.clazz);
-   ci.isFixedJavaLangClass = (ci.jlClass == ci.clazz);
-   if (ci.isFixedJavaLangClass)
-      {
-      // A FixedClass constraint means something different
-      // when the class happens to be java/lang/Class.
-      // Must add constraints pertaining to the class that
-      // the java/lang/Class object represents.
-      ci.clazz = getClassFromJavaLangClass(objectReference);
-      }
-
-   ci.knownObjectIndex = knownObjectIndex;
-
-   J9::ConstProvenanceGraph *cpg = comp->constProvenanceGraph();
-   cpg->addEdge(cpg->knownObject(knownObjectIndex), ci.clazz);
-
-   return ci;
-   }
-
 TR::KnownObjectTable::ObjectInfo
 TR_J9VMBase::getObjClassInfoFromKnotIndexNoCaching(TR::Compilation *comp, TR::KnownObjectTable::Index knotIndex)
    {

runtime/compiler/env/VMJ9.h

@@ -653,19 +653,6 @@ class TR_J9VMBase : public TR_FrontEnd
    virtual uintptr_t           getStaticReferenceFieldAtAddress(uintptr_t fieldAddress);
    virtual int32_t             getInt32FieldAt(uintptr_t objectPointer, uintptr_t fieldOffset);
 
-   /* Used to contain all information needed for getObjectClassInfoFromObjectReferenceLocation
-    * to create a VPKnownObject constraint.
-    */
-   struct ObjectClassInfo
-      {
-      TR_OpaqueClassBlock *clazz;
-      TR_OpaqueClassBlock *jlClass;
-      bool isFixedJavaLangClass;
-      bool isString;
-      TR::KnownObjectTable::Index knownObjectIndex;
-      };
-   virtual ObjectClassInfo getObjectClassInfoFromObjectReferenceLocation
-                                    (TR::Compilation *comp, uintptr_t objectReferenceLocation);
    virtual TR::KnownObjectTable::ObjectInfo getObjClassInfoFromKnotIndexNoCaching(TR::Compilation *comp, TR::KnownObjectTable::Index knotIndex);
    TR::KnownObjectTable::ObjectInfo getObjClassInfoFromKnotIndex(TR::Compilation *comp, TR::KnownObjectTable::Index knotIndex);
 

runtime/compiler/env/VMJ9Server.cpp

@@ -963,19 +963,6 @@ TR_J9ServerVM::getStaticReferenceFieldAtAddress(uintptr_t fieldAddress)
    TR_ASSERT_FATAL(false, "getStaticReferenceFieldAtAddress() should not be called by JITServer");
    }
 
-TR_J9VMBase::ObjectClassInfo
-TR_J9ServerVM::getObjectClassInfoFromObjectReferenceLocation(TR::Compilation *comp, uintptr_t objectReferenceLocation)
-   {
-   JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
-   stream->write(JITServer::MessageType::VM_getObjectClassInfoFromObjectReferenceLocation,
-                 objectReferenceLocation);
-   auto recv = stream->read<TR_J9VMBase::ObjectClassInfo, uintptr_t *>();
-   TR_J9VMBase::ObjectClassInfo result = std::get<0>(recv);
-   uintptr_t *objectReferenceLocationClient = std::get<1>(recv);
-   comp->getKnownObjectTable()->updateKnownObjectTableAtServer(result.knownObjectIndex, objectReferenceLocationClient);
-   return result;
-   }
-
 TR::KnownObjectTable::ObjectInfo
 TR_J9ServerVM::getObjClassInfoFromKnotIndexNoCaching(TR::Compilation *comp, TR::KnownObjectTable::Index knotIndex)
    {

runtime/compiler/env/VMJ9Server.hpp

@@ -113,11 +113,7 @@ class TR_J9ServerVM: public TR_J9VM
    virtual TR_OpaqueClassBlock *getObjectClassFromKnownObjectIndex(TR::Compilation *comp, TR::KnownObjectTable::Index idx) override;
    virtual TR_OpaqueClassBlock *getObjectClassFromKnownObjectIndex(TR::Compilation *comp, TR::KnownObjectTable::Index idx, bool *isJavaLangClass) override;
    virtual uintptr_t getStaticReferenceFieldAtAddress(uintptr_t fieldAddress) override;
-
-   virtual ObjectClassInfo getObjectClassInfoFromObjectReferenceLocation
-                              (TR::Compilation *comp, uintptr_t objectReferenceLocation) override;
    virtual TR::KnownObjectTable::ObjectInfo getObjClassInfoFromKnotIndexNoCaching(TR::Compilation *comp, TR::KnownObjectTable::Index knotIndex) override;
-
    virtual bool stackWalkerMaySkipFrames(TR_OpaqueMethodBlock *method, TR_OpaqueClassBlock *clazz) override;
    virtual bool hasFinalFieldsInClass(TR_OpaqueClassBlock *clazz) override;
    virtual const char *sampleSignature(TR_OpaqueMethodBlock * aMethod, char *buf, int32_t bufLen, TR_Memory *memory) override;

runtime/compiler/net/MessageTypes.cpp

@@ -119,7 +119,6 @@ const char *messageNames[] =
    "VM_getObjectClassAt",
    "VM_getObjectClassFromKnownObjectIndex",
    "VM_getObjectClassFromKnownObjectIndexJLClass",
-   "VM_getObjectClassInfoFromObjectReferenceLocation",
    "VM_stackWalkerMaySkipFrames",
    "VM_classInitIsFinished",
    "VM_getClassFromNewArrayType",

runtime/compiler/net/MessageTypes.hpp

@@ -130,7 +130,6 @@ enum MessageType : uint16_t
    VM_getObjectClassAt,
    VM_getObjectClassFromKnownObjectIndex,
    VM_getObjectClassFromKnownObjectIndexJLClass,
-   VM_getObjectClassInfoFromObjectReferenceLocation,
    VM_stackWalkerMaySkipFrames,
    VM_classInitIsFinished,
    VM_getClassFromNewArrayType,