Merge pull request #4708 from andrewcraik/revertPR4699

Revert PR4699 "Added support for loadaddr in copy propagation."
eclipse-omr · Jan 10, 2020 · aabbee9 · aabbee9
2 parents 133aca0 + f394417
commit aabbee9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/compiler/optimizer/CopyPropagation.cpp b/compiler/optimizer/CopyPropagation.cpp
@@ -59,6 +59,7 @@
 #include "optimizer/TransformUtil.hpp"
 #include "ras/Debug.hpp"
 
+
 #define OPT_DETAILS "O^O COPY PROPAGATION: "
 
 
@@ -802,6 +803,7 @@ int32_t TR_CopyPropagation::perform()
 
          if (!useNode) continue;
          if (useNode->getReferenceCount() == 0) continue;
+         if (useNode->getOpCodeValue() == TR::loadaddr) continue;
 
          TR::Node *loadNode, *baseNode;
          int32_t regNumber;
@@ -2242,7 +2244,7 @@ bool TR_CopyPropagation::isCorrectToReplace(TR::Node *useNode, TR::Node *storeNo
 
 TR::Node * TR_CopyPropagation::isLoadVarWithConst(TR::Node *node)
    {
-     if ((node->getOpCode().isLoadVarDirect() || (node->getOpCodeValue() == TR::loadaddr)) &&
+   if (node->getOpCode().isLoadVarDirect() &&
        node->getSymbolReference()->getSymbol()->isAutoOrParm())
       {
       return node;