1.1 --- a/src/share/vm/opto/doCall.cpp Tue Sep 25 15:48:17 2012 -0700
1.2 +++ b/src/share/vm/opto/doCall.cpp Thu Sep 27 09:38:42 2012 -0700
1.3 @@ -512,15 +512,15 @@
1.4 } else if (rt == T_INT || is_subword_type(rt)) {
1.5 // FIXME: This logic should be factored out.
1.6 if (ct == T_BOOLEAN) {
1.7 - retnode = _gvn.transform( new (C, 3) AndINode(retnode, intcon(0x1)) );
1.8 + retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0x1)) );
1.9 } else if (ct == T_CHAR) {
1.10 - retnode = _gvn.transform( new (C, 3) AndINode(retnode, intcon(0xFFFF)) );
1.11 + retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0xFFFF)) );
1.12 } else if (ct == T_BYTE) {
1.13 - retnode = _gvn.transform( new (C, 3) LShiftINode(retnode, intcon(24)) );
1.14 - retnode = _gvn.transform( new (C, 3) RShiftINode(retnode, intcon(24)) );
1.15 + retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(24)) );
1.16 + retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(24)) );
1.17 } else if (ct == T_SHORT) {
1.18 - retnode = _gvn.transform( new (C, 3) LShiftINode(retnode, intcon(16)) );
1.19 - retnode = _gvn.transform( new (C, 3) RShiftINode(retnode, intcon(16)) );
1.20 + retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(16)) );
1.21 + retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(16)) );
1.22 } else {
1.23 assert(ct == T_INT, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
1.24 }
1.25 @@ -530,7 +530,7 @@
1.26 const TypeOopPtr* arg_type = TypeOopPtr::make_from_klass(rtype->as_klass());
1.27 const Type* sig_type = TypeOopPtr::make_from_klass(ctype->as_klass());
1.28 if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
1.29 - Node* cast_obj = _gvn.transform(new (C, 2) CheckCastPPNode(control(), retnode, sig_type));
1.30 + Node* cast_obj = _gvn.transform(new (C) CheckCastPPNode(control(), retnode, sig_type));
1.31 pop();
1.32 push(cast_obj);
1.33 }
1.34 @@ -612,7 +612,7 @@
1.35 }
1.36
1.37 int len = bcis->length();
1.38 - CatchNode *cn = new (C, 2) CatchNode(control(), i_o, len+1);
1.39 + CatchNode *cn = new (C) CatchNode(control(), i_o, len+1);
1.40 Node *catch_ = _gvn.transform(cn);
1.41
1.42 // now branch with the exception state to each of the (potential)
1.43 @@ -623,14 +623,14 @@
1.44 // Locals are just copied from before the call.
1.45 // Get control from the CatchNode.
1.46 int handler_bci = bcis->at(i);
1.47 - Node* ctrl = _gvn.transform( new (C, 1) CatchProjNode(catch_, i+1,handler_bci));
1.48 + Node* ctrl = _gvn.transform( new (C) CatchProjNode(catch_, i+1,handler_bci));
1.49 // This handler cannot happen?
1.50 if (ctrl == top()) continue;
1.51 set_control(ctrl);
1.52
1.53 // Create exception oop
1.54 const TypeInstPtr* extype = extypes->at(i)->is_instptr();
1.55 - Node *ex_oop = _gvn.transform(new (C, 2) CreateExNode(extypes->at(i), ctrl, i_o));
1.56 + Node *ex_oop = _gvn.transform(new (C) CreateExNode(extypes->at(i), ctrl, i_o));
1.57
1.58 // Handle unloaded exception classes.
1.59 if (saw_unloaded->contains(handler_bci)) {
1.60 @@ -669,7 +669,7 @@
1.61
1.62 // The first CatchProj is for the normal return.
1.63 // (Note: If this is a call to rethrow_Java, this node goes dead.)
1.64 - set_control(_gvn.transform( new (C, 1) CatchProjNode(catch_, CatchProjNode::fall_through_index, CatchProjNode::no_handler_bci)));
1.65 + set_control(_gvn.transform( new (C) CatchProjNode(catch_, CatchProjNode::fall_through_index, CatchProjNode::no_handler_bci)));
1.66 }
1.67
1.68
1.69 @@ -720,7 +720,7 @@
1.70 // I'm loading the class from, I can replace the LoadKlass with the
1.71 // klass constant for the exception oop.
1.72 if( ex_node->is_Phi() ) {
1.73 - ex_klass_node = new (C, ex_node->req()) PhiNode( ex_node->in(0), TypeKlassPtr::OBJECT );
1.74 + ex_klass_node = new (C) PhiNode( ex_node->in(0), TypeKlassPtr::OBJECT );
1.75 for( uint i = 1; i < ex_node->req(); i++ ) {
1.76 Node* p = basic_plus_adr( ex_node->in(i), ex_node->in(i), oopDesc::klass_offset_in_bytes() );
1.77 Node* k = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeInstPtr::KLASS, TypeKlassPtr::OBJECT) );
1.78 @@ -786,7 +786,7 @@
1.79 PreserveJVMState pjvms(this);
1.80 const TypeInstPtr* tinst = TypeOopPtr::make_from_klass_unique(klass)->cast_to_ptr_type(TypePtr::NotNull)->is_instptr();
1.81 assert(klass->has_subklass() || tinst->klass_is_exact(), "lost exactness");
1.82 - Node* ex_oop = _gvn.transform(new (C, 2) CheckCastPPNode(control(), ex_node, tinst));
1.83 + Node* ex_oop = _gvn.transform(new (C) CheckCastPPNode(control(), ex_node, tinst));
1.84 push_ex_oop(ex_oop); // Push exception oop for handler
1.85 #ifndef PRODUCT
1.86 if (PrintOpto && WizardMode) {
