comparison src/share/vm/oops/method.cpp @ 10283:e484fe2abebd

Merge
author twisti
date Thu, 16 May 2013 13:47:55 -0700
parents 92ef81e2f571 f0bc60565ba8
children a1ebd310d5c1
comparison
equal deleted inserted replaced
10272:513a5298c1dd 10283:e484fe2abebd
830 assert(this == h_method(), "wrong h_method()" ); 830 assert(this == h_method(), "wrong h_method()" );
831 address entry = Interpreter::entry_for_method(h_method); 831 address entry = Interpreter::entry_for_method(h_method);
832 assert(entry != NULL, "interpreter entry must be non-null"); 832 assert(entry != NULL, "interpreter entry must be non-null");
833 // Sets both _i2i_entry and _from_interpreted_entry 833 // Sets both _i2i_entry and _from_interpreted_entry
834 set_interpreter_entry(entry); 834 set_interpreter_entry(entry);
835 if (is_native() && !is_method_handle_intrinsic()) { 835
836 // Don't overwrite already registered native entries.
837 if (is_native() && !has_native_function()) {
836 set_native_function( 838 set_native_function(
837 SharedRuntime::native_method_throw_unsatisfied_link_error_entry(), 839 SharedRuntime::native_method_throw_unsatisfied_link_error_entry(),
838 !native_bind_event_is_interesting); 840 !native_bind_event_is_interesting);
839 } 841 }
840 842