Merge pull request #7101 from jdmpapin/ram-method-sequence

Stop special-casing unevaluated aconst in Power and ARM linkage
eclipse-omr · Aug 29, 2023 · 027fe9b · 027fe9b
2 parents 2c797b1 + a336ce0
commit 027fe9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/compiler/arm/codegen/OMRLinkage.cpp b/compiler/arm/codegen/OMRLinkage.cpp
@@ -399,21 +399,7 @@ TR::Register *OMR::ARM::Linkage::pushIntegerWordArg(TR::Node *child)
 
 TR::Register *OMR::ARM::Linkage::pushAddressArg(TR::Node *child)
    {
-   TR::CodeGenerator *cg      = self()->cg();
-   TR::Register         *pushRegister = NULL;
-   if (child->getRegister() == NULL && child->getOpCode().isLoadConst())
-      {
-      pushRegister = cg->allocateRegister();
-      if (child->isMethodPointerConstant())
-         loadAddressConstant(self()->cg(), child, child->getAddress(), pushRegister, NULL, false, TR_RamMethodSequence);
-      else
-         loadAddressConstant(self()->cg(), child, child->getAddress(), pushRegister);
-      }
-   else
-      {
-      pushRegister = cg->evaluate(child);
-      child->setRegister(pushRegister);
-      }
+   TR::Register *pushRegister = self()->cg()->evaluate(child);
    child->decReferenceCount();
    return pushRegister;
    }

diff --git a/compiler/p/codegen/OMRLinkage.cpp b/compiler/p/codegen/OMRLinkage.cpp
@@ -723,22 +723,8 @@ TR::Register *OMR::Power::Linkage::pushIntegerWordArg(TR::Node *child)
 
 TR::Register *OMR::Power::Linkage::pushAddressArg(TR::Node *child)
    {
-   TR::Register *pushRegister = NULL;
    TR_ASSERT(child->getDataType() == TR::Address, "assumption violated");
-   if (child->getRegister() == NULL && child->getOpCode().isLoadConst())
-      {
-      pushRegister = self()->cg()->allocateRegister();
-      if (child->isMethodPointerConstant())
-         loadAddressConstant(self()->cg(), self()->cg()->comp()->compileRelocatableCode(), child, child->getAddress(), pushRegister, NULL, false, TR_RamMethodSequence);
-      else
-         loadAddressConstant(self()->cg(), self()->cg()->comp()->compileRelocatableCode(), child, child->getAddress(), pushRegister);
-
-      child->setRegister(pushRegister);
-      }
-   else
-      {
-      pushRegister = self()->cg()->evaluate(child);
-      }
+   TR::Register *pushRegister = self()->cg()->evaluate(child);
    self()->cg()->decReferenceCount(child);
    return pushRegister;
    }