graal-jvmci-8: src/share/vm/prims/methodHandles.cpp comparison

comparison src/share/vm/prims/methodHandles.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Tue, 01 Apr 2014 13:57:07 +0200
parents	d8041d695d19
children	89152779163c

comparison

equal deleted inserted replaced

-:8db6e76cb658
+:4ca6dc0799b6
 return NULL;
 }
 oop MethodHandles::init_method_MemberName(Handle mname, CallInfo& info) {
 assert(info.resolved_appendix().is_null(), "only normal methods here");
+KlassHandle receiver_limit = info.resolved_klass();
 methodHandle m = info.resolved_method();
-KlassHandle m_klass = m->method_holder();
 int flags = (jushort)( m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS );
 int vmindex = Method::invalid_vtable_index;
 switch (info.call_kind()) {
 case CallInfo::itable_call:
 vmindex = info.itable_index();
 // More importantly, the itable index only works with the method holder.
-assert(m_klass->verify_itable_index(vmindex), "");
+receiver_limit = m->method_holder();
+assert(receiver_limit->verify_itable_index(vmindex), "");
 flags |= IS_METHOD | (JVM_REF_invokeInterface << REFERENCE_KIND_SHIFT);
 if (TraceInvokeDynamic) {
 ResourceMark rm;
-tty->print_cr("memberName: invokeinterface method_holder::method: %s, itableindex: %d, access_flags:",
+tty->print_cr("memberName: invokeinterface method_holder::method: %s, receiver: %s, itableindex: %d, access_flags:",
-Method::name_and_sig_as_C_string(m->method_holder(), m->name(), m->signature()),
+Method::name_and_sig_as_C_string(receiver_limit(), m->name(), m->signature()),
-vmindex);
+receiver_limit()->internal_name(), vmindex);
 m->access_flags().print_on(tty);
 if (!m->is_abstract()) {
 tty->print("default");
 }
 tty->cr();
 break;
 case CallInfo::vtable_call:
 vmindex = info.vtable_index();
 flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT);
-assert(info.resolved_klass()->is_subtype_of(m_klass()), "virtual call must be type-safe");
+assert(receiver_limit->is_subtype_of(m->method_holder()), "virtual call must be type-safe");
-if (m_klass->is_interface()) {
-// This is a vtable call to an interface method (abstract "miranda method" or default method).
-// The vtable index is meaningless without a class (not interface) receiver type, so get one.
-// (LinkResolver should help us figure this out.)
-KlassHandle m_klass_non_interface = info.resolved_klass();
-if (m_klass_non_interface->is_interface()) {
-m_klass_non_interface = SystemDictionary::Object_klass();
-#ifdef ASSERT
-{ ResourceMark rm;
-Method* m2 = m_klass_non_interface->vtable()->method_at(vmindex);
-assert(m->name() == m2->name() && m->signature() == m2->signature(),
-err_msg("at %d, %s != %s", vmindex,
-m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string()));
-}
-#endif //ASSERT
-}
-if (!m->is_public()) {
-assert(m->is_public(), "virtual call must be to public interface method");
-return NULL;  // elicit an error later in product build
-}
-assert(info.resolved_klass()->is_subtype_of(m_klass_non_interface()), "virtual call must be type-safe");
-m_klass = m_klass_non_interface;
-}
 if (TraceInvokeDynamic) {
 ResourceMark rm;
 tty->print_cr("memberName: invokevirtual method_holder::method: %s, receiver: %s, vtableindex: %d, access_flags:",
-Method::name_and_sig_as_C_string(m->method_holder(), m->name(), m->signature()),
+Method::name_and_sig_as_C_string(receiver_limit(), m->name(), m->signature()),
-m_klass->internal_name(), vmindex);
+receiver_limit()->internal_name(), vmindex);
 m->access_flags().print_on(tty);
 if (m->is_default_method()) {
 tty->print("default");
 }
 tty->cr();
 vmindex = Method::nonvirtual_vtable_index;
 if (m->is_static()) {
 flags |= IS_METHOD      | (JVM_REF_invokeStatic  << REFERENCE_KIND_SHIFT);
 } else if (m->is_initializer()) {
 flags |= IS_CONSTRUCTOR | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
+assert(receiver_limit == m->method_holder(), "constructor call must be exactly typed");
 } else {
 flags |= IS_METHOD      | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT);
+assert(receiver_limit->is_subtype_of(m->method_holder()), "special call must be type-safe");
 }
 break;
 default:  assert(false, "bad CallInfo");  return NULL;
 }
 oop mname_oop = mname();
 java_lang_invoke_MemberName::set_flags(   mname_oop, flags);
 java_lang_invoke_MemberName::set_vmtarget(mname_oop, m());
 java_lang_invoke_MemberName::set_vmindex( mname_oop, vmindex);   // vtable/itable index
