Merge pull request #7014 from a7ehuo/fix-missing-l2a-evaluation-3

Do not skip l2a if the memory reference has unresolved snippet
eclipse-openj9 · Jun 1, 2023 · 0e57234 · 0e57234
2 parents 7bb2131 + 11ca01b
commit 0e57234
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/compiler/p/codegen/OMRMemoryReference.cpp b/compiler/p/codegen/OMRMemoryReference.cpp
@@ -586,7 +586,10 @@ void OMR::Power::MemoryReference::populateMemoryReference(TR::Node *subTree, TR:
    {
    if (cg->comp()->useCompressedPointers())
       {
-      if (subTree->getOpCodeValue() == TR::l2a && subTree->getReferenceCount() == 1 && subTree->getRegister() == NULL)
+      if ((subTree->getOpCodeValue() == TR::l2a) &&
+          (subTree->getReferenceCount() == 1) &&
+          (subTree->getRegister() == NULL) &&
+          !self()->getUnresolvedSnippet())  // If there is unresolved data snippet, l2a cannot be skipped
          {
          cg->decReferenceCount(subTree);
          subTree = subTree->getFirstChild();

diff --git a/compiler/x/codegen/OMRMemoryReference.cpp b/compiler/x/codegen/OMRMemoryReference.cpp
@@ -520,8 +520,10 @@ OMR::X86::MemoryReference::populateMemoryReference(
 
    if (comp->useCompressedPointers())
        {
-       if ((subTree->getOpCodeValue() == TR::l2a) && (subTree->getReferenceCount() == 1) &&
-             (subTree->getRegister() == NULL))
+       if ((subTree->getOpCodeValue() == TR::l2a) &&
+           (subTree->getReferenceCount() == 1) &&
+           (subTree->getRegister() == NULL) &&
+           !self()->hasUnresolvedDataSnippet()) // If there is unresolved data snippet, l2a cannot be skipped
           {
           cg->decReferenceCount(subTree);
           subTree = subTree->getFirstChild();

diff --git a/compiler/z/codegen/OMRMemoryReference.cpp b/compiler/z/codegen/OMRMemoryReference.cpp
@@ -1798,8 +1798,11 @@ OMR::Z::MemoryReference::populateMemoryReference(TR::Node * subTree, TR::CodeGen
 
    noteAllNodesWithRefCountNotOne(nodesBefore, subTree, comp);
 
-   if (((comp->useCompressedPointers() && subTree->getOpCodeValue() == TR::l2a))
-           && (subTree->getReferenceCount() == 1) && (subTree->getRegister() == NULL))
+   if (comp->useCompressedPointers() &&
+       (subTree->getOpCodeValue() == TR::l2a) &&
+       (subTree->getReferenceCount() == 1) &&
+       (subTree->getRegister() == NULL) &&
+       !self()->getUnresolvedSnippet()) // If there is unresolved data snippet, l2a cannot be skipped
       {
       noopNode = subTree;
       subTree = subTree->getFirstChild();