Merge pull request #20091 from jdmpapin/vTableSlot-cpIndex

hzongaro · web-flow · commit bfa3cfd037f9 · 2024-09-05T15:44:30.000-04:00
Remove unused cpIndex parameter of vTableSlot(), virtualCallSelector()
diff --git a/runtime/compiler/control/JITClientCompilationThread.cpp b/runtime/compiler/control/JITClientCompilationThread.cpp
@@ -1771,7 +1771,7 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
                case TR_ResolvedMethodType::VirtualFromCP:
                   {
                   resolvedMethod = static_cast<TR_ResolvedJ9Method *>(owningMethod->getResolvedPossiblyPrivateVirtualMethod(comp, cpIndex, true, &unresolvedInCP));
-                  vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot(cpIndex) : 0;
+                  vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot() : 0;
                   break;
                   }
                case TR_ResolvedMethodType::Static:
@@ -1787,7 +1787,7 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
                case TR_ResolvedMethodType::ImproperInterface:
                   {
                   resolvedMethod = static_cast<TR_ResolvedJ9Method *>(owningMethod->getResolvedImproperInterfaceMethod(comp, cpIndex));
-                  vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot(cpIndex) : 0;
+                  vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot() : 0;
                   break;
                   }
                default:
diff --git a/runtime/compiler/env/j9method.cpp b/runtime/compiler/env/j9method.cpp
@@ -1024,15 +1024,6 @@ TR_ResolvedRelocatableJ9Method::TR_ResolvedRelocatableJ9Method(TR_OpaqueMethodBl
          setRecognizedMethod(TR::unknownMethod);
          }
       }
-
-
-   }
-
-int32_t
-TR_ResolvedRelocatableJ9Method::virtualCallSelector(U_32 cpIndex)
-   {
-   return TR_ResolvedJ9Method::virtualCallSelector(cpIndex);
-   //return -1;
    }
 
 bool
@@ -5487,9 +5478,9 @@ TR_ResolvedJ9Method::getExistingJittedBodyInfo()
    }
 
 int32_t
-TR_ResolvedJ9Method::virtualCallSelector(U_32 cpIndex)
+TR_ResolvedJ9Method::virtualCallSelector()
    {
-   return -(int32_t)(vTableSlot(cpIndex) - TR::Compiler->vm.getInterpreterVTableOffset());
+   return -(int32_t)(vTableSlot() - TR::Compiler->vm.getInterpreterVTableOffset());
    }
 
 bool
@@ -6487,10 +6478,8 @@ TR_ResolvedJ9Method::startAddressForJNIMethod(TR::Compilation * comp)
    }
 
 U_32
-TR_ResolvedJ9Method::vTableSlot(U_32 cpIndex)
+TR_ResolvedJ9Method::vTableSlot()
    {
-   TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");
-   //UDATA vTableSlot = ((J9RAMVirtualMethodRef *)literals())[cpIndex].methodIndexAndArgCount >> 8;
    return _vTableSlot;
    }
 
diff --git a/runtime/compiler/env/j9method.h b/runtime/compiler/env/j9method.h
@@ -441,7 +441,7 @@ class TR_ResolvedJ9Method : public TR_J9Method, public TR_ResolvedJ9MethodBase
    virtual uint32_t                classCPIndexOfMethod(uint32_t methodCPIndex);
    virtual void * &                addressOfClassOfMethod();
 
-   virtual uint32_t                vTableSlot(uint32_t);
+   virtual uint32_t                vTableSlot();
 
    virtual bool                    isCompilable(TR_Memory *);
 
@@ -474,7 +474,7 @@ class TR_ResolvedJ9Method : public TR_J9Method, public TR_ResolvedJ9MethodBase
    virtual bool                    virtualMethodIsOverridden();
    virtual void                    setVirtualMethodIsOverridden();
    virtual void *                  addressContainingIsOverriddenBit();
-   virtual int32_t                 virtualCallSelector(uint32_t cpIndex);
+   virtual int32_t                 virtualCallSelector();
 
    virtual int32_t                 exceptionData(int32_t exceptionNumber, int32_t * startIndex, int32_t * endIndex, int32_t * catchType);
    virtual uint32_t                numberOfExceptionHandlers();
