Merge pull request #20176 from rmnattas/off-heap-helper

Insert loading dataAddr in calculateElementAddress for OffHeap
eclipse-openj9 · Sep 17, 2024 · 8393fab · 8393fab
2 parents 099fe61 + 346ee44
commit 8393fab
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/runtime/compiler/optimizer/J9TransformUtil.cpp b/runtime/compiler/optimizer/J9TransformUtil.cpp
@@ -2126,6 +2126,12 @@ TR::Node * J9::TransformUtil::calculateElementAddress(TR::Compilation *comp, TR:
    offset->setIsNonNegative(true);
    // Calculate element address
    TR::Node *addrCalc = NULL;
+
+#if defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION)
+   if (TR::Compiler->om.isOffHeapAllocationEnabled())
+      array = TR::TransformUtil::generateDataAddrLoadTrees(comp, array);
+#endif /* J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION */
+
    if (comp->target().is64Bit())
       addrCalc = TR::Node::create(TR::aladd, 2, array, offset);
    else