src/share/vm/opto/loopnode.hpp

rev 4236 : imported patch JDK-8008811

*** 601,611 ****
      }
      return ctrl;
    }
  
  public:
!   bool has_node( Node* n ) const { return _nodes[n->_idx] != NULL; }
    // check if transform created new nodes that need _ctrl recorded
    Node *get_late_ctrl( Node *n, Node *early );
    Node *get_early_ctrl( Node *n );
    Node *get_early_ctrl_for_expensive(Node *n, Node* earliest);
    void set_early_ctrl( Node *n );
--- 601,618 ----
      }
      return ctrl;
    }
  
  public:
!   bool has_node( Node* n ) const {
!     assert(n != NULL, "No Node.");
!     if (n == NULL) {
!       return false;
!     } else {
!       return _nodes[n->_idx] != NULL;
!     }
!   }
    // check if transform created new nodes that need _ctrl recorded
    Node *get_late_ctrl( Node *n, Node *early );
    Node *get_early_ctrl( Node *n );
    Node *get_early_ctrl_for_expensive(Node *n, Node* earliest);
    void set_early_ctrl( Node *n );
*** 736,747 ****
--- 743,760 ----
      _idom[didx] = n;            // Lazily remove dead CFG nodes from table.
      return n;
    }
    uint dom_depth(Node* d) const {
      assert(d->_idx < _idom_size, "");
+     assert(d != NULL, "Null dominator info.");
+     if (d == NULL) {
+       ShouldNotReachHere();
+       return 0;
+     } else {
        return _dom_depth[d->_idx];
      }
+   }
    void set_idom(Node* d, Node* n, uint dom_depth);
    // Locally compute IDOM using dom_lca call
    Node *compute_idom( Node *region ) const;
    // Recompute dom_depth
    void recompute_dom_depth();