Use FE query to add relocations for TR_HelperAddress (#4454)

Use FE query to add relocations for TR_HelperAddress
eclipse-openj9 · Oct 31, 2019 · b28a393 · b28a393
2 parents ad3f01b + 464c81d
commit b28a393
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/compiler/codegen/OMRCodeGenerator.hpp b/compiler/codegen/OMRCodeGenerator.hpp
@@ -1159,6 +1159,10 @@ class OMR_EXTENSIBLE CodeGenerator
    bool needRelocationsForBodyInfoData() { return false; }
    bool needRelocationsForPersistentInfoData() { return false; }
 
+   // This query can be used if we need to decide whether data represented by TR_HelperAddress or TR_AbsoluteHelperAddress
+   // relocation type needs a relocation record.
+   bool needRelocationsForHelpers() { return false; }
+
    // --------------------------------------------------------------------------
    // Snippets
    //

diff --git a/compiler/x/codegen/X86BinaryEncoding.cpp b/compiler/x/codegen/X86BinaryEncoding.cpp
@@ -2624,7 +2624,7 @@ TR::AMD64RegImm64Instruction::addMetaDataForCodeAddress(uint8_t *cursor)
    TR::SymbolReference *methodSymRef = getNode()->getOpCode().hasSymbolReference()?getNode()->getSymbolReference():NULL;
 
 #ifdef J9_PROJECT_SPECIFIC
-   if (comp->fej9()->helpersNeedRelocation())
+   if (cg()->needRelocationsForHelpers())
       {
       if (getNode()->getOpCode().hasSymbolReference() &&
           methodSymRef &&

diff --git a/compiler/z/codegen/OpMemToMem.cpp b/compiler/z/codegen/OpMemToMem.cpp
@@ -125,7 +125,7 @@ MemToMemVarLenMacroOp::generateLoop()
          _raReg = _cg->allocateRegister();
 
       //use literal for aot to make it easier for relocation
-      if (comp->compileRelocatableCode())
+      if (_cg->needRelocationsForHelpers())
          {
          generateRegLitRefInstruction(_cg, TR::InstOpCode::getLoadOpCode(), _rootNode, _raReg, (uintptrj_t)getHelperSymRef(), TR_HelperAddress, NULL, NULL, NULL);
          }