1.1 --- a/src/share/vm/interpreter/interpreterRuntime.cpp Mon Oct 18 01:54:24 2010 -0700
1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.cpp Tue Oct 19 02:52:57 2010 -0700
1.3 @@ -720,8 +720,8 @@
1.4 // first resolve the signature to a MH.invoke methodOop
1.5 if (!pool->cache()->entry_at(main_index)->is_resolved(bytecode)) {
1.6 JvmtiHideSingleStepping jhss(thread);
1.7 - CallInfo info;
1.8 - LinkResolver::resolve_invoke(info, Handle(), pool,
1.9 + CallInfo callinfo;
1.10 + LinkResolver::resolve_invoke(callinfo, Handle(), pool,
1.11 site_index, bytecode, CHECK);
1.12 // The main entry corresponds to a JVM_CONSTANT_InvokeDynamic, and serves
1.13 // as a common reference point for all invokedynamic call sites with
1.14 @@ -729,8 +729,8 @@
1.15 // as if it were an invokevirtual of MethodHandle.invoke.
1.16 pool->cache()->entry_at(main_index)->set_method(
1.17 bytecode,
1.18 - info.resolved_method(),
1.19 - info.vtable_index());
1.20 + callinfo.resolved_method(),
1.21 + callinfo.vtable_index());
1.22 }
1.23
1.24 // The method (f2 entry) of the main entry is the MH.invoke for the
