comparison 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
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
387 } 387 }
388 388
389 389
390 address NativeLookup::lookup(methodHandle method, bool& in_base_library, TRAPS) { 390 address NativeLookup::lookup(methodHandle method, bool& in_base_library, TRAPS) {
391 if (!method->has_native_function()) { 391 if (!method->has_native_function()) {
392 address entry = 392 address entry = lookup_base(method, in_base_library, CHECK_NULL);
393 method->intrinsic_id() == vmIntrinsics::_invokeGeneric ?
394 SharedRuntime::native_method_throw_unsupported_operation_exception_entry() :
395 lookup_base(method, in_base_library, CHECK_NULL);
396 method->set_native_function(entry, 393 method->set_native_function(entry,
397 Method::native_bind_event_is_interesting); 394 Method::native_bind_event_is_interesting);
398 // -verbose:jni printing 395 // -verbose:jni printing
399 if (PrintJNIResolving) { 396 if (PrintJNIResolving) {
400 ResourceMark rm(THREAD); 397 ResourceMark rm(THREAD);