1.1 --- a/src/share/vm/runtime/sharedRuntime.cpp Thu Mar 19 09:13:24 2009 -0700 1.2 +++ b/src/share/vm/runtime/sharedRuntime.cpp Fri Mar 20 23:19:36 2009 -0700 1.3 @@ -675,48 +675,6 @@ 1.4 JRT_END 1.5 1.6 1.7 -// --------------------------------------------------------------------------------------------------------- 1.8 -// Non-product code 1.9 -#ifndef PRODUCT 1.10 - 1.11 -void SharedRuntime::verify_caller_frame(frame caller_frame, methodHandle callee_method) { 1.12 - ResourceMark rm; 1.13 - assert (caller_frame.is_interpreted_frame(), "sanity check"); 1.14 - assert (callee_method->has_compiled_code(), "callee must be compiled"); 1.15 - methodHandle caller_method (Thread::current(), caller_frame.interpreter_frame_method()); 1.16 - jint bci = caller_frame.interpreter_frame_bci(); 1.17 - methodHandle method = find_callee_method_inside_interpreter(caller_frame, caller_method, bci); 1.18 - assert (callee_method == method, "incorrect method"); 1.19 -} 1.20 - 1.21 -methodHandle SharedRuntime::find_callee_method_inside_interpreter(frame caller_frame, methodHandle caller_method, int bci) { 1.22 - EXCEPTION_MARK; 1.23 - Bytecode_invoke* bytecode = Bytecode_invoke_at(caller_method, bci); 1.24 - methodHandle staticCallee = bytecode->static_target(CATCH); // Non-product code 1.25 - 1.26 - bytecode = Bytecode_invoke_at(caller_method, bci); 1.27 - int bytecode_index = bytecode->index(); 1.28 - Bytecodes::Code bc = bytecode->adjusted_invoke_code(); 1.29 - 1.30 - Handle receiver; 1.31 - if (bc == Bytecodes::_invokeinterface || 1.32 - bc == Bytecodes::_invokevirtual || 1.33 - bc == Bytecodes::_invokespecial) { 1.34 - symbolHandle signature (THREAD, staticCallee->signature()); 1.35 - receiver = Handle(THREAD, retrieve_receiver(signature, caller_frame)); 1.36 - } else { 1.37 - receiver = Handle(); 1.38 - } 1.39 - CallInfo result; 1.40 - constantPoolHandle constants (THREAD, caller_method->constants()); 1.41 - LinkResolver::resolve_invoke(result, receiver, constants, bytecode_index, bc, CATCH); // Non-product code 1.42 - methodHandle calleeMethod = result.selected_method(); 1.43 - return calleeMethod; 1.44 -} 1.45 - 1.46 -#endif // PRODUCT 1.47 - 1.48 - 1.49 JRT_ENTRY_NO_ASYNC(void, SharedRuntime::register_finalizer(JavaThread* thread, oopDesc* obj)) 1.50 assert(obj->is_oop(), "must be a valid oop"); 1.51 assert(obj->klass()->klass_part()->has_finalizer(), "shouldn't be here otherwise");