changeset 28724:b228beabcf1f

Merge
author iveresov
date Thu, 22 Jan 2015 21:02:24 +0000
parents 51fe60d9e30c 0a36120cb225
children 7dc31f3b4939
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/opto/output.cpp	Tue Jan 20 11:26:20 2015 +0300
+++ b/hotspot/src/share/vm/opto/output.cpp	Thu Jan 22 21:02:24 2015 +0000
@@ -2475,7 +2475,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...
     }
--- a/hotspot/src/share/vm/opto/postaloc.cpp	Tue Jan 20 11:26:20 2015 +0300
+++ b/hotspot/src/share/vm/opto/postaloc.cpp	Thu Jan 22 21:02:24 2015 +0000
@@ -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);