infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-28 03:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8186688: javax.lang.model.util.Elements.hides does not work correctly with interfaces

Browse Source 
Reviewed-by: vromero, mcimadamore
This commit is contained in:
Jonathan Gibbons 2018-02-23 13:42:04 -08:00
parent 2af1df8c10
commit 62ec6e6d1d
5 changed files with 195 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2018, 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
@ -568,14 +568,14 @@ public abstract class Symbol extends AnnoConstruct implements Element {
return hiddenSym;
}
/** Is this symbol inherited into a given class?
/** Is this symbol accessible in a given class?
* PRE: If symbol's owner is a interface,
* it is already assumed that the interface is a superinterface
* of given class.
* the given class.
* @param clazz The class for which we want to establish membership.
* This must be a subclass of the member's owner.
*/
public boolean isInheritedIn(Symbol clazz, Types types) {
public final boolean isAccessibleIn(Symbol clazz, Types types) {
switch ((int)(flags_field & Flags.AccessFlags)) {
default: // error recovery
case PUBLIC:
@ -603,6 +603,17 @@ public abstract class Symbol extends AnnoConstruct implements Element {
}
}
/** Is this symbol inherited into a given class?
* PRE: If symbol's owner is a interface,
* it is already assumed that the interface is a superinterface
* of the given class.
* @param clazz The class for which we want to establish membership.
* This must be a subclass of the member's owner.
*/
public boolean isInheritedIn(Symbol clazz, Types types) {
return isAccessibleIn(clazz, types);
}
/** The (variable or method) symbol seen as a member of given
* class type`site' (this might change the symbol's type).
* This is used exclusively for producing diagnostics.

5
src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2018, 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
@ -632,8 +632,7 @@ public class JavacElements implements Elements {
}
// Hidee must be accessible in hider's class.
// The method isInheritedIn is poorly named: it checks only access.
return hidee.isInheritedIn(hiderClass, types);
return hidee.isAccessibleIn(hiderClass, types);
}
@DefinedBy(Api.LANGUAGE_MODEL)

28
test/langtools/tools/javac/processing/model/util/elements/hides/C.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2017, 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.
*/
public class C implements I {
public static class IC {}
public static int f = 0;
public static void m() {}
}

122
test/langtools/tools/javac/processing/model/util/elements/hides/Hides.java Normal file
View File

@ -0,0 +1,122 @@
/*
* Copyright (c) 2017, 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 8034933
* @summary Elements hides does not work correctly with interface methods
* @library /tools/javac/lib
* @modules java.compiler
* jdk.compiler
* @build JavacTestingAbstractProcessor Hides
* @compile -processor Hides -proc:only C.java I.java
*/
import java.util.Set;
import java.util.List;
import javax.annotation.processing.*;
import javax.lang.model.element.*;
import static javax.lang.model.util.ElementFilter.*;
public class Hides extends JavacTestingAbstractProcessor {
VariableElement getField(TypeElement te) {
List<VariableElement> fields = fieldsIn(te.getEnclosedElements());
if (fields.size() != 1) {
throw new AssertionError("Expected only one field in: " + te);
}
return fields.get(0);
}
ExecutableElement getMethod(TypeElement te) {
List<ExecutableElement> methods = methodsIn(te.getEnclosedElements());
if (methods.size() != 1) {
throw new AssertionError("Expected only one method in: " + te);
}
return methods.get(0);
}
TypeElement getIC(TypeElement te) {
List<TypeElement> ics = typesIn(te.getEnclosedElements());
if (ics.size() != 1) {
throw new AssertionError("Expected only one inner class in: " + te);
}
return ics.get(0);
}
public boolean process(Set<? extends TypeElement> tes,
RoundEnvironment round) {
if (round.processingOver())
return true;
TypeElement klass = null;
TypeElement intfc = null;
for (TypeElement te : typesIn(round.getRootElements())) {
switch (te.getKind()) {
case INTERFACE:
intfc = te;
break;
case CLASS:
klass = te;
break;
default:
throw new AssertionError("don't know what this is: " + te);
}
}
for (Element e : klass.getEnclosedElements()) {
switch (e.getKind()) {
case FIELD:
check(e, getField(intfc));
break;
case METHOD:
check(e, getMethod(intfc));
break;
case CLASS:
check(e, getIC(intfc));
default:
break;
}
}
if (!status)
throw new Error("Test fails");
return true;
}
boolean status = true;
String getFQN(Element e) {
return e.getEnclosingElement() + "." + e;
}
void check(Element e1, Element e2) {
if (eltUtils.hides(e1, e2)) {
System.err.println("Pass: " + getFQN(e1) + " hides: " + getFQN(e2));
} else {
System.err.println("Fail: Expected: " + getFQN(e1) + " to hide: " + getFQN(e2));
status = false;
}
}
}

28
test/langtools/tools/javac/processing/model/util/elements/hides/I.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (c) 2017, 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.
*/
interface I {
public static class IC {}
public static int f = 0;
public static void m() {}
}