mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-21 19:44:41 +02:00
8026394: Eclipse fails with JDK8 build 111
If the resolved interface does not itself contain "clone" or "finalize" methods, the method/interface method resolution looks to the interface's super class, java.lang.Object. With the JDK 8 interface method accessability check requirement, since these two methods are declared within Object as protected, they must be special cased in LinkResolver::check_method_accessability() in order to avoid an IAE. Reviewed-by: acorn, dholmes
This commit is contained in:
parent
9fca48316e
commit
033c5b68ea
2 changed files with 86 additions and 8 deletions
|
@ -1,5 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
|
@ -419,18 +418,28 @@ void LinkResolver::check_method_accessability(KlassHandle ref_klass,
|
||||||
|
|
||||||
AccessFlags flags = sel_method->access_flags();
|
AccessFlags flags = sel_method->access_flags();
|
||||||
|
|
||||||
// Special case: arrays always override "clone". JVMS 2.15.
|
// Special case #1: 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 the method name first, as that's most likely
|
// We'll check for each method name first and then java.lang.Object
|
||||||
// to be false (so we'll short-circuit out of these tests).
|
// to best short-circuit out of these tests.
|
||||||
if (sel_method->name() == vmSymbols::clone_name() &&
|
if (((sel_method->name() == vmSymbols::clone_name() &&
|
||||||
sel_klass() == SystemDictionary::Object_klass() &&
|
(resolved_klass->oop_is_array() || resolved_klass->is_interface())) ||
|
||||||
resolved_klass->oop_is_array()) {
|
(sel_method->name() == vmSymbols::finalize_method_name() &&
|
||||||
|
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 not protected?");
|
assert(flags.is_protected(), "clone or finalize 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;
|
||||||
|
|
69
hotspot/test/runtime/8026394/InterfaceObjectTest.java
Normal file
69
hotspot/test/runtime/8026394/InterfaceObjectTest.java
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 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.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 8026394
|
||||||
|
* @summary clone() and finalize() interface resolution should not receive IAE
|
||||||
|
* @run main InterfaceObjectTest
|
||||||
|
*/
|
||||||
|
interface IClone extends Cloneable {
|
||||||
|
void finalize() throws Throwable;
|
||||||
|
Object clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ICloneExtend extends IClone { }
|
||||||
|
|
||||||
|
public class InterfaceObjectTest implements ICloneExtend {
|
||||||
|
|
||||||
|
public Object clone() {
|
||||||
|
System.out.println("In InterfaceObjectTest's clone() method\n");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void finalize() throws Throwable {
|
||||||
|
try {
|
||||||
|
System.out.println("In InterfaceObjectTest's finalize() method\n");
|
||||||
|
} catch (Throwable t) {
|
||||||
|
throw new AssertionError(t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void tryIt(ICloneExtend o1) {
|
||||||
|
try {
|
||||||
|
Object o2 = o1.clone();
|
||||||
|
o1.finalize();
|
||||||
|
} catch (Throwable t) {
|
||||||
|
if (t instanceof IllegalAccessError) {
|
||||||
|
System.out.println("TEST FAILS - IAE resulted\n");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
InterfaceObjectTest o1 = new InterfaceObjectTest();
|
||||||
|
tryIt(o1);
|
||||||
|
System.out.println("TEST PASSES - no IAE resulted\n");
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue