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

     1.1 --- a/src/share/vm/opto/phaseX.cpp	Mon Aug 26 16:12:20 2013 +0200
     1.2 +++ b/src/share/vm/opto/phaseX.cpp	Mon Aug 26 12:50:23 2013 +0200
     1.3 @@ -1648,10 +1648,10 @@
     1.4      bool block_not_printed = true;
     1.5  
     1.6      // and each instruction within a block
     1.7 -    uint end_index = block->_nodes.size();
     1.8 +    uint end_index = block->number_of_nodes();
     1.9      // block->end_idx() not valid after PhaseRegAlloc
    1.10      for( uint instruction_index = 1; instruction_index < end_index; ++instruction_index ) {
    1.11 -      Node     *n = block->_nodes.at(instruction_index);
    1.12 +      Node     *n = block->get_node(instruction_index);
    1.13        if( n->is_Mach() ) {
    1.14          MachNode *m = n->as_Mach();
    1.15          int deleted_count = 0;
    1.16 @@ -1673,7 +1673,7 @@
    1.17              }
    1.18              // Print instructions being deleted
    1.19              for( int i = (deleted_count - 1); i >= 0; --i ) {
    1.20 -              block->_nodes.at(instruction_index-i)->as_Mach()->format(_regalloc); tty->cr();
    1.21 +              block->get_node(instruction_index-i)->as_Mach()->format(_regalloc); tty->cr();
    1.22              }
    1.23              tty->print_cr("replaced with");
    1.24              // Print new instruction
    1.25 @@ -1687,11 +1687,11 @@
    1.26            //  the node index to live range mappings.)
    1.27            uint safe_instruction_index = (instruction_index - deleted_count);
    1.28            for( ; (instruction_index > safe_instruction_index); --instruction_index ) {
    1.29 -            block->_nodes.remove( instruction_index );
    1.30 +            block->remove_node( instruction_index );
    1.31            }
    1.32            // install new node after safe_instruction_index
    1.33 -          block->_nodes.insert( safe_instruction_index + 1, m2 );
    1.34 -          end_index = block->_nodes.size() - 1; // Recompute new block size
    1.35 +          block->insert_node(m2, safe_instruction_index + 1);
    1.36 +          end_index = block->number_of_nodes() - 1; // Recompute new block size
    1.37            NOT_PRODUCT( inc_peepholes(); )
    1.38          }
    1.39        }