1.1 --- a/src/share/vm/opto/callGenerator.cpp Tue Sep 25 15:48:17 2012 -0700 1.2 +++ b/src/share/vm/opto/callGenerator.cpp Thu Sep 27 09:38:42 2012 -0700 1.3 @@ -134,7 +134,7 @@ 1.4 kit.C->log()->elem("direct_call bci='%d'", jvms->bci()); 1.5 } 1.6 1.7 - CallStaticJavaNode *call = new (kit.C, tf()->domain()->cnt()) CallStaticJavaNode(tf(), target, method(), kit.bci()); 1.8 + CallStaticJavaNode *call = new (kit.C) CallStaticJavaNode(tf(), target, method(), kit.bci()); 1.9 _call_node = call; // Save the call node in case we need it later 1.10 if (!is_static) { 1.11 // Make an explicit receiver null_check as part of this call. 1.12 @@ -221,7 +221,7 @@ 1.13 "no vtable calls if +UseInlineCaches "); 1.14 address target = SharedRuntime::get_resolve_virtual_call_stub(); 1.15 // Normal inline cache used for call 1.16 - CallDynamicJavaNode *call = new (kit.C, tf()->domain()->cnt()) CallDynamicJavaNode(tf(), target, method(), _vtable_index, kit.bci()); 1.17 + CallDynamicJavaNode *call = new (kit.C) CallDynamicJavaNode(tf(), target, method(), _vtable_index, kit.bci()); 1.18 kit.set_arguments_for_java_call(call); 1.19 kit.set_edges_for_java_call(call); 1.20 Node* ret = kit.set_results_for_java_call(call); 1.21 @@ -300,7 +300,7 @@ 1.22 Compile* C = Compile::current(); 1.23 JVMState* jvms = call->jvms()->clone_shallow(C); 1.24 uint size = call->req(); 1.25 - SafePointNode* map = new (C, size) SafePointNode(size, jvms); 1.26 + SafePointNode* map = new (C) SafePointNode(size, jvms); 1.27 for (uint i1 = 0; i1 < size; i1++) { 1.28 map->init_req(i1, call->in(i1)); 1.29 } 1.30 @@ -551,7 +551,7 @@ 1.31 1.32 // Finish the diamond. 1.33 kit.C->set_has_split_ifs(true); // Has chance for split-if optimization 1.34 - RegionNode* region = new (kit.C, 3) RegionNode(3); 1.35 + RegionNode* region = new (kit.C) RegionNode(3); 1.36 region->init_req(1, kit.control()); 1.37 region->init_req(2, slow_map->control()); 1.38 kit.set_control(gvn.transform(region)); 1.39 @@ -636,7 +636,7 @@ 1.40 const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr(); 1.41 const Type* sig_type = TypeOopPtr::make_from_klass(signature->accessing_klass()); 1.42 if (arg_type != NULL && !arg_type->higher_equal(sig_type)) { 1.43 - Node* cast_obj = gvn.transform(new (C, 2) CheckCastPPNode(kit.control(), arg, sig_type)); 1.44 + Node* cast_obj = gvn.transform(new (C) CheckCastPPNode(kit.control(), arg, sig_type)); 1.45 kit.set_argument(0, cast_obj); 1.46 } 1.47 } 1.48 @@ -648,7 +648,7 @@ 1.49 const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr(); 1.50 const Type* sig_type = TypeOopPtr::make_from_klass(t->as_klass()); 1.51 if (arg_type != NULL && !arg_type->higher_equal(sig_type)) { 1.52 - Node* cast_obj = gvn.transform(new (C, 2) CheckCastPPNode(kit.control(), arg, sig_type)); 1.53 + Node* cast_obj = gvn.transform(new (C) CheckCastPPNode(kit.control(), arg, sig_type)); 1.54 kit.set_argument(receiver_skip + i, cast_obj); 1.55 } 1.56 }