Recognize the rdbar op code in NullChk evaluator (#4100)

Recognize the rdbar op code in NullChk evaluator
eclipse · Jul 4, 2019 · 8a77e0c · 8a77e0c
2 parents 6dc0df4 + af7af89
commit 8a77e0c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/compiler/z/codegen/ControlFlowEvaluator.cpp b/compiler/z/codegen/ControlFlowEvaluator.cpp
@@ -2275,7 +2275,8 @@ TR::Register *OMR::Z::TreeEvaluator::evaluateNULLCHKWithPossibleResolve(TR::Node
                reference->setIsNonNull(true);
                n = reference->getFirstChild();
                TR::ILOpCodes loadOp = comp->il.opCodeForIndirectLoad(TR::Int32);
-               while (n->getOpCodeValue() != loadOp)
+               TR::ILOpCodes rdbarOp = comp->il.opCodeForIndirectReadBarrier(TR::Int32);
+               while (n->getOpCodeValue() != loadOp && n->getOpCodeValue() != rdbarOp)
                   {
                   n->setIsNonZero(true);
                   n = n->getFirstChild();