changeset 56505:7b70f269fe0d

8224538: LoadBarrierNode::common_barrier must check address Reviewed-by: thartmann, kvn
author neliasso
date Fri, 31 May 2019 10:13:24 +0200
parents d4475420fb9a
children f91999057a5a
files src/hotspot/share/gc/z/c2/zBarrierSetC2.cpp
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 &&