Mercurial > hg > truffle
comparison src/share/vm/interpreter/linkResolver.cpp @ 6271:93c71eb28866
7188911: nightly failures after JSR 292 lazy method handle update (round 2)
Reviewed-by: kvn, jrose
author | twisti |
---|---|
date | Tue, 07 Aug 2012 14:32:08 -0700 |
parents | 1d7922586cf6 |
children | da91efe96a93 |
comparison
equal
deleted
inserted
replaced
6270:b72784e722ff | 6271:93c71eb28866 |
---|---|
1263 methodHandle resolved_method = | 1263 methodHandle resolved_method = |
1264 SystemDictionary::find_dynamic_call_site_invoker(current_klass, | 1264 SystemDictionary::find_dynamic_call_site_invoker(current_klass, |
1265 bootstrap_specifier, | 1265 bootstrap_specifier, |
1266 method_name, method_signature, | 1266 method_name, method_signature, |
1267 &resolved_appendix, | 1267 &resolved_appendix, |
1268 CHECK); | 1268 THREAD); |
1269 if (HAS_PENDING_EXCEPTION) { | 1269 if (HAS_PENDING_EXCEPTION) { |
1270 if (TraceMethodHandles) { | 1270 if (TraceMethodHandles) { |
1271 tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, PENDING_EXCEPTION); | 1271 tty->print_cr("invokedynamic throws BSME for "INTPTR_FORMAT, PENDING_EXCEPTION); |
1272 PENDING_EXCEPTION->print(); | 1272 PENDING_EXCEPTION->print(); |
1273 } | 1273 } |
1280 return; | 1280 return; |
1281 } | 1281 } |
1282 // See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS. | 1282 // See the "Linking Exceptions" section for the invokedynamic instruction in the JVMS. |
1283 Handle nested_exception(THREAD, PENDING_EXCEPTION); | 1283 Handle nested_exception(THREAD, PENDING_EXCEPTION); |
1284 CLEAR_PENDING_EXCEPTION; | 1284 CLEAR_PENDING_EXCEPTION; |
1285 THROW_MSG_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), | 1285 THROW_CAUSE(vmSymbols::java_lang_BootstrapMethodError(), nested_exception) |
1286 "BootstrapMethodError", nested_exception) | |
1287 } | 1286 } |
1288 result.set_handle(resolved_method, resolved_appendix, CHECK); | 1287 result.set_handle(resolved_method, resolved_appendix, CHECK); |
1289 } | 1288 } |
1290 | 1289 |
1291 //------------------------------------------------------------------------------------------------------------------------ | 1290 //------------------------------------------------------------------------------------------------------------------------ |