archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8028741: Interface Method Resolution should skip static and non-public methods in j.l.Object

Browse source 
Implementation of JDK 8 JVMS 5.4.3.4 specification change to skip static and non-public methods of java.lang.Object for interface method resolution.

Reviewed-by: acorn, coleenp
This commit is contained in:
Lois Foltan 2013-12-10 16:18:26 -05:00 • committed by Harold Seigel
parent 2078c58bbf
commit 5ece6fc7fd
3 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
hotspot/src/share/vm/interpreter/linkResolver.cpp
View file

@ -242,8 +242,20 @@ void LinkResolver::resolve_klass(KlassHandle& result, constantPoolHandle pool, i
// Look up method in klasses, including static methods // Look up method in klasses, including static methods
// Then look up local default methods // Then look up local default methods
void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, bool checkpolymorphism, TRAPS) { void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, bool checkpolymorphism, bool in_imethod_resolve, TRAPS) {
Method* result_oop = klass->uncached_lookup_method(name, signature); Method* result_oop = klass->uncached_lookup_method(name, signature);
// JDK 8, JVMS 5.4.3.4: Interface method resolution should
// ignore static and non-public methods of java.lang.Object,
// like clone, finalize, registerNatives.
if (in_imethod_resolve &&
result_oop != NULL &&
klass->is_interface() &&
(result_oop->is_static() || !result_oop->is_public()) &&
result_oop->method_holder() == SystemDictionary::Object_klass()) {
result_oop = NULL;
}
if (result_oop == NULL) { if (result_oop == NULL) {
Array<Method*>* default_methods = InstanceKlass::cast(klass())->default_methods(); Array<Method*>* default_methods = InstanceKlass::cast(klass())->default_methods();
if (default_methods != NULL) { if (default_methods != NULL) {
@ -420,28 +432,18 @@ void LinkResolver::check_method_accessability(KlassHandle ref_klass,
AccessFlags flags = sel_method->access_flags(); AccessFlags flags = sel_method->access_flags();
// Special case #1: arrays always override "clone". JVMS 2.15. // Special case: arrays always override "clone". JVMS 2.15.
// If the resolved klass is an array class, and the declaring class // If the resolved klass is an array class, and the declaring class
// is java.lang.Object and the method is "clone", set the flags // is java.lang.Object and the method is "clone", set the flags
// to public. // to public.
// Special case #2: If the resolved klass is an interface, and
// the declaring class is java.lang.Object, and the method is
// "clone" or "finalize", set the flags to public. If the
// resolved interface does not contain "clone" or "finalize"
// methods, the method/interface method resolution looks to
// the interface's super class, java.lang.Object. With JDK 8
// interface accessability check requirement, special casing
// this scenario is necessary to avoid an IAE.
// //
// We'll check for each method name first and then java.lang.Object // We'll check for the method name first, as that's most likely
// to best short-circuit out of these tests. // to be false (so we'll short-circuit out of these tests).
if (((sel_method->name() == vmSymbols::clone_name() && if (sel_method->name() == vmSymbols::clone_name() &&
(resolved_klass->oop_is_array() || resolved_klass->is_interface())) || sel_klass() == SystemDictionary::Object_klass() &&
(sel_method->name() == vmSymbols::finalize_method_name() && resolved_klass->oop_is_array()) {
resolved_klass->is_interface())) &&
sel_klass() == SystemDictionary::Object_klass()) {
// We need to change "protected" to "public". // We need to change "protected" to "public".
assert(flags.is_protected(), "clone or finalize not protected?"); assert(flags.is_protected(), "clone not protected?");
jint new_flags = flags.as_int(); jint new_flags = flags.as_int();
new_flags = new_flags & (~JVM_ACC_PROTECTED); new_flags = new_flags & (~JVM_ACC_PROTECTED);
new_flags = new_flags | JVM_ACC_PUBLIC; new_flags = new_flags | JVM_ACC_PUBLIC;
@ -531,7 +533,7 @@ void LinkResolver::resolve_method(methodHandle& resolved_method, KlassHandle res
} }
// 2. lookup method in resolved klass and its super klasses // 2. lookup method in resolved klass and its super klasses
lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, true, CHECK); lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, true, false, CHECK);
if (resolved_method.is_null()) { // not found in the class hierarchy if (resolved_method.is_null()) { // not found in the class hierarchy
// 3. lookup method in all the interfaces implemented by the resolved klass // 3. lookup method in all the interfaces implemented by the resolved klass
@ -628,7 +630,7 @@ void LinkResolver::resolve_interface_method(methodHandle& resolved_method,
// lookup method in this interface or its super, java.lang.Object // lookup method in this interface or its super, java.lang.Object
// JDK8: also look for static methods // JDK8: also look for static methods
lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, false, CHECK); lookup_method_in_klasses(resolved_method, resolved_klass, method_name, method_signature, false, true, CHECK);
if (resolved_method.is_null()) { if (resolved_method.is_null()) {
// lookup method in all the super-interfaces // lookup method in all the super-interfaces

2
hotspot/src/share/vm/interpreter/linkResolver.hpp
View file

@ -124,7 +124,7 @@ class LinkResolver: AllStatic {
friend class klassItable; friend class klassItable;
private: private:
static void lookup_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, bool checkpolymorphism, TRAPS); static void lookup_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, bool checkpolymorphism, bool in_imethod_resolve, TRAPS);
static void lookup_instance_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); static void lookup_instance_method_in_klasses (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS);
static void lookup_method_in_interfaces (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS); static void lookup_method_in_interfaces (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS);
static void lookup_polymorphic_method (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, static void lookup_polymorphic_method (methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature,

12
hotspot/test/runtime/8024804/RegisterNatives.java
View file

@ -22,10 +22,10 @@
*/ */
/* /*
* @ignore 8028741
* @test * @test
* @bug 8024804 * @bug 8024804
* @summary registerNatives() interface resolution should receive IAE * @bug 8028741
* @summary interface method resolution should skip finding j.l.Object's registerNatives() and succeed in selecting class B's registerNatives()
* @run main RegisterNatives * @run main RegisterNatives
*/ */
public class RegisterNatives { public class RegisterNatives {
@ -38,10 +38,10 @@ public class RegisterNatives {
try { try {
val.registerNatives(); val.registerNatives();
} catch (IllegalAccessError e) { } catch (IllegalAccessError e) {
System.out.println("TEST PASSES - according to current JVM spec, IAE expected\n"); System.out.println("TEST FAILS - JDK 8 JVMS, static and non-public methods of j.l.Object should be ignored during interface method resolution\n");
return; e.printStackTrace();
throw e;
} }
System.out.println("TEST FAILS - no IAE resulted\n"); System.out.println("TEST PASSES - no IAE resulted\n");
System.exit(1);
} }
} }