@@ -611,7 +611,6 @@ class TR_ResolvedRelocatableJ9Method : public TR_ResolvedJ9Method
 
    virtual TR_OpaqueClassBlock * definingClassFromCPFieldRef(TR::Compilation *comp, int32_t cpIndex, bool isStatic, TR_OpaqueClassBlock** fromResolvedJ9Method = NULL);
 
-   virtual int32_t                 virtualCallSelector(uint32_t cpIndex);
    virtual char *                  fieldSignatureChars(int32_t cpIndex, int32_t & len);
    virtual char *                  staticSignatureChars(int32_t cpIndex, int32_t & len);
 
diff --git a/runtime/compiler/optimizer/InterpreterEmulator.cpp b/runtime/compiler/optimizer/InterpreterEmulator.cpp
@@ -1591,7 +1591,7 @@ InterpreterEmulator::visitInvokevirtual()
          {
          TR_J9MutableCallSite *inlinerMcs = new (comp()->trHeapMemory()) TR_J9MutableCallSite(_calltarget->_calleeMethod, callNodeTreeTop,   parent,
                                                       callNode, interfaceMethod, _currentCallMethod->classOfMethod(),
-                                                      (int32_t) _currentCallMethod->virtualCallSelector(cpIndex), cpIndex, _currentCallMethod,
+                                                      -1, cpIndex, _currentCallMethod,
                                                       resolvedSymbol, isIndirectCall, isInterface, *_newBCInfo, comp(),
                                                       _recursionDepth, allconsts);
          if (_currentCallMethod->getRecognizedMethod() == TR::java_lang_invoke_MethodHandle_invokeBasic)
@@ -1621,7 +1621,7 @@ InterpreterEmulator::visitInvokevirtual()
          {
          callsite = new (comp()->trHeapMemory()) TR_J9VirtualCallSite(_calltarget->_calleeMethod, callNodeTreeTop, parent,
                                                                         callNode, interfaceMethod, _currentCallMethod->classOfMethod(),
-                                                                        (int32_t) _currentCallMethod->virtualCallSelector(cpIndex), cpIndex, _currentCallMethod,
+                                                                        (int32_t) _currentCallMethod->virtualCallSelector(), cpIndex, _currentCallMethod,
                                                                         resolvedSymbol, isIndirectCall, isInterface, *_newBCInfo, comp(),
                                                                         _recursionDepth, allconsts);
 
@@ -1736,7 +1736,7 @@ InterpreterEmulator::visitInvokestatic()
          {
          TR_J9MutableCallSite *mcs = new (comp()->trHeapMemory()) TR_J9MutableCallSite( _calltarget->_calleeMethod, callNodeTreeTop,   parent,
                callNode, interfaceMethod, receiverClass,
-               (int32_t) _currentCallMethod->virtualCallSelector(cpIndex), cpIndex, _currentCallMethod,
+               -1, cpIndex, _currentCallMethod,
                resolvedSymbol, isIndirectCall, isInterface, *_newBCInfo, comp(),
                _recursionDepth, allconsts);
          if (mcsIndex != TR::KnownObjectTable::UNKNOWN)
@@ -1751,7 +1751,7 @@ InterpreterEmulator::visitInvokestatic()
          int32_t noCPIndex = -1; // The method is not referenced via the constant pool
          callsite = new (comp()->trHeapMemory()) TR_J9VirtualCallSite(
                _calltarget->_calleeMethod, callNodeTreeTop, parent, callNode,
-               interfaceMethod, receiverClass, (int32_t) _currentCallMethod->virtualCallSelector(cpIndex), noCPIndex,
+               interfaceMethod, receiverClass, (int32_t) _currentCallMethod->virtualCallSelector(), noCPIndex,
                _currentCallMethod, resolvedSymbol, isIndirectCall, isInterface,
                *_newBCInfo, comp(), _recursionDepth, allconsts);
          }
@@ -1817,7 +1817,7 @@ InterpreterEmulator::visitInvokeinterface()
       {
       callsite = new (comp()->trHeapMemory()) TR_J9VirtualCallSite(
          _calltarget->_calleeMethod, callNodeTreeTop, parent, callNode,
-         interfaceMethod, _currentCallMethod->classOfMethod(), (int32_t) _currentCallMethod->virtualCallSelector(cpIndex), cpIndex,
+         interfaceMethod, _currentCallMethod->classOfMethod(), (int32_t) _currentCallMethod->virtualCallSelector(), cpIndex,
          _currentCallMethod, resolvedSymbol, isIndirectCall, isInterface,
          *_newBCInfo, comp(), _recursionDepth, allconsts);
       }

Original file line number	Diff line number	Diff line change
`@@ -1771,7 +1771,7 @@ handleServerMessage(JITServer::ClientStream client, TR_J9VM fe, JITServer::Mes`
`1771`	`1771`	`case TR_ResolvedMethodType::VirtualFromCP:`
`1772`	`1772`	`{`
`1773`	`1773`	`resolvedMethod = static_cast<TR_ResolvedJ9Method *>(owningMethod->getResolvedPossiblyPrivateVirtualMethod(comp, cpIndex, true, &unresolvedInCP));`
`1774`		`- vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot(cpIndex) : 0;`
	`1774`	`+ vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot() : 0;`
`1775`	`1775`	`break;`
`1776`	`1776`	`}`
`1777`	`1777`	`case TR_ResolvedMethodType::Static:`
`@@ -1787,7 +1787,7 @@ handleServerMessage(JITServer::ClientStream client, TR_J9VM fe, JITServer::Mes`
`1787`	`1787`	`case TR_ResolvedMethodType::ImproperInterface:`
`1788`	`1788`	`{`
`1789`	`1789`	`resolvedMethod = static_cast<TR_ResolvedJ9Method *>(owningMethod->getResolvedImproperInterfaceMethod(comp, cpIndex));`
`1790`		`- vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot(cpIndex) : 0;`
	`1790`	`+ vTableOffset = resolvedMethod ? resolvedMethod->vTableSlot() : 0;`
`1791`	`1791`	`break;`
`1792`	`1792`	`}`
`1793`	`1793`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -1024,15 +1024,6 @@ TR_ResolvedRelocatableJ9Method::TR_ResolvedRelocatableJ9Method(TR_OpaqueMethodBl`
`1024`	`1024`	`setRecognizedMethod(TR::unknownMethod);`
`1025`	`1025`	`}`
`1026`	`1026`	`}`
`1027`		`-`
`1028`		`-`
`1029`		`- }`
`1030`		`-`
`1031`		`-int32_t`
`1032`		`-TR_ResolvedRelocatableJ9Method::virtualCallSelector(U_32 cpIndex)`
`1033`		`- {`
`1034`		`- return TR_ResolvedJ9Method::virtualCallSelector(cpIndex);`
`1035`		`- //return -1;`
`1036`	`1027`	`}`
`1037`	`1028`
`1038`	`1029`	`bool`
`@@ -5487,9 +5478,9 @@ TR_ResolvedJ9Method::getExistingJittedBodyInfo()`
`5487`	`5478`	`}`
`5488`	`5479`
`5489`	`5480`	`int32_t`
`5490`		`-TR_ResolvedJ9Method::virtualCallSelector(U_32 cpIndex)`
	`5481`	`+TR_ResolvedJ9Method::virtualCallSelector()`
`5491`	`5482`	`{`
`5492`		`- return -(int32_t)(vTableSlot(cpIndex) - TR::Compiler->vm.getInterpreterVTableOffset());`
	`5483`	`+ return -(int32_t)(vTableSlot() - TR::Compiler->vm.getInterpreterVTableOffset());`
`5493`	`5484`	`}`
`5494`	`5485`
`5495`	`5486`	`bool`
`@@ -6487,10 +6478,8 @@ TR_ResolvedJ9Method::startAddressForJNIMethod(TR::Compilation * comp)`
`6487`	`6478`	`}`
`6488`	`6479`
`6489`	`6480`	`U_32`
`6490`		`-TR_ResolvedJ9Method::vTableSlot(U_32 cpIndex)`
	`6481`	`+TR_ResolvedJ9Method::vTableSlot()`
`6491`	`6482`	`{`
`6492`		`- TR_ASSERT(cpIndex != -1, "cpIndex shouldn't be -1");`
`6493`		`- //UDATA vTableSlot = ((J9RAMVirtualMethodRef *)literals())[cpIndex].methodIndexAndArgCount >> 8;`
`6494`	`6483`	`return _vTableSlot;`
`6495`	`6484`	`}`
`6496`	`6485`