1.1 --- a/src/share/vm/opto/lcm.cpp Wed Jul 27 15:06:35 2011 -0700
1.2 +++ b/src/share/vm/opto/lcm.cpp Wed Jul 27 17:28:36 2011 -0700
1.3 @@ -325,7 +325,7 @@
1.4 // that also need to be hoisted.
1.5 for (DUIterator_Fast jmax, j = val->fast_outs(jmax); j < jmax; j++) {
1.6 Node* n = val->fast_out(j);
1.7 - if( n->Opcode() == Op_MachProj ) {
1.8 + if( n->is_MachProj() ) {
1.9 cfg->_bbs[n->_idx]->find_remove(n);
1.10 this->add_inst(n);
1.11 cfg->_bbs.map(n->_idx,this);
1.12 @@ -347,7 +347,7 @@
1.13 // Should be DU safe because no edge updates.
1.14 for (DUIterator_Fast jmax, j = best->fast_outs(jmax); j < jmax; j++) {
1.15 Node* n = best->fast_out(j);
1.16 - if( n->Opcode() == Op_MachProj ) {
1.17 + if( n->is_MachProj() ) {
1.18 cfg->_bbs[n->_idx]->find_remove(n);
1.19 add_inst(n);
1.20 cfg->_bbs.map(n->_idx,this);
1.21 @@ -539,7 +539,7 @@
1.22 Node* m = this_call->fast_out(i);
1.23 if( bbs[m->_idx] == this && // Local-block user
1.24 m != this_call && // Not self-start node
1.25 - m->is_Call() )
1.26 + m->is_MachCall() )
1.27 call = m;
1.28 break;
1.29 }
1.30 @@ -557,7 +557,7 @@
1.31 // Collect all the defined registers.
1.32 for (DUIterator_Fast imax, i = mcall->fast_outs(imax); i < imax; i++) {
1.33 Node* n = mcall->fast_out(i);
1.34 - assert( n->Opcode()==Op_MachProj, "" );
1.35 + assert( n->is_MachProj(), "" );
1.36 --ready_cnt[n->_idx];
1.37 assert( !ready_cnt[n->_idx], "" );
1.38 // Schedule next to call
1.39 @@ -975,8 +975,8 @@
1.40 if( !_nodes[end]->is_Catch() ) return;
1.41 // Start of region to clone
1.42 uint beg = end;
1.43 - while( _nodes[beg-1]->Opcode() != Op_MachProj ||
1.44 - !_nodes[beg-1]->in(0)->is_Call() ) {
1.45 + while(!_nodes[beg-1]->is_MachProj() ||
1.46 + !_nodes[beg-1]->in(0)->is_MachCall() ) {
1.47 beg--;
1.48 assert(beg > 0,"Catch cleanup walking beyond block boundary");
1.49 }
