archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7188911: nightly failures after JSR 292 lazy method handle update (round 2)

Browse source 
Reviewed-by: kvn, jrose
This commit is contained in:
Christian Thalinger 2012-08-07 14:32:08 -07:00
parent e409ee94ae
commit e622fcdc27
11 changed files with 147 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/interpreter/linkResolver.cpp
View file

@ -1265,7 +1265,7 @@ void LinkResolver::resolve_dynamic_call(CallInfo& result,
bootstrap_specifier,
method_name, method_signature,
&resolved_appendix,
CHECK);
THREAD);
if (HAS_PENDING_EXCEPTION) {
if (TraceMethodHandles) {
tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, PENDING_EXCEPTION);
@ -1282,8 +1282,7 @@ void LinkResolver::resolve_dynamic_call(CallInfo& result,
// See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS.
Handle nested_exception(THREAD, PENDING_EXCEPTION);
CLEAR_PENDING_EXCEPTION;
THROW_MSG_CAUSE(vmSymbols::java_lang_BootstrapMethodError(),
"BootstrapMethodError", nested_exception)
THROW_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), nested_exception)
}
result.set_handle(resolved_method, resolved_appendix, CHECK);
}