Mercurial > hg > truffle
diff src/share/vm/interpreter/linkResolver.cpp @ 6729:d17383603741
7196120: NPG: JSR 2292 test fails because missing fix for 7188911
Reviewed-by: kvn, coleenp
author | twisti |
---|---|
date | Tue, 04 Sep 2012 18:01:20 -0700 |
parents | da91efe96a93 |
children | f6b0eb4e44cf |
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp Tue Sep 04 23:27:55 2012 +0200 +++ b/src/share/vm/interpreter/linkResolver.cpp Tue Sep 04 18:01:20 2012 -0700 @@ -1265,7 +1265,7 @@ 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 @@ // 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); }