Disable commoning dataAddrPointer in createStoresForVar()

Addendum to c86da7e Signed-off-by: midronij <[email protected]>
eclipse · Oct 2, 2024 · de2996e · de2996e
1 parent 0601b27
commit de2996e
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/compiler/il/OMRNode.cpp b/compiler/il/OMRNode.cpp
@@ -3911,13 +3911,25 @@ OMR::Node::createStoresForVar(TR::SymbolReference * &nodeRef, TR::TreeTop *inser
  }
  else
  {
- newArrayRef = comp->getSymRefTab()->
-  createTemporary(comp->getMethodSymbol(), TR::Address);
+ TR::Node *arrayObjectNode = NULL;
+ TR::Node *arrayLoadNode = NULL;
 
- TR::Node *newStore = TR::Node::createStore(newArrayRef, child);
+ if (child->isDataAddrPointer())
+ arrayObjectNode = child->getFirstChild();
+
+ newArrayRef = comp->getSymRefTab()->createTemporary(comp->getMethodSymbol(), TR::Address);
+ TR::Node *newStore = TR::Node::createStore(newArrayRef, arrayObjectNode ? arrayObjectNode : child);
  newStoreTree = TR::TreeTop::create(comp, newStore);
+
  newArrayRef->getSymbol()->setPinningArrayPointer();
  pinningArray = newArrayRef->getSymbol()->castToAutoSymbol();
+
+ if (child->isDataAddrPointer())
+ {
+ arrayLoadNode = TR::Node::createLoad(arrayObjectNode, newArrayRef);
+ child->setAndIncChild(0, arrayLoadNode);
+ arrayObjectNode->recursivelyDecReferenceCount();
+ }
  }
  }
  }