Mercurial > hg > graal-compiler
diff src/share/vm/prims/nativeLookup.cpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 10:45:56 +0200 |
| parents | 5fc51c1ecdeb f0bc60565ba8 |
| children | 3489047ffea2 |
line wrap: on
line diff
--- a/src/share/vm/prims/nativeLookup.cpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/prims/nativeLookup.cpp Wed Jun 19 10:45:56 2013 +0200 @@ -389,10 +389,7 @@ address NativeLookup::lookup(methodHandle method, bool& in_base_library, TRAPS) { if (!method->has_native_function()) { - address entry = - method->intrinsic_id() == vmIntrinsics::_invokeGeneric ? - SharedRuntime::native_method_throw_unsupported_operation_exception_entry() : - lookup_base(method, in_base_library, CHECK_NULL); + address entry = lookup_base(method, in_base_library, CHECK_NULL); method->set_native_function(entry, Method::native_bind_event_is_interesting); // -verbose:jni printing