src/share/vm/opto/chaitin.cpp

*** 1728,1738 ****
      return base;
    }
  
    // Now we see we need a base-Phi here to merge the bases
    const Type *t = base->bottom_type();
!   base = new (C) PhiNode( derived->in(0), t );
    for( i = 1; i < derived->req(); i++ ) {
      base->init_req(i, find_base_for_derived(derived_base_map, derived->in(i), maxlrg));
      t = t->meet(base->in(i)->bottom_type());
    }
    base->as_Phi()->set_type(t);
--- 1728,1738 ----
      return base;
    }
  
    // Now we see we need a base-Phi here to merge the bases
    const Type *t = base->bottom_type();
!   base = new PhiNode( derived->in(0), t );
    for( i = 1; i < derived->req(); i++ ) {
      base->init_req(i, find_base_for_derived(derived_base_map, derived->in(i), maxlrg));
      t = t->meet(base->in(i)->bottom_type());
    }
    base->as_Phi()->set_type(t);
*** 1798,1808 ****
          Node *phi = n->in(1);
          if( phi->is_Phi() && phi->as_Phi()->region()->is_Loop() ) {
            Block *phi_block = _cfg.get_block_for_node(phi);
            if (_cfg.get_block_for_node(phi_block->pred(2)) == block) {
              const RegMask *mask = C->matcher()->idealreg2spillmask[Op_RegI];
!             Node *spill = new (C) MachSpillCopyNode(MachSpillCopyNode::LoopPhiInput, phi, *mask, *mask);
              insert_proj( phi_block, 1, spill, maxlrg++ );
              n->set_req(1,spill);
              must_recompute_live = true;
            }
          }
--- 1798,1808 ----
          Node *phi = n->in(1);
          if( phi->is_Phi() && phi->as_Phi()->region()->is_Loop() ) {
            Block *phi_block = _cfg.get_block_for_node(phi);
            if (_cfg.get_block_for_node(phi_block->pred(2)) == block) {
              const RegMask *mask = C->matcher()->idealreg2spillmask[Op_RegI];
!             Node *spill = new MachSpillCopyNode(MachSpillCopyNode::LoopPhiInput, phi, *mask, *mask);
              insert_proj( phi_block, 1, spill, maxlrg++ );
              n->set_req(1,spill);
              must_recompute_live = true;
            }
          }