# HG changeset patch
# User neliasso
# Date 1559290404 -7200
# Node ID 7b70f269fe0d2e95262a1c70f2312a0f52185593
# Parent  d4475420fb9a70b22616d2d20bbdc68205839dc4
8224538: LoadBarrierNode::common_barrier must check address
Reviewed-by: thartmann, kvn

diff -r d4475420fb9a -r 7b70f269fe0d src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
--- a/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp	Fri May 31 08:27:06 2019 +0530
+++ b/src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp	Fri May 31 10:13:24 2019 +0200
@@ -1336,10 +1336,9 @@
       Node* other_ctrl = u->in(LoadBarrierNode::Control);
 
       Node* lca = phase->dom_lca(this_ctrl, other_ctrl);
-      bool ok = true;
-
       Node* proj1 = NULL;
       Node* proj2 = NULL;
+      bool ok = (lb->in(LoadBarrierNode::Address) == u->in(LoadBarrierNode::Address));
 
       while (this_ctrl != lca && ok) {
         if (this_ctrl->in(0) != NULL &&