Automerge upstream/master

tajila · Jul 25, 2019 · 786c90f · 786c90f
2 parents 2bfa2a9 + 7f06832
commit 786c90f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/runtime/compiler/compile/J9Compilation.cpp b/runtime/compiler/compile/J9Compilation.cpp
@@ -916,11 +916,14 @@ J9::Compilation::verifyCompressedRefsAnchors(bool anchorize)
 #if 0 ///#ifdef DEBUG
                TR_ASSERT(0, "No anchor found for load/store [%p]", n);
 #else
-               // place anchor after tt if its a check
-               // otherwise before
+               // For the child of null check or resolve check, the side effect doesn't rely on the
+               // value of the child, thus the anchor needs to be placed after tt. For other nodes,
+               // place the anchor before tt.
                //
                TR::TreeTop *next = tt->getNextTreeTop();
-               if (tt->getNode()->getOpCode().isCheck())
+               if ((tt->getNode()->getOpCode().isNullCheck()
+                   || tt->getNode()->getOpCode().isResolveCheck())
+                   && n == tt->getNode()->getFirstChild())
                   {
                   tt->join(newTT);
                   newTT->join(next);