Merge pull request #5463 from dchopra001/callUsesHelper

Add new callUsesHelperImplementation
eclipse · Aug 14, 2020 · c84f6f9 · c84f6f9
2 parents b0d762d + ae81f71
commit c84f6f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/compiler/z/codegen/OMRCodeGenerator.hpp b/compiler/z/codegen/OMRCodeGenerator.hpp
@@ -213,6 +213,16 @@ class OMR_EXTENSIBLE CodeGenerator : public OMR::CodeGenerator
    void insertInstructionPrefetchesForCalls(TR_BranchPreloadCallData * data);
    bool hasWarmCallsBeforeReturn();
 
+   /**
+    * @brief Answers whether a method call is implemented using an internal runtime
+    *           helper routine (ex. a j2iTransition)
+    *
+    * @param[in] sym : The symbol holding the call information
+    *
+    * @return : true if the call is represented by a helper; false otherwise.
+    */
+   bool callUsesHelperImplementation(TR::Symbol *sym) { return false; }
+
    /**
     * @brief Answers whether a trampoline is required for a direct call instruction to
     *           reach a target address.

diff --git a/compiler/z/codegen/S390Instruction.cpp b/compiler/z/codegen/S390Instruction.cpp
@@ -2440,7 +2440,7 @@ TR::S390RILInstruction::generateBinaryEncoding()
             TR::Symbol *sym = getSymbolReference() ? getSymbolReference()->getSymbol() : NULL;
             TR::ResolvedMethodSymbol *resolvedMethodSym = sym ? sym->getResolvedMethodSymbol() : NULL;
             TR_ResolvedMethod *resolvedMethod = resolvedMethodSym ? resolvedMethodSym->getResolvedMethod() : NULL;
-            if (sym && sym->castToMethodSymbol()->isHelper())
+            if (sym && (sym->castToMethodSymbol()->isHelper() || cg()->callUsesHelperImplementation(sym)))
                {
                AOTcgDiag1(comp, "add TR_HelperAddress cursor=%x\n", cursor);
                cg()->addProjectSpecializedRelocation(cursor+2, (uint8_t*) getSymbolReference(), NULL, TR_HelperAddress,