comparison src/share/vm/opto/idealGraphPrinter.cpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 90abdd727e64
children 4cdf4f71177d
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
614 614
615 if (_chaitin && _chaitin != (PhaseChaitin *)0xdeadbeef) { 615 if (_chaitin && _chaitin != (PhaseChaitin *)0xdeadbeef) {
616 buffer[0] = 0; 616 buffer[0] = 0;
617 _chaitin->dump_register(node, buffer); 617 _chaitin->dump_register(node, buffer);
618 print_prop("reg", buffer); 618 print_prop("reg", buffer);
619 print_prop("lrg", _chaitin->_lrg_map.live_range_id(node)); 619 uint lrg_id = 0;
620 if (node->_idx < _chaitin->_lrg_map.size()) {
621 lrg_id = _chaitin->_lrg_map.live_range_id(node);
622 }
623 print_prop("lrg", lrg_id);
620 } 624 }
621 625
622 node->_in_dump_cnt--; 626 node->_in_dump_cnt--;
623 #endif 627 #endif
624 628
637 if (C->cfg() != NULL) { 641 if (C->cfg() != NULL) {
638 // once we have a CFG there are some nodes that aren't really 642 // once we have a CFG there are some nodes that aren't really
639 // reachable but are in the CFG so add them here. 643 // reachable but are in the CFG so add them here.
640 for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) { 644 for (uint i = 0; i < C->cfg()->number_of_blocks(); i++) {
641 Block* block = C->cfg()->get_block(i); 645 Block* block = C->cfg()->get_block(i);
642 for (uint s = 0; s < block->_nodes.size(); s++) { 646 for (uint s = 0; s < block->number_of_nodes(); s++) {
643 nodeStack.push(block->_nodes[s]); 647 nodeStack.push(block->get_node(s));
644 } 648 }
645 } 649 }
646 } 650 }
647 651
648 while(nodeStack.length() > 0) { 652 while(nodeStack.length() > 0) {
711 end_elem(); 715 end_elem();
712 } 716 }
713 tail(SUCCESSORS_ELEMENT); 717 tail(SUCCESSORS_ELEMENT);
714 718
715 head(NODES_ELEMENT); 719 head(NODES_ELEMENT);
716 for (uint s = 0; s < block->_nodes.size(); s++) { 720 for (uint s = 0; s < block->number_of_nodes(); s++) {
717 begin_elem(NODE_ELEMENT); 721 begin_elem(NODE_ELEMENT);
718 print_attr(NODE_ID_PROPERTY, get_node_id(block->_nodes[s])); 722 print_attr(NODE_ID_PROPERTY, get_node_id(block->get_node(s)));
719 end_elem(); 723 end_elem();
720 } 724 }
721 tail(NODES_ELEMENT); 725 tail(NODES_ELEMENT);
722 726
723 tail(BLOCK_ELEMENT); 727 tail(BLOCK_ELEMENT);