1.1 --- a/src/share/vm/opto/callGenerator.cpp Wed Nov 21 05:57:12 2012 -0800
1.2 +++ b/src/share/vm/opto/callGenerator.cpp Mon Nov 26 17:25:11 2012 -0800
1.3 @@ -139,7 +139,7 @@
1.4 if (!is_static) {
1.5 // Make an explicit receiver null_check as part of this call.
1.6 // Since we share a map with the caller, his JVMS gets adjusted.
1.7 - kit.null_check_receiver(method());
1.8 + kit.null_check_receiver_before_call(method());
1.9 if (kit.stopped()) {
1.10 // And dump it back to the caller, decorated with any exceptions:
1.11 return kit.transfer_exceptions_into_jvms();
1.12 @@ -207,7 +207,7 @@
1.13 >= (uint)ImplicitNullCheckThreshold))) {
1.14 // Make an explicit receiver null_check as part of this call.
1.15 // Since we share a map with the caller, his JVMS gets adjusted.
1.16 - receiver = kit.null_check_receiver(method());
1.17 + receiver = kit.null_check_receiver_before_call(method());
1.18 if (kit.stopped()) {
1.19 // And dump it back to the caller, decorated with any exceptions:
1.20 return kit.transfer_exceptions_into_jvms();
1.21 @@ -491,7 +491,7 @@
1.22 jvms->bci(), log->identify(_predicted_receiver));
1.23 }
1.24
1.25 - receiver = kit.null_check_receiver(method());
1.26 + receiver = kit.null_check_receiver_before_call(method());
1.27 if (kit.stopped()) {
1.28 return kit.transfer_exceptions_into_jvms();
1.29 }
1.30 @@ -597,7 +597,7 @@
1.31 switch (iid) {
1.32 case vmIntrinsics::_invokeBasic:
1.33 {
1.34 - // get MethodHandle receiver
1.35 + // Get MethodHandle receiver:
1.36 Node* receiver = kit.argument(0);
1.37 if (receiver->Opcode() == Op_ConP) {
1.38 const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
1.39 @@ -618,7 +618,7 @@
1.40 case vmIntrinsics::_linkToSpecial:
1.41 case vmIntrinsics::_linkToInterface:
1.42 {
1.43 - // pop MemberName argument
1.44 + // Get MemberName argument:
1.45 Node* member_name = kit.argument(callee->arg_size() - 1);
1.46 if (member_name->Opcode() == Op_ConP) {
1.47 const TypeOopPtr* oop_ptr = member_name->bottom_type()->is_oopptr();
