From d3e5330edece7ea0fcbec1831f90208f839e4b84 Mon Sep 17 00:00:00 2001 From: midronij Date: Thu, 3 Oct 2024 15:15:22 -0400 Subject: [PATCH] Fix offheap guard for OMR Use OMR_GC_SPARSE_HEAP_ALLOCATION instead of J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION in setmemoryEvaluator. Signed-off-by: midronij --- compiler/p/codegen/OMRTreeEvaluator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/p/codegen/OMRTreeEvaluator.cpp b/compiler/p/codegen/OMRTreeEvaluator.cpp index 84e180da920..d0645496f4d 100644 --- a/compiler/p/codegen/OMRTreeEvaluator.cpp +++ b/compiler/p/codegen/OMRTreeEvaluator.cpp @@ -6071,7 +6071,7 @@ TR::Register *OMR::Power::TreeEvaluator::setmemoryEvaluator(TR::Node *node, TR:: TR::addDependency(conditions, temp2Reg, TR::RealRegister::NoReg, TR_GPR, cg); -#if defined (J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) +#if defined (OMR_GC_SPARSE_HEAP_ALLOCATION) if (arrayCheckNeeded) // CASE (3) { @@ -6134,7 +6134,7 @@ TR::Register *OMR::Power::TreeEvaluator::setmemoryEvaluator(TR::Node *node, TR:: generateTrg1Src2Instruction(cg, TR::InstOpCode::add, node, dstAddrReg, dstBaseAddrReg, dstOffsetReg); } -#endif /* J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION */ +#endif /* OMR_GC_SPARSE_HEAP_ALLOCATION */ // assemble the double word value from byte value if (cg->comp()->target().cpu.isAtLeast(OMR_PROCESSOR_PPC_P8))