1.1 --- a/src/share/vm/opto/superword.cpp Tue Sep 25 15:48:17 2012 -0700
1.2 +++ b/src/share/vm/opto/superword.cpp Thu Sep 27 09:38:42 2012 -0700
1.3 @@ -1451,13 +1451,13 @@
1.4 if (t == NULL || t->_lo < 0 || t->_hi > (int)mask) {
1.5 cnt = ConNode::make(C, TypeInt::make(mask));
1.6 _igvn.register_new_node_with_optimizer(cnt);
1.7 - cnt = new (C, 3) AndINode(opd, cnt);
1.8 + cnt = new (C) AndINode(opd, cnt);
1.9 _igvn.register_new_node_with_optimizer(cnt);
1.10 _phase->set_ctrl(cnt, _phase->get_ctrl(opd));
1.11 }
1.12 assert(opd->bottom_type()->isa_int(), "int type only");
1.13 // Move non constant shift count into XMM register.
1.14 - cnt = new (C, 2) MoveI2FNode(cnt);
1.15 + cnt = new (C) MoveI2FNode(cnt);
1.16 }
1.17 if (cnt != opd) {
1.18 _igvn.register_new_node_with_optimizer(cnt);
1.19 @@ -2021,42 +2021,42 @@
1.20 if (align_to_ref_p.invar() != NULL) {
1.21 // incorporate any extra invariant piece producing (offset +/- invar) >>> log2(elt)
1.22 Node* log2_elt = _igvn.intcon(exact_log2(elt_size));
1.23 - Node* aref = new (_phase->C, 3) URShiftINode(align_to_ref_p.invar(), log2_elt);
1.24 + Node* aref = new (_phase->C) URShiftINode(align_to_ref_p.invar(), log2_elt);
1.25 _igvn.register_new_node_with_optimizer(aref);
1.26 _phase->set_ctrl(aref, pre_ctrl);
1.27 if (align_to_ref_p.negate_invar()) {
1.28 - e = new (_phase->C, 3) SubINode(e, aref);
1.29 + e = new (_phase->C) SubINode(e, aref);
1.30 } else {
1.31 - e = new (_phase->C, 3) AddINode(e, aref);
1.32 + e = new (_phase->C) AddINode(e, aref);
1.33 }
1.34 _igvn.register_new_node_with_optimizer(e);
1.35 _phase->set_ctrl(e, pre_ctrl);
1.36 }
1.37 if (vw > ObjectAlignmentInBytes) {
1.38 // incorporate base e +/- base && Mask >>> log2(elt)
1.39 - Node* xbase = new(_phase->C, 2) CastP2XNode(NULL, align_to_ref_p.base());
1.40 + Node* xbase = new(_phase->C) CastP2XNode(NULL, align_to_ref_p.base());
1.41 _igvn.register_new_node_with_optimizer(xbase);
1.42 #ifdef _LP64
1.43 - xbase = new (_phase->C, 2) ConvL2INode(xbase);
1.44 + xbase = new (_phase->C) ConvL2INode(xbase);
1.45 _igvn.register_new_node_with_optimizer(xbase);
1.46 #endif
1.47 Node* mask = _igvn.intcon(vw-1);
1.48 - Node* masked_xbase = new (_phase->C, 3) AndINode(xbase, mask);
1.49 + Node* masked_xbase = new (_phase->C) AndINode(xbase, mask);
1.50 _igvn.register_new_node_with_optimizer(masked_xbase);
1.51 Node* log2_elt = _igvn.intcon(exact_log2(elt_size));
1.52 - Node* bref = new (_phase->C, 3) URShiftINode(masked_xbase, log2_elt);
1.53 + Node* bref = new (_phase->C) URShiftINode(masked_xbase, log2_elt);
1.54 _igvn.register_new_node_with_optimizer(bref);
1.55 _phase->set_ctrl(bref, pre_ctrl);
1.56 - e = new (_phase->C, 3) AddINode(e, bref);
1.57 + e = new (_phase->C) AddINode(e, bref);
1.58 _igvn.register_new_node_with_optimizer(e);
1.59 _phase->set_ctrl(e, pre_ctrl);
1.60 }
1.61
1.62 // compute e +/- lim0
1.63 if (scale < 0) {
1.64 - e = new (_phase->C, 3) SubINode(e, lim0);
1.65 + e = new (_phase->C) SubINode(e, lim0);
1.66 } else {
1.67 - e = new (_phase->C, 3) AddINode(e, lim0);
1.68 + e = new (_phase->C) AddINode(e, lim0);
1.69 }
1.70 _igvn.register_new_node_with_optimizer(e);
1.71 _phase->set_ctrl(e, pre_ctrl);
1.72 @@ -2064,13 +2064,13 @@
1.73 if (stride * scale > 0) {
1.74 // compute V - (e +/- lim0)
1.75 Node* va = _igvn.intcon(v_align);
1.76 - e = new (_phase->C, 3) SubINode(va, e);
1.77 + e = new (_phase->C) SubINode(va, e);
1.78 _igvn.register_new_node_with_optimizer(e);
1.79 _phase->set_ctrl(e, pre_ctrl);
1.80 }
1.81 // compute N = (exp) % V
1.82 Node* va_msk = _igvn.intcon(v_align - 1);
1.83 - Node* N = new (_phase->C, 3) AndINode(e, va_msk);
1.84 + Node* N = new (_phase->C) AndINode(e, va_msk);
1.85 _igvn.register_new_node_with_optimizer(N);
1.86 _phase->set_ctrl(N, pre_ctrl);
1.87
1.88 @@ -2078,15 +2078,15 @@
1.89 // lim = lim0 + N
1.90 Node* lim;
1.91 if (stride < 0) {
1.92 - lim = new (_phase->C, 3) SubINode(lim0, N);
1.93 + lim = new (_phase->C) SubINode(lim0, N);
1.94 } else {
1.95 - lim = new (_phase->C, 3) AddINode(lim0, N);
1.96 + lim = new (_phase->C) AddINode(lim0, N);
1.97 }
1.98 _igvn.register_new_node_with_optimizer(lim);
1.99 _phase->set_ctrl(lim, pre_ctrl);
1.100 Node* constrained =
1.101 - (stride > 0) ? (Node*) new (_phase->C,3) MinINode(lim, orig_limit)
1.102 - : (Node*) new (_phase->C,3) MaxINode(lim, orig_limit);
1.103 + (stride > 0) ? (Node*) new (_phase->C) MinINode(lim, orig_limit)
1.104 + : (Node*) new (_phase->C) MaxINode(lim, orig_limit);
1.105 _igvn.register_new_node_with_optimizer(constrained);
1.106 _phase->set_ctrl(constrained, pre_ctrl);
1.107 _igvn.hash_delete(pre_opaq);
