Mercurial > hg > truffle

diff src/share/vm/interpreter/bytecode.cpp @ 1135:e66fd840cb6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164) Summary: During the work for 6829187 we have fixed a number of basic bugs which are logically grouped with 6815692 and 6858164 but which must be reviewed and pushed separately. Reviewed-by: kvn, never
author twisti
date Mon, 04 Jan 2010 18:38:08 +0100
parents bd02caa94611
children c18cbe5936b8 ab102d5d923e
line wrap: on
line diff
--- a/src/share/vm/interpreter/bytecode.cpp	Mon Jan 04 07:04:46 2010 -0800
+++ b/src/share/vm/interpreter/bytecode.cpp	Mon Jan 04 18:38:08 2010 +0100
@@ -102,7 +102,9 @@
   KlassHandle resolved_klass;
   constantPoolHandle constants(THREAD, _method->constants());
 
-  if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
+  if (adjusted_invoke_code() == Bytecodes::_invokedynamic) {
+    LinkResolver::resolve_dynamic_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
+  } else if (adjusted_invoke_code() != Bytecodes::_invokeinterface) {
     LinkResolver::resolve_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));
   } else {
     LinkResolver::resolve_interface_method(m, resolved_klass, constants, index(), CHECK_(methodHandle()));