1.1 --- a/src/share/vm/opto/ifg.cpp Mon Aug 05 15:03:40 2013 -0700 1.2 +++ b/src/share/vm/opto/ifg.cpp Wed Aug 07 17:56:19 2013 +0200 1.3 @@ -565,7 +565,7 @@ 1.4 lrgs(r)._def = 0; 1.5 } 1.6 n->disconnect_inputs(NULL, C); 1.7 - _cfg._bbs.map(n->_idx,NULL); 1.8 + _cfg.unmap_node_from_block(n); 1.9 n->replace_by(C->top()); 1.10 // Since yanking a Node from block, high pressure moves up one 1.11 hrp_index[0]--; 1.12 @@ -607,7 +607,7 @@ 1.13 if( n->is_SpillCopy() 1.14 && lrgs(r).is_singledef() // MultiDef live range can still split 1.15 && n->outcnt() == 1 // and use must be in this block 1.16 - && _cfg._bbs[n->unique_out()->_idx] == b ) { 1.17 + && _cfg.get_block_for_node(n->unique_out()) == b ) { 1.18 // All single-use MachSpillCopy(s) that immediately precede their 1.19 // use must color early. If a longer live range steals their 1.20 // color, the spill copy will split and may push another spill copy