hotspot/src/share/vm/opto/loopUnswitch.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)loopUnswitch.cpp     1.6 07/06/29 14:41:32 JVM"
  #endif
  /*
!  * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)loopUnswitch.cpp     1.6 07/06/29 14:41:32 JVM"
  #endif
  /*
!  * Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 52,61 ****
--- 52,64 ----
  // (ie. clone loop with an invariant test that does not exit the loop)
  bool IdealLoopTree::policy_unswitching( PhaseIdealLoop *phase ) const {
    if( !LoopUnswitching ) {
      return false;
    }
+   if (!_head->is_Loop()) {
+     return false;
+   }
    uint nodes_left = MaxNodeLimit - phase->C->unique();
    if (2 * _body.size() > nodes_left) {
      return false; // Too speculative if running low on nodes.
    }
    LoopNode* head = _head->as_Loop();
*** 203,213 ****
    _igvn._worklist.push(entry);
    IdealLoopTree* outer_loop = loop->_parent;
  
    Node *cont      = _igvn.intcon(1);
    set_ctrl(cont, C->root());
!   Node* opq       = new (C, 2) Opaque1Node(cont);
    register_node(opq, outer_loop, entry, dom_depth(entry));
    Node *bol       = new (C, 2) Conv2BNode(opq);
    register_node(bol, outer_loop, entry, dom_depth(entry));
    IfNode* iff = new (C, 2) IfNode(entry, bol, PROB_MAX, COUNT_UNKNOWN);
    register_node(iff, outer_loop, entry, dom_depth(entry));
--- 206,216 ----
    _igvn._worklist.push(entry);
    IdealLoopTree* outer_loop = loop->_parent;
  
    Node *cont      = _igvn.intcon(1);
    set_ctrl(cont, C->root());
!   Node* opq       = new (C, 2) Opaque1Node(C, cont);
    register_node(opq, outer_loop, entry, dom_depth(entry));
    Node *bol       = new (C, 2) Conv2BNode(opq);
    register_node(bol, outer_loop, entry, dom_depth(entry));
    IfNode* iff = new (C, 2) IfNode(entry, bol, PROB_MAX, COUNT_UNKNOWN);
    register_node(iff, outer_loop, entry, dom_depth(entry));