Mercurial > hg > graal-compiler
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/oops/method.cpp Tue May 14 17:33:07 2013 +0000 +++ b/src/share/vm/oops/method.cpp Thu May 16 13:47:55 2013 -0700 @@ -832,7 +832,9 @@ assert(entry != NULL, "interpreter entry must be non-null"); // Sets both _i2i_entry and _from_interpreted_entry set_interpreter_entry(entry); - if (is_native() && !is_method_handle_intrinsic()) { + + // Don't overwrite already registered native entries. + if (is_native() && !has_native_function()) { set_native_function( SharedRuntime::native_method_throw_unsatisfied_link_error_entry(), !native_bind_event_is_interesting);