Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/block.cpp	Wed Jul 27 15:06:35 2011 -0700
     1.2 +++ b/src/share/vm/opto/block.cpp	Wed Jul 27 17:28:36 2011 -0700
     1.3 @@ -165,7 +165,7 @@
     1.4    int end_idx = _nodes.size()-1;
     1.5  
     1.6    // Check for ending goto
     1.7 -  if ((end_idx > 0) && (_nodes[end_idx]->is_Goto())) {
     1.8 +  if ((end_idx > 0) && (_nodes[end_idx]->is_MachGoto())) {
     1.9      success_result = empty_with_goto;
    1.10      end_idx--;
    1.11    }
    1.12 @@ -197,11 +197,11 @@
    1.13  bool Block::has_uncommon_code() const {
    1.14    Node* en = end();
    1.15  
    1.16 -  if (en->is_Goto())
    1.17 +  if (en->is_MachGoto())
    1.18      en = en->in(0);
    1.19    if (en->is_Catch())
    1.20      en = en->in(0);
    1.21 -  if (en->is_Proj() && en->in(0)->is_MachCall()) {
    1.22 +  if (en->is_MachProj() && en->in(0)->is_MachCall()) {
    1.23      MachCallNode* call = en->in(0)->as_MachCall();
    1.24      if (call->cnt() != COUNT_UNKNOWN && call->cnt() <= PROB_UNLIKELY_MAG(4)) {
    1.25        // This is true for slow-path stubs like new_{instance,array},
    1.26 @@ -945,8 +945,8 @@
    1.27      assert( bp, "last instruction must be a block proj" );
    1.28      assert( bp == b->_nodes[j], "wrong number of successors for this block" );
    1.29      if( bp->is_Catch() ) {
    1.30 -      while( b->_nodes[--j]->Opcode() == Op_MachProj ) ;
    1.31 -      assert( b->_nodes[j]->is_Call(), "CatchProj must follow call" );
    1.32 +      while( b->_nodes[--j]->is_MachProj() ) ;
    1.33 +      assert( b->_nodes[j]->is_MachCall(), "CatchProj must follow call" );
    1.34      }
    1.35      else if( bp->is_Mach() && bp->as_Mach()->ideal_Opcode() == Op_If ) {
    1.36        assert( b->_num_succs == 2, "Conditional branch must have two targets");