--- a/hotspot/src/share/vm/opto/parse1.cpp Wed Nov 21 05:57:12 2012 -0800
+++ b/hotspot/src/share/vm/opto/parse1.cpp Mon Nov 26 17:25:11 2012 -0800
@@ -1008,7 +1008,7 @@
// If this is an inlined method, we may have to do a receiver null check.
if (_caller->has_method() && is_normal_parse() && !method()->is_static()) {
GraphKit kit(_caller);
- kit.null_check_receiver(method());
+ kit.null_check_receiver_before_call(method());
_caller = kit.transfer_exceptions_into_jvms();
if (kit.stopped()) {
_exits.add_exception_states_from(_caller);
@@ -1398,7 +1398,7 @@
#ifdef ASSERT
int pre_bc_sp = sp();
int inputs, depth;
- bool have_se = !stopped() && compute_stack_effects(inputs, depth, /*for_parse*/ true);
+ bool have_se = !stopped() && compute_stack_effects(inputs, depth);
assert(!have_se || pre_bc_sp >= inputs, err_msg_res("have enough stack to execute this BC: pre_bc_sp=%d, inputs=%d", pre_bc_sp, inputs));
#endif //ASSERT