Merge
authorkvn
Wed, 30 Nov 2016 20:40:41 +0000
changeset 42623 84b7a7824600
parent 42621 f2598e832afa (current diff)
parent 42622 0d672faf5c79 (diff)
child 42626 85ae0f5efe6e
Merge
--- a/hotspot/src/share/vm/opto/loopTransform.cpp	Wed Nov 23 14:36:32 2016 +0100
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp	Wed Nov 30 20:40:41 2016 +0000
@@ -1742,7 +1742,7 @@
               // The result of the reduction must not be used in the loop
               for (DUIterator_Fast imax, i = def_node->fast_outs(imax); i < imax && ok; i++) {
                 Node* u = def_node->fast_out(i);
-                if (has_ctrl(u) && !loop->is_member(get_loop(get_ctrl(u)))) {
+                if (!loop->is_member(get_loop(ctrl_or_self(u)))) {
                   continue;
                 }
                 if (u == phi) {