# HG changeset patch
# User iveresov
# Date 1421954723 28800
# Node ID 93c6b977591b0464f83b0df860e27a24fa9e7fe9
# Parent  4011ee1230e30fced4cab20c401e5543dfc359c8
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

diff -r 4011ee1230e3 -r 93c6b977591b src/share/vm/opto/output.cpp
--- a/src/share/vm/opto/output.cpp	Fri Jan 23 15:18:50 2015 -0800
+++ b/src/share/vm/opto/output.cpp	Thu Jan 22 11:25:23 2015 -0800
@@ -2473,7 +2473,7 @@
       if( iop == Op_Con ) continue;      // Do not schedule Top
       if( iop == Op_Node &&     // Do not schedule PhiNodes, ProjNodes
           mach->pipeline() == MachNode::pipeline_class() &&
-          !n->is_SpillCopy() )  // Breakpoints, Prolog, etc
+          !n->is_SpillCopy() && !n->is_MachMerge() )  // Breakpoints, Prolog, etc
         continue;
       break;                    // Funny loop structure to be sure...
     }
diff -r 4011ee1230e3 -r 93c6b977591b src/share/vm/opto/postaloc.cpp
--- a/src/share/vm/opto/postaloc.cpp	Fri Jan 23 15:18:50 2015 -0800
+++ b/src/share/vm/opto/postaloc.cpp	Thu Jan 22 11:25:23 2015 -0800
@@ -428,6 +428,7 @@
         // Insert the merge node into the block before the first use.
         uint use_index = block->find_node(reg2defuse.at(reg).first_use());
         block->insert_node(merge, use_index++);
+        _cfg.map_node_to_block(merge, block);
 
         // Let the allocator know about the new node, use the same lrg
         _lrg_map.extend(merge->_idx, lrg);