archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8031188: Fix for 8029015: PPC64 (part 216): opto: trap based null and range checks

Browse source 
Swap the Projs in the block list so that the new block is added behind the proper node.

Reviewed-by: kvn
This commit is contained in:
Goetz Lindenmaier 2014-01-06 11:02:21 +01:00
parent 9c10079653
commit fe000cd966
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/opto/block.cpp
View file

@ -748,6 +748,11 @@ Block *PhaseCFG::fixup_trap_based_check(Node *branch, Block *block, int block_po
block->_succs.map(0, get_block_for_node(proj_never ->raw_out(0))); // The target of the trap.
block->_succs.map(1, get_block_for_node(proj_always->raw_out(0))); // The fall through target.
if (block->get_node(block->number_of_nodes() - block->_num_succs + 1) != proj_always) {
block->map_node(proj_never, block->number_of_nodes() - block->_num_succs + 0);
block->map_node(proj_always, block->number_of_nodes() - block->_num_succs + 1);
}
// Place the fall through block after this block.
Block *bs1 = block->non_connector_successor(1);
if (bs1 != bnext && move_to_next(bs1, block_pos)) {