1.1 --- a/src/share/vm/prims/methodHandles.hpp Fri Apr 15 08:29:26 2011 -0700
1.2 +++ b/src/share/vm/prims/methodHandles.hpp Mon Apr 18 01:33:28 2011 -0700
1.3 @@ -265,13 +265,13 @@
1.4 static inline address from_interpreted_entry(EntryKind ek);
1.5
1.6 // helpers for decode_method.
1.7 - static methodOop decode_methodOop(methodOop m, int& decode_flags_result);
1.8 - static methodOop decode_vmtarget(oop vmtarget, int vmindex, oop mtype, klassOop& receiver_limit_result, int& decode_flags_result);
1.9 - static methodOop decode_MemberName(oop mname, klassOop& receiver_limit_result, int& decode_flags_result);
1.10 - static methodOop decode_MethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result);
1.11 - static methodOop decode_DirectMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result);
1.12 - static methodOop decode_BoundMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result);
1.13 - static methodOop decode_AdapterMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result);
1.14 + static methodOop decode_methodOop(methodOop m, int& decode_flags_result);
1.15 + static methodHandle decode_vmtarget(oop vmtarget, int vmindex, oop mtype, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.16 + static methodHandle decode_MemberName(oop mname, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.17 + static methodHandle decode_MethodHandle(oop mh, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.18 + static methodHandle decode_DirectMethodHandle(oop mh, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.19 + static methodHandle decode_BoundMethodHandle(oop mh, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.20 + static methodHandle decode_AdapterMethodHandle(oop mh, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.21
1.22 // Find out how many stack slots an mh pushes or pops.
1.23 // The result is *not* reported as a multiple of stack_move_unit();
1.24 @@ -317,7 +317,7 @@
1.25 _dmf_adapter_lsb = 0x20,
1.26 _DMF_ADAPTER_MASK = (_dmf_adapter_lsb << CONV_OP_LIMIT) - _dmf_adapter_lsb
1.27 };
1.28 - static methodOop decode_method(oop x, klassOop& receiver_limit_result, int& decode_flags_result);
1.29 + static methodHandle decode_method(oop x, KlassHandle& receiver_limit_result, int& decode_flags_result);
1.30 enum {
1.31 // format of query to getConstant:
1.32 GC_JVM_PUSH_LIMIT = 0,
