1.1 --- a/src/share/vm/oops/cpCache.hpp Fri Sep 07 16:42:25 2012 -0400 1.2 +++ b/src/share/vm/oops/cpCache.hpp Mon Sep 10 16:37:22 2012 -0700 1.3 @@ -221,12 +221,14 @@ 1.4 ); 1.5 1.6 void set_method_handle( 1.7 + constantPoolHandle cpool, // holding constant pool (required for locking) 1.8 methodHandle method, // adapter for invokeExact, etc. 1.9 Handle appendix, // stored in refs[f2]; could be a java.lang.invoke.MethodType 1.10 objArrayHandle resolved_references 1.11 ); 1.12 1.13 void set_dynamic_call( 1.14 + constantPoolHandle cpool, // holding constant pool (required for locking) 1.15 methodHandle method, // adapter for this call site 1.16 Handle appendix, // stored in refs[f2]; could be a java.lang.invoke.CallSite 1.17 objArrayHandle resolved_references 1.18 @@ -248,6 +250,7 @@ 1.19 // resolution logic needs to make slightly different assessments about the 1.20 // number and types of arguments. 1.21 void set_method_handle_common( 1.22 + constantPoolHandle cpool, // holding constant pool (required for locking) 1.23 Bytecodes::Code invoke_code, // _invokehandle or _invokedynamic 1.24 methodHandle adapter, // invoker method (f1) 1.25 Handle appendix, // appendix such as CallSite, MethodType, etc. (refs[f2])