Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/output.cpp	Fri Jan 23 15:18:50 2015 -0800
     1.2 +++ b/src/share/vm/opto/output.cpp	Thu Jan 22 11:25:23 2015 -0800
     1.3 @@ -2473,7 +2473,7 @@
     1.4        if( iop == Op_Con ) continue;      // Do not schedule Top
     1.5        if( iop == Op_Node &&     // Do not schedule PhiNodes, ProjNodes
     1.6            mach->pipeline() == MachNode::pipeline_class() &&
     1.7 -          !n->is_SpillCopy() )  // Breakpoints, Prolog, etc
     1.8 +          !n->is_SpillCopy() && !n->is_MachMerge() )  // Breakpoints, Prolog, etc
     1.9          continue;
    1.10        break;                    // Funny loop structure to be sure...
    1.11      }