-java_lang_invoke_MemberName::set_clazz(   mname_oop, m_klass->java_mirror());
+java_lang_invoke_MemberName::set_clazz(   mname_oop, receiver_limit->java_mirror());
 // Note:  name and type can be lazily computed by resolve_MemberName,
 // if Java code needs them as resolved String and MethodType objects.
 // The clazz must be eagerly stored, because it provides a GC
 // root to help keep alive the Method*.
 // If relevant, the vtable or itable value is stored as vmindex.
 // An unresolved member name is a mere symbolic reference.
 // Resolving it plants a vmtarget/vmindex in it,
 // which refers directly to JVM internals.
-Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS) {
+Handle MethodHandles::resolve_MemberName(Handle mname, TRAPS) {
 Handle empty;
 assert(java_lang_invoke_MemberName::is_instance(mname()), "");
 if (java_lang_invoke_MemberName::vmtarget(mname()) != NULL) {
 // Already resolved.
 CallInfo result;
 {
 assert(!HAS_PENDING_EXCEPTION, "");
 if (ref_kind == JVM_REF_invokeStatic) {
 LinkResolver::resolve_static_call(result,
-defc, name, type, caller, caller.not_null(), false, THREAD);
+defc, name, type, KlassHandle(), false, false, THREAD);
 } else if (ref_kind == JVM_REF_invokeInterface) {
 LinkResolver::resolve_interface_call(result, Handle(), defc,
-defc, name, type, caller, caller.not_null(), false, THREAD);
+defc, name, type, KlassHandle(), false, false, THREAD);
 } else if (mh_invoke_id != vmIntrinsics::_none) {
 assert(!is_signature_polymorphic_static(mh_invoke_id), "");
 LinkResolver::resolve_handle_call(result,
-defc, name, type, caller, THREAD);
+defc, name, type, KlassHandle(), THREAD);
 } else if (ref_kind == JVM_REF_invokeSpecial) {
 LinkResolver::resolve_special_call(result,
-defc, name, type, caller, caller.not_null(), THREAD);
+defc, name, type, KlassHandle(), false, THREAD);
 } else if (ref_kind == JVM_REF_invokeVirtual) {
 LinkResolver::resolve_virtual_call(result, Handle(), defc,
-defc, name, type, caller, caller.not_null(), false, THREAD);
+defc, name, type, KlassHandle(), false, false, THREAD);
 } else {
 assert(false, err_msg("ref_kind=%d", ref_kind));
 }
 if (HAS_PENDING_EXCEPTION) {
 return empty;
 CallInfo result;
 {
 assert(!HAS_PENDING_EXCEPTION, "");
 if (name == vmSymbols::object_initializer_name()) {
 LinkResolver::resolve_special_call(result,
-defc, name, type, caller, caller.not_null(), THREAD);
+defc, name, type, KlassHandle(), false, THREAD);
 } else {
 break;                // will throw after end of switch
 }
 if (HAS_PENDING_EXCEPTION) {
 return empty;
 case IS_FIELD:
 {
 fieldDescriptor result; // find_field initializes fd if found
 {
 assert(!HAS_PENDING_EXCEPTION, "");
-LinkResolver::resolve_field(result, defc, name, type, caller, Bytecodes::_nop, false, false, THREAD);
+LinkResolver::resolve_field(result, defc, name, type, KlassHandle(), Bytecodes::_nop, false, false, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 return empty;
 }
 }
 oop mname2 = init_field_MemberName(mname, result, ref_kind_is_setter(ref_kind));
 THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), reference_klass->external_name());
 }
 }
 }
-KlassHandle caller(THREAD,
+Handle resolved = MethodHandles::resolve_MemberName(mname, CHECK_NULL);
-caller_jh == NULL ? (Klass*) NULL :
-java_lang_Class::as_Klass(JNIHandles::resolve_non_null(caller_jh)));
-Handle resolved = MethodHandles::resolve_MemberName(mname, caller, CHECK_NULL);
 if (resolved.is_null()) {
 int flags = java_lang_invoke_MemberName::flags(mname());
 int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
 if (!MethodHandles::ref_kind_is_valid(ref_kind)) {
 THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "obsolete MemberName format");

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/prims/methodHandles.cpp @ 14909:4ca6dc0799b6