disable inlining of countPositives unless its caller is hasNegatives

eclipse-openj9 · Feb 12, 2025 · 233cf24 · 233cf24
1 parent 2956a35
commit 233cf24
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/runtime/compiler/optimizer/InlinerTempForJ9.cpp b/runtime/compiler/optimizer/InlinerTempForJ9.cpp
@@ -5980,6 +5980,18 @@ TR_InlinerFailureReason
       return Recognized_Callee;
       }
 
+   if (rm == TR::java_lang_StringCoding_countPositives)
+      {
+      if (callsite->_callerResolvedMethod->getRecognizedMethod() == TR::java_lang_StringCoding_hasNegatives)
+         {
+         return InlineableTarget;
+         }
+      else
+         {
+         return DontInline_Callee;
+         }
+      }
+
    return InlineableTarget;
    }
 

diff --git a/runtime/compiler/x/codegen/J9CodeGenerator.cpp b/runtime/compiler/x/codegen/J9CodeGenerator.cpp
@@ -154,7 +154,7 @@ J9::X86::CodeGenerator::initialize()
       {
       cg->setSupportsInlineStringCodingCountPositives();
       }
-#endif
+#endif /* JAVA_SPEC_VERSION < 19 */
 
    static bool disableInlineVectorizedMismatch = feGetEnv("TR_disableInlineVectorizedMismatch") != NULL;
    if (cg->getSupportsArrayCmpLen() &&

diff --git a/runtime/compiler/x/codegen/J9TreeEvaluator.cpp b/runtime/compiler/x/codegen/J9TreeEvaluator.cpp
@@ -12597,7 +12597,7 @@ J9::X86::TreeEvaluator::directCallEvaluator(TR::Node *node, TR::CodeGenerator *c
                }
          }
          break;
-#endif
+#endif /* JAVA_SPEC_VERSION < 19 */
       case TR::java_nio_Bits_keepAlive:
       case TR::java_lang_ref_Reference_reachabilityFence:
          {
-Original file line number
+Diff line change
@@ Expand Up @@
                    }
              }
              break;
-    #endif
+    #endif /* JAVA_SPEC_VERSION < 19 */
           case TR::java_nio_Bits_keepAlive:
           case TR::java_lang_ref_Reference_reachabilityFence:
              {
@@ Expand Down @@