Delete TR_J9VMBase::getFieldOffset(), which is now unused

Previously the only call site was in ilgen when transforming recognized methods of com/ibm/Compiler/Internal/Prefetch, which it no longer does. With this deletion, the owning method and constant pool index of a const string symref should only matter if it's unresolved. That will make it possible to mark arbitrary (resolved) known object const refs as const strings (whenever they happen to be strings).
eclipse-openj9 · Jan 24, 2025 · c1901c8 · c1901c8
1 parent 404a764
commit c1901c8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 83 deletions.
diff --git a/runtime/compiler/env/VMJ9.cpp b/runtime/compiler/env/VMJ9.cpp
@@ -5500,87 +5500,6 @@ TR_J9VMBase::getStringFieldByName(TR::Compilation * comp, TR::SymbolReference *
    return true;
    }
 
-uintptr_t
-TR_J9VMBase::getFieldOffset(TR::Compilation * comp, TR::SymbolReference* classRef, TR::SymbolReference* fieldRef)
-   {
-   TR_ResolvedMethod* method = classRef->getOwningMethod(comp);
-   TR::StaticSymbol* classSym = classRef->getSymbol()->castToStaticSymbol();
-   j9object_t classString = (j9object_t)getStaticReferenceFieldAtAddress((uintptr_t)classSym->getStaticAddress());
-   TR::StaticSymbol* fieldSym = fieldRef->getSymbol()->castToStaticSymbol();
-   j9object_t fieldString = (j9object_t)getStaticReferenceFieldAtAddress((uintptr_t)fieldSym->getStaticAddress());
-
-   int32_t len = (int32_t)jitConfig->javaVM->internalVMFunctions->getStringUTF8Length(vmThread(), classString);
-   U_8* u8ClassString = (U_8*)comp->trMemory()->allocateStackMemory(len + 1);
-
-   jitConfig->javaVM->internalVMFunctions->copyStringToUTF8Helper(vmThread(), classString, J9_STR_NULL_TERMINATE_RESULT | J9_STR_XLAT, 0, J9VMJAVALANGSTRING_LENGTH(vmThread(), classString), u8ClassString, len + 1);
-
-   /**
-   //fprintf(stderr,"name is (res is %d) classString is %p\n",res, classString); fflush(stderr);
-   for (int i =0; i<len; i++)
-      {
-      fprintf(stderr,"%c",u8ClassString[i]);
-      }
-   fprintf(stderr,"  (len is %d)\n",len);fflush(stderr);
-   **/
-
-   char* classSignature = TR::Compiler->cls.classNameToSignature((char*)u8ClassString, len, comp);
-
-   /**
-   fprintf(stderr,"classSignature is \n");
-   for (int i =0; i <len; i++){
-      fprintf(stderr,"%c",classSignature[i]);
-   }
-   fprintf(stderr,"  (len is %d)\n",len);
-   **/
-
-   TR_OpaqueClassBlock * j9ClassPtr = getClassFromSignature(classSignature, len, method);
-   //fprintf(stderr,"Class looked up to be %p \n", j9ClassPtr);
-
-   if (!j9ClassPtr) return 0;
-
-   TR_VMFieldsInfo fields(comp, (J9Class*)j9ClassPtr, 1);
-
-   len = (int32_t)jitConfig->javaVM->internalVMFunctions->getStringUTF8Length(vmThread(), fieldString);
-   U_8* u8FieldString = (U_8*)comp->trMemory()->allocateStackMemory(len + 1);
-
-   jitConfig->javaVM->internalVMFunctions->copyStringToUTF8Helper(vmThread(), fieldString, J9_STR_NULL_TERMINATE_RESULT, 0, J9VMJAVALANGSTRING_LENGTH(vmThread(), fieldString), u8FieldString, len + 1);
-
-   ListIterator<TR_VMField> itr(fields.getFields()) ;
-   TR_VMField* field;
-   uint32_t offset = 0;
-   for (field = itr.getFirst(); field != NULL; field= itr.getNext())
-      {
-      // fprintf(stderr, "fieldName %s fieldOffset %d fieldSig %s\n",field->name, field->offset, field->signature);
-      if (!strncmp(field->name, (const char*)u8FieldString, len+1))
-         {
-         offset = (uint32_t)(field->offset + getObjectHeaderSizeInBytes());
-         // Do we Need this?
-         // offset = getInstanceFieldOffset(j9ClassPtr, field->name, strlen(field->name), field->signature, strlen(field->signature),
-         //                               J9_LOOK_NO_JAVA);
-
-         // fprintf(stderr,">>>>> Offset for %s determined to be : %d\n", field->name,offset);
-         return (uintptr_t)offset;
-         }
-      }
-
-   void * staticAddr = 0;
-   itr = fields.getStatics() ;
-   for (field = itr.getFirst(); field != NULL; field=itr.getNext())
-      {
-      if (!strncmp(field->name, (const char*)u8FieldString, len+1))
-         {
-         // Do we Need to acquire VM Access? getInstanceFieldOffset does it?
-         TR::VMAccessCriticalSection staticFieldAddress(this);
-         staticAddr = jitConfig->javaVM->internalVMFunctions->staticFieldAddress(_vmThread,
-                          (J9Class*)j9ClassPtr, u8FieldString, len,  (U_8*)field->signature, (UDATA)strlen(field->signature),
-                          NULL, NULL, J9_LOOK_NO_JAVA, NULL);
-         }
-      }
-
-
-   return (uintptr_t)staticAddr;
-   }
-
 bool
 TR_J9VMBase::isJavaLangObject(TR_OpaqueClassBlock *clazz)
    {

diff --git a/runtime/compiler/env/VMJ9.h b/runtime/compiler/env/VMJ9.h
@@ -1061,7 +1061,6 @@ class TR_J9VMBase : public TR_FrontEnd
     */
    virtual bool isMethodHandleExpectedType(TR::Compilation *comp, TR::KnownObjectTable::Index mhIndex, TR::KnownObjectTable::Index expectedTypeIndex);
 
-   virtual uintptr_t getFieldOffset( TR::Compilation * comp, TR::SymbolReference* classRef, TR::SymbolReference* fieldRef);
    /*
     * \brief
     *    tell whether it's possible to dereference a field given the field symbol reference at compile time

diff --git a/runtime/compiler/env/VMJ9Server.hpp b/runtime/compiler/env/VMJ9Server.hpp
@@ -209,7 +209,6 @@ class TR_J9ServerVM: public TR_J9VM
 
    virtual intptr_t getVFTEntry(TR_OpaqueClassBlock *clazz, int32_t offset) override;
    virtual bool isClassArray(TR_OpaqueClassBlock *klass) override;
-   virtual uintptr_t getFieldOffset(TR::Compilation * comp, TR::SymbolReference* classRef, TR::SymbolReference* fieldRef) override { return 0; } // safe answer
 // The base version should be safe, no need to override.
 //   virtual bool canDereferenceAtCompileTime(TR::SymbolReference *fieldRef,  TR::Compilation *comp) override; // safe answer, might change in the future
    virtual bool instanceOfOrCheckCast(J9Class *instanceClass, J9Class* castClass) override;