1.1 --- a/src/share/vm/oops/cpCache.hpp Fri Nov 02 07:44:11 2012 -0700
1.2 +++ b/src/share/vm/oops/cpCache.hpp Fri Nov 02 12:30:46 2012 -0700
1.3 @@ -117,6 +117,8 @@
1.4 // The fields are volatile so that they are stored in the order written in the
1.5 // source code. The _indices field with the bytecode must be written last.
1.6
1.7 +class CallInfo;
1.8 +
1.9 class ConstantPoolCacheEntry VALUE_OBJ_CLASS_SPEC {
1.10 friend class VMStructs;
1.11 friend class constantPoolCacheKlass;
1.12 @@ -223,18 +225,12 @@
1.13
1.14 void set_method_handle(
1.15 constantPoolHandle cpool, // holding constant pool (required for locking)
1.16 - methodHandle method, // adapter for invokeExact, etc.
1.17 - Handle appendix, // stored in refs[f2+0]; could be a java.lang.invoke.MethodType
1.18 - Handle method_type, // stored in refs[f2+1]; is a java.lang.invoke.MethodType
1.19 - objArrayHandle resolved_references
1.20 + const CallInfo &call_info // Call link information
1.21 );
1.22
1.23 void set_dynamic_call(
1.24 constantPoolHandle cpool, // holding constant pool (required for locking)
1.25 - methodHandle method, // adapter for this call site
1.26 - Handle appendix, // stored in refs[f2+0]; could be a java.lang.invoke.CallSite
1.27 - Handle method_type, // stored in refs[f2+1]; is a java.lang.invoke.MethodType
1.28 - objArrayHandle resolved_references
1.29 + const CallInfo &call_info // Call link information
1.30 );
1.31
1.32 // Common code for invokedynamic and MH invocations.
1.33 @@ -255,10 +251,7 @@
1.34 void set_method_handle_common(
1.35 constantPoolHandle cpool, // holding constant pool (required for locking)
1.36 Bytecodes::Code invoke_code, // _invokehandle or _invokedynamic
1.37 - methodHandle adapter, // invoker method (f1)
1.38 - Handle appendix, // appendix such as CallSite, MethodType, etc. (refs[f2+0])
1.39 - Handle method_type, // MethodType (refs[f2+1])
1.40 - objArrayHandle resolved_references
1.41 + const CallInfo &call_info // Call link information
1.42 );
1.43
1.44 // invokedynamic and invokehandle call sites have two entries in the
