jdk-sandbox: comparison hotspot/src/share/vm/interpreter/linkResolver.cpp

equal deleted inserted replaced

-:a86c9ed78205
+:7b146c5ebb18
 /*
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 //------------------------------------------------------------------------------------------------------------------------
 // Method resolution
 //
 // According to JVM spec. $5.4.3c & $5.4.3d
+// Look up method in klasses, including static methods
+// Then look up local default methods
 void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 Method* result_oop = klass->uncached_lookup_method(name, signature);
+if (result_oop == NULL) {
+Array<Method*>* default_methods = InstanceKlass::cast(klass())->default_methods();
+if (default_methods != NULL) {
+result_oop = InstanceKlass::find_method(default_methods, name, signature);
+}
+}
 if (EnableInvokeDynamic && result_oop != NULL) {
 vmIntrinsics::ID iid = result_oop->intrinsic_id();
 if (MethodHandles::is_signature_polymorphic(iid)) {
 // Do not link directly to these.  The VM must produce a synthetic one using lookup_polymorphic_method.
 return;
 }
 result = methodHandle(THREAD, result_oop);
 }
 // returns first instance method
+// Looks up method in classes, then looks up local default methods
 void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 Method* result_oop = klass->uncached_lookup_method(name, signature);
 result = methodHandle(THREAD, result_oop);
 while (!result.is_null() && result->is_static()) {
 klass = KlassHandle(THREAD, result->method_holder()->super());
 result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature));
 }
-}
+if (result.is_null()) {
+Array<Method*>* default_methods = InstanceKlass::cast(klass())->default_methods();
-int LinkResolver::vtable_index_of_miranda_method(KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
+if (default_methods != NULL) {
-ResourceMark rm(THREAD);
+result = methodHandle(InstanceKlass::find_method(default_methods, name, signature));
-klassVtable *vt = InstanceKlass::cast(klass())->vtable();
+assert(result.is_null() || !result->is_static(), "static defaults not allowed");
-return vt->index_of_miranda(name, signature);
+}
+}
+}
+int LinkResolver::vtable_index_of_interface_method(KlassHandle klass,
+methodHandle resolved_method, TRAPS) {
+int vtable_index = Method::invalid_vtable_index;
+Symbol* name = resolved_method->name();
+Symbol* signature = resolved_method->signature();
+// First check in default method array
+if (!resolved_method->is_abstract()  &&
+(InstanceKlass::cast(klass())->default_methods() != NULL)) {
+int index = InstanceKlass::find_method_index(InstanceKlass::cast(klass())->default_methods(), name, signature);
+if (index >= 0 ) {
+vtable_index = InstanceKlass::cast(klass())->default_vtable_indices()->at(index);
+}
+}
+if (vtable_index == Method::invalid_vtable_index) {
+// get vtable_index for miranda methods
+ResourceMark rm(THREAD);
+klassVtable *vt = InstanceKlass::cast(klass())->vtable();
+vtable_index = vt->index_of_miranda(name, signature);
+}
+return vtable_index;
 }
 void LinkResolver::lookup_method_in_interfaces(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
 InstanceKlass *ik = InstanceKlass::cast(klass());
 result = methodHandle(THREAD, ik->lookup_method_in_all_interfaces(name, signature));
 resolved_method->name(),
 resolved_method->signature()),
 resolved_method->method_holder()->internal_name()
 );
 resolved_method->access_flags().print_on(tty);
+if (resolved_method->is_default_method()) {
+tty->print("default");
+}
+if (resolved_method->is_overpass()) {
+tty->print("overpass");
+}
 tty->cr();
 }
 }
 //------------------------------------------------------------------------------------------------------------------------
 Method::name_and_sig_as_C_string(resolved_klass(),
 resolved_method->name(),
 resolved_method->signature()));
 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
 }
 if (TraceItables && Verbose) {
 ResourceMark rm(THREAD);
 tty->print("invokespecial resolved method: caller-class:%s, compile-time-class:%s, method:%s, method_holder:%s, access_flags: ",
 (current_klass.is_null() ? "<NULL>" : current_klass->internal_name()),
 (resolved_klass.is_null() ? "<NULL>" : resolved_klass->internal_name()),
 resolved_method->name(),
 resolved_method->signature()),
 resolved_method->method_holder()->internal_name()
 );
 resolved_method->access_flags().print_on(tty);
-if (resolved_method->method_holder()->is_interface() &&
+if (resolved_method->is_default_method()) {
-!resolved_method->is_abstract()) {
 tty->print("default");
 }
 if (resolved_method->is_overpass()) {
 tty->print("overpass");
 }
 sel_method->name(),
 sel_method->signature()),
 sel_method->method_holder()->internal_name()
 );
 sel_method->access_flags().print_on(tty);
-if (sel_method->method_holder()->is_interface() &&
+if (sel_method->is_default_method()) {
-!sel_method->is_abstract()) {
 tty->print("default");
+}
+if (sel_method->is_overpass()) {
+tty->print("overpass");
 }
 tty->cr();
 }
 // setup result
 resolved_method->name(),
 resolved_method->signature()));
 THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
 }
 if (PrintVtables && Verbose) {
 ResourceMark rm(THREAD);
 tty->print("invokevirtual resolved method: caller-class:%s, compile-time-class:%s, method:%s, method_holder:%s, access_flags: ",
 (current_klass.is_null() ? "<NULL>" : current_klass->internal_name()),
 (resolved_klass.is_null() ? "<NULL>" : resolved_klass->internal_name()),
 Method::name_and_sig_as_C_string(resolved_klass(),
 resolved_method->name(),
 resolved_method->signature()),
 resolved_method->method_holder()->internal_name()
 );
 resolved_method->access_flags().print_on(tty);
-if (resolved_method->method_holder()->is_interface() &&
+if (resolved_method->is_default_method()) {
-!resolved_method->is_abstract()) {
+tty->print("default");
-tty->print("default");
+}
-}
+if (resolved_method->is_overpass()) {
-if (resolved_method->is_overpass()) {
+tty->print("overpass");
-tty->print("overpass");
+}
-}
+tty->cr();
-tty->cr();
+}
-}
 }
 // throws runtime exceptions
 void LinkResolver::runtime_resolve_virtual_method(CallInfo& result,
 methodHandle resolved_method,
 // a missing receiver might result in a bogus lookup.
 assert(resolved_method->method_holder()->is_linked(), "must be linked");
 // do lookup based on receiver klass using the vtable index
 if (resolved_method->method_holder()->is_interface()) { // miranda method
-vtable_index = vtable_index_of_miranda_method(resolved_klass,
+vtable_index = vtable_index_of_interface_method(resolved_klass,
-resolved_method->name(),
+resolved_method, CHECK);
-resolved_method->signature(), CHECK);
 assert(vtable_index >= 0 , "we should have valid vtable index at this point");
 InstanceKlass* inst = InstanceKlass::cast(recv_klass());
 selected_method = methodHandle(THREAD, inst->method_at_vtable(vtable_index));
 } else {
 resolved_method->signature()),
 selected_method->method_holder()->internal_name(),
 vtable_index
 );
 selected_method->access_flags().print_on(tty);
-if (selected_method->method_holder()->is_interface() &&
+if (selected_method->is_default_method()) {
-!selected_method->is_abstract()) {
 tty->print("default");
 }
-if (resolved_method->is_overpass()) {
+if (selected_method->is_overpass()) {
 tty->print("overpass");
 }
 tty->cr();
 }
 // setup result
 THROW_MSG(vmSymbols::java_lang_IllegalAccessError(),
 Method::name_and_sig_as_C_string(recv_klass(),
 sel_method->name(),
 sel_method->signature()));
 }
 // check if abstract
 if (check_null_and_abstract && sel_method->is_abstract()) {
 ResourceMark rm(THREAD);
 THROW_MSG(vmSymbols::java_lang_AbstractMethodError(),
 Method::name_and_sig_as_C_string(recv_klass(),
 resolved_method->name(),
 resolved_method->signature()),
 sel_method->method_holder()->internal_name()
 );
 sel_method->access_flags().print_on(tty);
-if (sel_method->method_holder()->is_interface() &&
+if (sel_method->is_default_method()) {
-!sel_method->is_abstract()) {
 tty->print("default");
 }
-if (resolved_method->is_overpass()) {
+if (sel_method->is_overpass()) {
 tty->print("overpass");
 }
 tty->cr();
 }
 result.set_interface(resolved_klass, recv_klass, resolved_method, sel_method, itable_index, CHECK);

changeset 20391	7b146c5ebb18
parent 20284	595a25ab9474
child 20712	a06e1f01fb6e
child 20685	2feadfa49bb7