archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact

Browse source 
Reviewed-by: jrose, kvn
This commit is contained in:
Christian Thalinger 2013-05-06 13:53:13 -07:00
parent 1763afaec5
commit 149097fbb7
4 changed files with 69 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -883,15 +883,23 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
}
JNI_ENTRY(void, throw_unsatisfied_link_error(JNIEnv* env, ...))
/**
* Throws an java/lang/UnsatisfiedLinkError. The address of this method is
* installed in the native function entry of all native Java methods before
* they get linked to their actual native methods.
*
* \note
* This method actually never gets called! The reason is because
* the interpreter's native entries call NativeLookup::lookup() which
* throws the exception when the lookup fails. The exception is then
* caught and forwarded on the return from NativeLookup::lookup() call
* before the call to the native function. This might change in the future.
*/
JNI_ENTRY(void*, throw_unsatisfied_link_error(JNIEnv* env, ...))
{
THROW(vmSymbols::java_lang_UnsatisfiedLinkError());
}
JNI_END
JNI_ENTRY(void, throw_unsupported_operation_exception(JNIEnv* env, ...))
{
THROW(vmSymbols::java_lang_UnsupportedOperationException());
// We return a bad value here to make sure that the exception is
// forwarded before we look at the return value.
THROW_(vmSymbols::java_lang_UnsatisfiedLinkError(), (void*)badJNIHandle);
}
JNI_END
@ -899,10 +907,6 @@ address SharedRuntime::native_method_throw_unsatisfied_link_error_entry() {
return CAST_FROM_FN_PTR(address, &throw_unsatisfied_link_error);
}
address SharedRuntime::native_method_throw_unsupported_operation_exception_entry() {
return CAST_FROM_FN_PTR(address, &throw_unsupported_operation_exception);
}
#ifndef PRODUCT
JRT_ENTRY(intptr_t, SharedRuntime::trace_bytecode(JavaThread* thread, intptr_t preserve_this_value, intptr_t tos, intptr_t tos2))