Merge pull request #20720 from IBMJimmyk/fixStartPC-v0.49.0

(0.49.0) Change J9::VMMethodEnv::startPC error return value

Author: pshipton

runtime/compiler/env/J9VMMethodEnv.cpp

@@ -67,7 +67,14 @@ uintptr_t
 J9::VMMethodEnv::startPC(TR_OpaqueMethodBlock *method)
    {
    J9Method *j9method = reinterpret_cast<J9Method *>(method);
-   return reinterpret_cast<uintptr_t>(TR::CompilationInfo::getJ9MethodStartPC(j9method));
+   uintptr_t returnStartPC = reinterpret_cast<uintptr_t>(TR::CompilationInfo::getJ9MethodStartPC(j9method));
+
+   if ((returnStartPC & J9_STARTPC_NOT_TRANSLATED) == J9_STARTPC_NOT_TRANSLATED)
+      {
+      returnStartPC = 0;
+      }
+
+   return returnStartPC;
    }
 
 

runtime/compiler/runtime/J9CodeCache.cpp

@@ -552,7 +552,8 @@ J9::CodeCache::addFreeBlock(void  *voidMetaData)
                {
                // There could be several bodyInfo pointing to the same methodInfo
                // Prevent deallocating twice by freeing only for the last body
-               if (TR::Compiler->mtd.startPC((TR_OpaqueMethodBlock*)metaData->ramMethod) == (uintptr_t)metaData->startPC)
+               uintptr_t ramMethodStartPC = TR::Compiler->mtd.startPC((TR_OpaqueMethodBlock*)metaData->ramMethod);
+               if ((ramMethodStartPC != 0) && (ramMethodStartPC == (uintptr_t)metaData->startPC))
                   {
                   // Clear profile info
                   pmi->setBestProfileInfo(NULL);