jdk-sandbox: comparison hotspot/src/share/vm/prims/methodHandles.cpp

equal deleted inserted replaced

-:5d84243241ac
+:4a783069663c
 void MethodHandles::verify_vmargslot(Handle mh, int argnum, int argslot, TRAPS) {
 // Verify that argslot points at the given argnum.
 int check_slot = argument_slot(java_lang_invoke_MethodHandle::type(mh()), argnum);
 if (argslot != check_slot || argslot < 0) {
+ResourceMark rm;
 const char* fmt = "for argnum of %d, vmargslot is %d, should be %d";
 size_t msglen = strlen(fmt) + 3*11 + 1;
 char* msg = NEW_RESOURCE_ARRAY(char, msglen);
 jio_snprintf(msg, msglen, fmt, argnum, argslot, check_slot);
 THROW_MSG(vmSymbols::java_lang_InternalError(), msg);
 // are binding the receiver, cut out the middle-man.
 // Do this by decoding the DMH and using its methodOop directly as vmtarget.
 bool direct_to_method = false;
 if (OptimizeMethodHandles &&
 target->klass() == SystemDictionary::DirectMethodHandle_klass() &&
+(argnum != 0 || java_lang_invoke_BoundMethodHandle::argument(mh()) != NULL) &&
 (argnum == 0 || java_lang_invoke_DirectMethodHandle::vmindex(target()) < 0)) {
 KlassHandle receiver_limit; int decode_flags = 0;
 methodHandle m = decode_method(target(), receiver_limit, decode_flags);
 if (m.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "DMH failed to decode"); }
 DEBUG_ONLY(int m_vmslots = m->size_of_parameters() - slots_pushed); // pos. of 1st arg.
 {
 if (!src || src != dest) {
 err = "adapter requires src/dest conversion subfields for swap"; break;
 }
 int swap_size = type2size[src];
-int slot_limit = java_lang_invoke_MethodHandle::vmslots(target());
 int src_slot   = argslot;
 int dest_slot  = vminfo;
 bool rotate_up = (src_slot > dest_slot); // upward rotation
 int src_arg    = argnum;
 int dest_arg   = argument_slot_to_argnum(dst_mtype(), dest_slot);
 case _adapter_swap_args:
 case _adapter_rot_args:
 {
 int swap_slots = type2size[src];
-int slot_limit = java_lang_invoke_AdapterMethodHandle::vmslots(mh());
 int src_slot   = argslot;
 int dest_slot  = vminfo;
 int rotate     = (ek_orig == _adapter_swap_args) ? 0 : (src_slot > dest_slot) ? 1 : -1;
 switch (swap_slots) {
 case 1:
 JVM_ENTRY(void, MHN_init_DMH(JNIEnv *env, jobject igcls, jobject mh_jh,
 jobject target_jh, jboolean do_dispatch, jobject caller_jh)) {
 ResourceMark rm;              // for error messages
 // This is the guy we are initializing:
-if (mh_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (mh_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "self is null"); }
 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh));
 // Early returns out of this method leave the DMH in an unfinished state.
 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null");
 // which method are we really talking about?
-if (target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
 Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
 if (java_lang_invoke_MemberName::is_instance(target()) &&
 java_lang_invoke_MemberName::vmindex(target()) == VM_INDEX_UNINITIALIZED) {
 MethodHandles::resolve_MemberName(target, CHECK);
 }
 JVM_ENTRY(void, MHN_init_BMH(JNIEnv *env, jobject igcls, jobject mh_jh,
 jobject target_jh, int argnum)) {
 ResourceMark rm;              // for error messages
 // This is the guy we are initializing:
-if (mh_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (mh_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "self is null"); }
 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh));
 // Early returns out of this method leave the BMH in an unfinished state.
 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null");
-if (target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
 Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
 if (!java_lang_invoke_MethodHandle::is_instance(target())) {
 // Target object is a reflective method.  (%%% Do we need this alternate path?)
 Untested("init_BMH of non-MH");
 // adapter method handles
 JVM_ENTRY(void, MHN_init_AMH(JNIEnv *env, jobject igcls, jobject mh_jh,
 jobject target_jh, int argnum)) {
 // This is the guy we are initializing:
-if (mh_jh == NULL || target_jh == NULL) {
+if (mh_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "self is null"); }
-THROW(vmSymbols::java_lang_InternalError());
+if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
-}
 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh));
 Handle target(THREAD, JNIHandles::resolve_non_null(target_jh));
 // Early returns out of this method leave the AMH in an unfinished state.
 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null");
 }
 JVM_END
 // void init(MemberName self, AccessibleObject ref)
 JVM_ENTRY(void, MHN_init_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jobject target_jh)) {
-if (mname_jh == NULL || target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
+if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); }
 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
 oop target_oop = JNIHandles::resolve_non_null(target_jh);
 MethodHandles::init_MemberName(mname(), target_oop);
 }
 JVM_END
 // void expand(MemberName self)
 JVM_ENTRY(void, MHN_expand_Mem(JNIEnv *env, jobject igcls, jobject mname_jh)) {
-if (mname_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
 MethodHandles::expand_MemberName(mname, 0, CHECK);
 }
 JVM_END
 // void resolve(MemberName self, Class<?> caller)
 JVM_ENTRY(void, MHN_resolve_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jclass caller_jh)) {
-if (mname_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); }
+if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); }
 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh));
 // The trusted Java code that calls this method should already have performed
 // access checks on behalf of the given caller.  But, we can verify this.
 if (VerifyMethodHandles && caller_jh != NULL) {

changeset 9963	4a783069663c
parent 9947	34a0c9670b78
child 9967	9ddc1c490930