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

     1.1 --- a/src/share/vm/opto/callnode.cpp	Tue Sep 25 15:48:17 2012 -0700
     1.2 +++ b/src/share/vm/opto/callnode.cpp	Thu Sep 27 09:38:42 2012 -0700
     1.3 @@ -72,20 +72,20 @@
     1.4    case TypeFunc::Control:
     1.5    case TypeFunc::I_O:
     1.6    case TypeFunc::Memory:
     1.7 -    return new (match->C, 1) MachProjNode(this,proj->_con,RegMask::Empty,MachProjNode::unmatched_proj);
     1.8 +    return new (match->C) MachProjNode(this,proj->_con,RegMask::Empty,MachProjNode::unmatched_proj);
     1.9    case TypeFunc::FramePtr:
    1.10 -    return new (match->C, 1) MachProjNode(this,proj->_con,Matcher::c_frame_ptr_mask, Op_RegP);
    1.11 +    return new (match->C) MachProjNode(this,proj->_con,Matcher::c_frame_ptr_mask, Op_RegP);
    1.12    case TypeFunc::ReturnAdr:
    1.13 -    return new (match->C, 1) MachProjNode(this,proj->_con,match->_return_addr_mask,Op_RegP);
    1.14 +    return new (match->C) MachProjNode(this,proj->_con,match->_return_addr_mask,Op_RegP);
    1.15    case TypeFunc::Parms:
    1.16    default: {
    1.17        uint parm_num = proj->_con - TypeFunc::Parms;
    1.18        const Type *t = _domain->field_at(proj->_con);
    1.19        if (t->base() == Type::Half)  // 2nd half of Longs and Doubles
    1.20 -        return new (match->C, 1) ConNode(Type::TOP);
    1.21 +        return new (match->C) ConNode(Type::TOP);
    1.22        uint ideal_reg = t->ideal_reg();
    1.23        RegMask &rm = match->_calling_convention_mask[parm_num];
    1.24 -      return new (match->C, 1) MachProjNode(this,proj->_con,rm,ideal_reg);
    1.25 +      return new (match->C) MachProjNode(this,proj->_con,rm,ideal_reg);
    1.26      }
    1.27    }
    1.28    return NULL;
    1.29 @@ -625,12 +625,12 @@
    1.30    case TypeFunc::Control:
    1.31    case TypeFunc::I_O:
    1.32    case TypeFunc::Memory:
    1.33 -    return new (match->C, 1) MachProjNode(this,proj->_con,RegMask::Empty,MachProjNode::unmatched_proj);
    1.34 +    return new (match->C) MachProjNode(this,proj->_con,RegMask::Empty,MachProjNode::unmatched_proj);
    1.35  
    1.36    case TypeFunc::Parms+1:       // For LONG & DOUBLE returns
    1.37      assert(tf()->_range->field_at(TypeFunc::Parms+1) == Type::HALF, "");
    1.38      // 2nd half of doubles and longs
    1.39 -    return new (match->C, 1) MachProjNode(this,proj->_con, RegMask::Empty, (uint)OptoReg::Bad);
    1.40 +    return new (match->C) MachProjNode(this,proj->_con, RegMask::Empty, (uint)OptoReg::Bad);
    1.41  
    1.42    case TypeFunc::Parms: {       // Normal returns
    1.43      uint ideal_reg = tf()->range()->field_at(TypeFunc::Parms)->ideal_reg();
    1.44 @@ -640,7 +640,7 @@
    1.45      RegMask rm = RegMask(regs.first());
    1.46      if( OptoReg::is_valid(regs.second()) )
    1.47        rm.Insert( regs.second() );
    1.48 -    return new (match->C, 1) MachProjNode(this,proj->_con,rm,ideal_reg);
    1.49 +    return new (match->C) MachProjNode(this,proj->_con,rm,ideal_reg);
    1.50    }
    1.51  
    1.52    case TypeFunc::ReturnAdr:
    1.53 @@ -1175,10 +1175,10 @@
    1.54          Node* nproj = catchproj->clone();
    1.55          igvn->register_new_node_with_optimizer(nproj);
    1.56  
    1.57 -        Node *frame = new (phase->C, 1) ParmNode( phase->C->start(), TypeFunc::FramePtr );
    1.58 +        Node *frame = new (phase->C) ParmNode( phase->C->start(), TypeFunc::FramePtr );
    1.59          frame = phase->transform(frame);
    1.60          // Halt & Catch Fire
    1.61 -        Node *halt = new (phase->C, TypeFunc::Parms) HaltNode( nproj, frame );
    1.62 +        Node *halt = new (phase->C) HaltNode( nproj, frame );
    1.63          phase->C->root()->add_req(halt);
    1.64          phase->transform(halt);
    1.65  
    1.66 @@ -1218,7 +1218,7 @@
    1.67        if (!allow_new_nodes) return NULL;
    1.68        // Create a cast which is control dependent on the initialization to
    1.69        // propagate the fact that the array length must be positive.
    1.70 -      length = new (phase->C, 2) CastIINode(length, narrow_length_type);
    1.71 +      length = new (phase->C) CastIINode(length, narrow_length_type);
    1.72        length->set_req(0, initialization()->proj_out(0));
    1.73      }
    1.74    }