Merge pull request #22831 from mpirvu/jitserver-cpuimprov

Do not check iTable entries after lastITable cache test at warm

Author: 0xdaryl

runtime/compiler/x/codegen/X86PrivateLinkage.cpp

@@ -2920,7 +2920,8 @@ void J9::X86::PrivateLinkage::buildInterfaceDispatchUsingLastITable (TR::X86Call
                                 interfaceClassReg, cg());
       }
 
-   if (comp()->getOption(TR_DisableITableIterationsAfterLastITableCacheCheck))
+   if (comp()->getOption(TR_DisableITableIterationsAfterLastITableCacheCheck) ||
+       (comp()->getOptLevel() <= warm && !comp()->getOption(TR_EnableITableIterationsAfterLastITableCacheCheckAtWarm)))
       {
       generateLongLabelInstruction(TR::InstOpCode::JNE4, callNode, lookupDispatchSnippetLabel, cg()); // PICBuilder needs this to have a 4-byte offset
       if (comp()->target().is32Bit())

runtime/compiler/z/codegen/S390PrivateLinkage.cpp

@@ -1538,9 +1538,8 @@ getITableIterationsNumber(TR::Compilation * comp, TR::SymbolReference * methodSy
 
    TR_J9VMBase *fej9 = (TR_J9VMBase *)(comp->fe());
    bool trace = comp->getOption(TR_TraceCG);
-   static bool disableITableIterationsAfterLastITableCacheCheck = feGetEnv("TR_DisableITableIterationsAfterLastITableCacheCheck") != NULL;
 
-   if (disableITableIterationsAfterLastITableCacheCheck)
+   if (comp->getOption(TR_DisableITableIterationsAfterLastITableCacheCheck))
       {
       if (trace)
          traceMsg(comp, "ITable iteration after lastITable check is disabled.\n");