diff src/share/vm/opto/cfgnode.cpp @ 13274:c044f8d03932

8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8 8182656: Make the required changes in GC code to build on OSX 10 + Xcode 8 8182657: Make the required changes in Runtime code to build on OSX 10 + Xcode 8 8182658: Make the required changes in Compiler code to build on OSX 10 + Xcode 8 Reviewed-by: jwilhelm, ehelin, phh Contributed-by: phh <hohensee@amazon.com>, jwilhelm <jesper.wilhelmsson@oracle.com>
author jwilhelm
date Thu, 06 Jul 2017 01:50:26 +0200
parents 4358b7205556
children bc075a2f87ad 23d7878acfb7
line wrap: on
line diff
--- a/src/share/vm/opto/cfgnode.cpp	Wed Jul 05 11:03:19 2017 -0700
+++ b/src/share/vm/opto/cfgnode.cpp	Thu Jul 06 01:50:26 2017 +0200
@@ -521,9 +521,9 @@
     // Loop node may have only one input because entry path
     // is removed in PhaseIdealLoop::Dominators().
     assert(!this->is_Loop() || cnt_orig <= 3, "Loop node should have 3 or less inputs");
-    if (this->is_Loop() && (del_it == LoopNode::EntryControl ||
-                            del_it == 0 && is_unreachable_region(phase)) ||
-       !this->is_Loop() && has_phis && is_unreachable_region(phase)) {
+    if ((this->is_Loop() && (del_it == LoopNode::EntryControl ||
+                             (del_it == 0 && is_unreachable_region(phase)))) ||
+        (!this->is_Loop() && has_phis && is_unreachable_region(phase))) {
       // Yes,  the region will be removed during the next step below.
       // Cut the backedge input and remove phis since no data paths left.
       // We don't cut outputs to other nodes here since we need to put them
@@ -1689,8 +1689,8 @@
       bool is_loop = (r->is_Loop() && r->req() == 3);
       // Then, check if there is a data loop when phi references itself directly
       // or through other data nodes.
-      if (is_loop && !uin->eqv_uncast(in(LoopNode::EntryControl)) ||
-         !is_loop && is_unsafe_data_reference(uin)) {
+      if ((is_loop && !uin->eqv_uncast(in(LoopNode::EntryControl))) ||
+          (!is_loop && is_unsafe_data_reference(uin))) {
         // Break this data loop to avoid creation of a dead loop.
         if (can_reshape) {
           return top;