1.1 --- a/src/share/vm/c1/c1_GraphBuilder.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/c1/c1_GraphBuilder.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -887,7 +887,7 @@
1.4 patch_state = copy_state_before();
1.5 t = new ObjectConstant(obj);
1.6 } else {
1.7 - assert(!obj->is_klass(), "must be java_mirror of klass");
1.8 + assert(obj->is_instance(), "must be java_mirror of klass");
1.9 t = new InstanceConstant(obj->as_instance());
1.10 }
1.11 break;
1.12 @@ -1434,7 +1434,7 @@
1.13 if (compilation()->env()->dtrace_method_probes()) {
1.14 // Report exit from inline methods
1.15 Values* args = new Values(1);
1.16 - args->push(append(new Constant(new ObjectConstant(method()))));
1.17 + args->push(append(new Constant(new MethodConstant(method()))));
1.18 append(new RuntimeCall(voidType, "dtrace_method_exit", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), args));
1.19 }
1.20
1.21 @@ -1887,7 +1887,7 @@
1.22 code == Bytecodes::_invokeinterface;
1.23 Values* args = state()->pop_arguments(target->arg_size_no_receiver());
1.24 Value recv = has_receiver ? apop() : NULL;
1.25 - int vtable_index = methodOopDesc::invalid_vtable_index;
1.26 + int vtable_index = Method::invalid_vtable_index;
1.27
1.28 #ifdef SPARC
1.29 // Currently only supported on Sparc.
1.30 @@ -3544,7 +3544,7 @@
1.31 // Report exit from inline methods. We don't have a stream here
1.32 // so pass an explicit bci of SynchronizationEntryBCI.
1.33 Values* args = new Values(1);
1.34 - args->push(append_with_bci(new Constant(new ObjectConstant(method())), bci));
1.35 + args->push(append_with_bci(new Constant(new MethodConstant(method())), bci));
1.36 append_with_bci(new RuntimeCall(voidType, "dtrace_method_exit", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_exit), args), bci);
1.37 }
1.38
1.39 @@ -3732,7 +3732,7 @@
1.40
1.41 if (compilation()->env()->dtrace_method_probes()) {
1.42 Values* args = new Values(1);
1.43 - args->push(append(new Constant(new ObjectConstant(method()))));
1.44 + args->push(append(new Constant(new MethodConstant(method()))));
1.45 append(new RuntimeCall(voidType, "dtrace_method_entry", CAST_FROM_FN_PTR(address, SharedRuntime::dtrace_method_entry), args));
1.46 }
1.47
