Mercurial > hg > graal-jvmci-8
comparison src/share/vm/opto/output.cpp @ 22821:93c6b977591b
8071302: assert(!_reg_node[reg_lo] || edge_from_to(_reg_node[reg_lo], def)) failed: after block local
Summary: Add merge nodes to node to block mapping
Reviewed-by: kvn, vlivanov
author | iveresov |
---|---|
date | Thu, 22 Jan 2015 11:25:23 -0800 |
parents | fc2c88ea11a9 |
children | dd9cc155639c c3d0bd36ab28 |
comparison
equal
deleted
inserted
replaced
22820:4011ee1230e3 | 22821:93c6b977591b |
---|---|
2471 int iop = mach->ideal_Opcode(); | 2471 int iop = mach->ideal_Opcode(); |
2472 if( iop == Op_CreateEx ) continue; // CreateEx is pinned | 2472 if( iop == Op_CreateEx ) continue; // CreateEx is pinned |
2473 if( iop == Op_Con ) continue; // Do not schedule Top | 2473 if( iop == Op_Con ) continue; // Do not schedule Top |
2474 if( iop == Op_Node && // Do not schedule PhiNodes, ProjNodes | 2474 if( iop == Op_Node && // Do not schedule PhiNodes, ProjNodes |
2475 mach->pipeline() == MachNode::pipeline_class() && | 2475 mach->pipeline() == MachNode::pipeline_class() && |
2476 !n->is_SpillCopy() ) // Breakpoints, Prolog, etc | 2476 !n->is_SpillCopy() && !n->is_MachMerge() ) // Breakpoints, Prolog, etc |
2477 continue; | 2477 continue; |
2478 break; // Funny loop structure to be sure... | 2478 break; // Funny loop structure to be sure... |
2479 } | 2479 } |
2480 // Compute last "interesting" instruction in block - last instruction we | 2480 // Compute last "interesting" instruction in block - last instruction we |
2481 // might schedule. _bb_end points just after last schedulable inst. We | 2481 // might schedule. _bb_end points just after last schedulable inst. We |